← Back to team overview

launchpad-reviewers team mailing list archive

  1. launchpad-reviewers team
  2. Mailing list archive
  3. Message #21314

[Merge] lp:~cjwatson/launchpad/xenial-setup into lp:launchpad

  Thread Previous • Date Previous • • Thread Next 
Colin Watson has proposed merging lp:~cjwatson/launchpad/xenial-setup into lp:launchpad.

Commit message:
Allow setting up a new installation on xenial.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/xenial-setup/+merge/314450

xenial requires a few changes.  The Bazaar PPA is neither available nor needed, and nor is the apache2-mpm-worker package.  I happened to notice during debugging that bazaar.launchpad.dev was missing from the local development certificate, so I added that.  Finally, some of the Apache access control rules were wrong: 2.2 had "Order deny,allow" with no "Deny" directives for several vhosts, which is equivalent to no access control at all, and for 2.4 I incorrectly translated those into "Require" directives; it seems best to just remove these.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/xenial-setup into lp:launchpad.

=== modified file 'configs/development/launchpad.crt'
--- configs/development/launchpad.crt	2016-12-01 18:49:53 +0000
+++ configs/development/launchpad.crt	2017-01-10 17:36:24 +0000
@@ -1,32 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFlzCCA3+gAwIBAgIJAPEf/gfdqB60MA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
-BAMMDWxhdW5jaHBhZC5kZXYwHhcNMTYxMjAxMTg0NjMxWhcNMjYxMTI5MTg0NjMx
+MIIFrTCCA5WgAwIBAgIJAP5uYmvAWyElMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMMDWxhdW5jaHBhZC5kZXYwHhcNMTcwMTEwMTY1NjQ3WhcNMjcwMTA4MTY1NjQ3
 WjAYMRYwFAYDVQQDDA1sYXVuY2hwYWQuZGV2MIICIjANBgkqhkiG9w0BAQEFAAOC
-Ag8AMIICCgKCAgEAw6JR4HwLRM16spmszt7H8lSZkSXLIBhaAApdeTOTWKjcBvAK
-bll4Z9/XbjmMhFz5m6RpLxHejavoRSt1bbogbqiFhn6VFK9eie5hmDAYCTUebPmC
-ytAdaB0XvGqXy0Z+mtNQ4+QghDGWVQZ/MvhuOibYc+Pp8jY78noz+7QNrjDzD+yk
-zKJIt2RPq3igANJFRAwgWCY4GM7FBQkZxD/20n1MIRI6eKGQGVNOebmoMjHcDw0y
-Hw0n14CK3uRe2i4gMxn7rzYm9aVl3QfxzX3ZXz9gi1NoNLdtWSmpYIR/0yGAmzEz
-31qFQqsPOaCfkm+GBjdzXYtB0GEit61k+k359n0RtuyCfsAeW9RW4nKnDxhjC7OR
-jxFl22LqR5KjermIrzF1sSaZ22a3mpqrXSso/xpiBhDgsRfzSPTIJgYA1hojqK6O
-bPwZQ1uRh2xYZtUMRfzCMz5YYIINQs9kOwuypmJqWDL5/09ReoW2HjaOqk/Ilb4p
-Dd+fhWdTzkejZxZi1dIOLxvIBy+C2Jtv9L0Fwiqo6DRi9Ho+4ztiK5E0yw+WF/PQ
-rPgGz3MHzI1IjCyqt5NvshdDi0+1Jy6+EEq5fUHdkTl9tqpBeeaKlfDXn7I6cwqs
-umHkFL97jGQtXvePdJrT9z3tEuSbOLqfF/s5+VhGxRhmTuoGXrrKM9aBr+MCAwEA
-AaOB4zCB4DCB3QYDVR0RBIHVMIHSgg1sYXVuY2hwYWQuZGV2ghVhbnN3ZXJzLmxh
-dW5jaHBhZC5kZXaCEWFwaS5sYXVuY2hwYWQuZGV2ghhibHVlcHJpbnRzLmxhdW5j
-aHBhZC5kZXaCEmJ1Z3MubGF1bmNocGFkLmRldoISY29kZS5sYXVuY2hwYWQuZGV2
-ghNmZWVkcy5sYXVuY2hwYWQuZGV2ghp0cmFuc2xhdGlvbnMubGF1bmNocGFkLmRl
-doIUeG1scnBjLmxhdW5jaHBhZC5kZXaCDnRlc3RvcGVuaWQuZGV2MA0GCSqGSIb3
-DQEBCwUAA4ICAQARAlq+bEja2OGKQtcnB1tw1FHw5d3rpDCs3GK8ujUUW9p3cQ8O
-zHG1NLdXI/lpNQab1iAPE2j254F0unsDt5h+bQBH6T1NJUmLO37v5Hx/RZcbsm73
-Lz4uyr4gQ9t0jW6Bo2YJzKLbXYFEpK5Ppaho/izoVNnokDuT5mhUUEWujGAtz+zN
-3GwDmOgJCt6WUh39KLtqCcodScJapL+q1wAf102PUCz9II3OANyH4/+6UBwlW0D0
-X0F+TB3jwHqYqEZKhZ5Y2TeG3MGhmZ6Aksg+gbom4WBIOJf1Cosyl0bAMcUOTMbn
-98+ssbC8CtEbmhJ45jp4ibj0O/yXg15P/VwvyYzovfEyJaso6sKRUpMr0HWRJmLE
-pCtf32nDBCsGJgJ/WJz+pS/JsmEJ3N7cCwsSjXQN2mcHViyeViLQlGAlXdTLnNnI
-Q45Jx0XWDNC0mc6ILJbOuYU7lXmxvmSV8unyOpKDRoMpcRS1Nb/LDMiUff4lMt5S
-EyaIooSsDveyS/ROW5VVQmBPbhVVBRDfCOnyYVPioH84QHqBw0jOB0oYcnJl4Tlx
-V+I+4TlrTq/Fi1iI7Atp84ol/mJ+qmZP5jk6F8E7bvgVbdH0vXRZn8eK3vfQh6ej
-w7LdOrrxMWbWoCHbFXyIqCy8dMtRKG2X+nxdfRxigBiXvZCot5imq/RVbg==
+Ag8AMIICCgKCAgEAskzJyYpjUdHQU7zGf40GKRSQchLqZObKRQy2d6jy83rgPK0i
+ez2Q3JAQC8ySn0sA0Dr2YAQVmko1CeCA0yr7HW6G1ACM/ZVhcqyNxiXpkKGR3jmx
+/OO3Y3P5H2z8qgWYBLtk8ETVToNo9A0t1olOVZjsS/gdwEJhiOemUuXJRpjLahpB
+AurFmMQYh8NgBCMzHFPsBNvqCQAswfvLhI0McE0sM+Elr1+FXmHv5oGBzmm9RT2U
+4YhlZwf18rdH4fSAtR5MKKQZLuxeKfCyVFmKlNf42G/v+TA6cIp9wJbmKmrFOxR1
+70bs1wP1UfV9Wo1YR98WEMhrPlMUUvh2GhcYdHrn5ec3BwGfohQB4XRfIZsqmpNV
+Np3ciSLs9QvsPfFv7MU0AEzc/x5YssBb3FWHzR8zifAhHn9rHtPailV/ApSs7pgy
+eXwzjdQ0M5Lg1j8RBMFro+hOvp9kJsNShs3v+NPPiMkwtGVcqFZFCZFjI5SPIj1e
+/Or2BEdqCu9ncl6ZKSLqXZB9XW3RPS+4JGifl+aLNciAPMF0ISmlESXehtmnWrMh
+IoLI2kjRmZiOoIOaQyt7QOIU6hRC6MT3qGaFCd89sAz9r6JlDELexiEGx0/JOQFW
+X4FHkX2GTjMeIDUtbpd2vc8DB7/fk8if8xNuKUhQpBcSQ/AsPfylyBJ4jWMCAwEA
+AaOB+TCB9jCB8wYDVR0RBIHrMIHogg1sYXVuY2hwYWQuZGV2ghVhbnN3ZXJzLmxh
+dW5jaHBhZC5kZXaCEWFwaS5sYXVuY2hwYWQuZGV2ghRiYXphYXIubGF1bmNocGFk
+LmRldoIYYmx1ZXByaW50cy5sYXVuY2hwYWQuZGV2ghJidWdzLmxhdW5jaHBhZC5k
+ZXaCEmNvZGUubGF1bmNocGFkLmRldoITZmVlZHMubGF1bmNocGFkLmRldoIadHJh
+bnNsYXRpb25zLmxhdW5jaHBhZC5kZXaCFHhtbHJwYy5sYXVuY2hwYWQuZGV2gg50
+ZXN0b3BlbmlkLmRldjANBgkqhkiG9w0BAQsFAAOCAgEAcJClyuyDlbzJUavE5JSH
+ycSZlMoxG9nrJHr+AiUI6h01ZnVg8sO3vPJenKMu3qoZ4z/d9xCl9HnjtOnoYJhP
+W03tqQPd2feUdttRlmbfZ+8FAlOY2HDBRQnZ4sSgMR5vFwNhje9en1sAa0MBDDEy
+WAkXxFyQaacepunpS4MVVoF69+fUNek5gQQ/54RQxZgtN0pMOOzxuogPgG/GNuFV
+0WONxazPkdC+7fUCzQYGTYJUVXbKJLec+TifE2xW7M3T0LcuqvpyNvYN65ZMXrBA
+HHnE65sVBMzsjqdaNGk66hmBO8a1f7QrfTjMhG7bC8YNk1Ay8EBlK5zv3VzTO3AL
+GZn10MxayERLFhD3OjtKYYwzsk9Rlm10nlg8cqOX6REov1EkwPqAzCPznOOt/6zO
+71xRMh8H0PxrxFeoBZS8hJkRUHLa6C6eLMg6Fp9FDoxBdZSwX9v3TPzobW2okJbL
+pxE0JpB0f9YVnag8ahkF+A9wn1JOkN8yreH9p6Uz1aV6Bwj2w1iXe6eGbhMJi7+p
+U2Kq6xlGDZaT9DAdq5f6K65W0/dAwoEehdI7WwTyoUeBjjhxUK4R6jWbIZubBPK9
+aXp4Br/fJDTBFaNelXTJkiXZ4RJWUOr0vckklcc3/jr/qoXMn3pS24IYOQ5KDi8n
+fAH+oV6C1XkAd8d9BMkVGqQ=
 -----END CERTIFICATE-----

=== modified file 'configs/development/launchpad.key'
--- configs/development/launchpad.key	2016-12-01 18:49:53 +0000
+++ configs/development/launchpad.key	2017-01-10 17:36:24 +0000
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-te4rkNFHqt1hfZ0F+WnMeuEiICNE4zA=
+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
+8rpZcJaSjF3uGzUFe/3EfDBKnH/aBw==
 -----END PRIVATE KEY-----

=== modified file 'configs/development/local-launchpad-apache'
--- configs/development/local-launchpad-apache	2014-12-28 15:30:12 +0000
+++ configs/development/local-launchpad-apache	2017-01-10 17:36:24 +0000
@@ -27,15 +27,6 @@
   ServerAlias answers.launchpad.dev api.launchpad.dev blueprints.launchpad.dev
   ServerAlias bugs.launchpad.dev code.launchpad.dev feeds.launchpad.dev
   ServerAlias translations.launchpad.dev xmlrpc.launchpad.dev testopenid.dev
-  <Proxy *>
-    <IfVersion >= 2.4>
-      Require ip 127.0.0.0/255.0.0.0
-    </IfVersion>
-    <IfVersion < 2.4>
-      Order deny,allow
-      Allow from 127.0.0.0/255.0.0.0
-    </IfVersion>
-  </Proxy>
   SSLEngine On
   SSLCertificateFile /etc/apache2/ssl/launchpad.crt
   SSLCertificateKeyFile /etc/apache2/ssl/launchpad.key
@@ -66,16 +57,6 @@
   LogLevel debug
 
   ProxyRequests off
-  <Proxy *>
-    <IfVersion >= 2.4>
-      Require host localhost
-      Require ip 127.0.0.0/255.0.0.0
-    </IfVersion>
-    <IfVersion < 2.4>
-      Order deny,allow
-      Allow from localhost 127.0.0.0/255.0.0.0
-    </IfVersion>
-  </Proxy>
   ProxyTimeout 20
 
   RewriteEngine On
@@ -108,16 +89,6 @@
   SSLCertificateKeyFile /etc/apache2/ssl/launchpad.key
 
   ProxyRequests off
-  <Proxy *>
-    <IfVersion >= 2.4>
-      Require host localhost
-      Require ip 127.0.0.0/255.0.0.0
-    </IfVersion>
-    <IfVersion < 2.4>
-      Order deny,allow
-      Allow from localhost 127.0.0.0/255.0.0.0
-    </IfVersion>
-  </Proxy>
   ProxyTimeout 20
 
   RewriteEngine On

=== modified file 'utilities/make-dev-certificate'
--- utilities/make-dev-certificate	2016-12-01 18:49:53 +0000
+++ utilities/make-dev-certificate	2017-01-10 17:36:24 +0000
@@ -24,6 +24,7 @@
     "launchpad.dev",
     "answers.launchpad.dev",
     "api.launchpad.dev",
+    "bazaar.launchpad.dev",
     "blueprints.launchpad.dev",
     "bugs.launchpad.dev",
     "code.launchpad.dev",

=== modified file 'utilities/rocketfuel-setup'
--- utilities/rocketfuel-setup	2012-05-04 05:57:29 +0000
+++ utilities/rocketfuel-setup	2017-01-10 17:36:24 +0000
@@ -96,16 +96,19 @@
   echo "Adding ~launchpad PPA repository to package source list."
   echo "$LP_PPA"  | sudo tee -a $LPDEV_SOURCES
 fi
+REQUIRED_PPA_KEYS="0A5174AF"
 
-BZR_PPA="deb http://ppa.launchpad.net/bzr/ppa/ubuntu ${DISTRIB_CODENAME} main"
-grep -q "^${BZR_PPA}" $LPDEV_SOURCES
-if [ $? -ne 0 ]; then
-  echo "Adding ~bzr PPA repository to package source list."
-  echo "$BZR_PPA" | sudo tee -a $LPDEV_SOURCES
+if [ "$DISTRIB_CODENAME" = precise ]; then
+  BZR_PPA="deb http://ppa.launchpad.net/bzr/ppa/ubuntu ${DISTRIB_CODENAME} main"
+  grep -q "^${BZR_PPA}" $LPDEV_SOURCES
+  if [ $? -ne 0 ]; then
+    echo "Adding ~bzr PPA repository to package source list."
+    echo "$BZR_PPA" | sudo tee -a $LPDEV_SOURCES
+  fi
+  REQUIRED_PPA_KEYS="$REQUIRED_PPA_KEYS 8C6C1EFD"
 fi
 
 # Get the key used to sign the launchpad-developer-dependencies in the PPA.
-REQUIRED_PPA_KEYS="0A5174AF 8C6C1EFD"
 for key in $REQUIRED_PPA_KEYS; do
    sudo apt-key list | grep -q $key
    if [ $? -ne 0 ]; then
@@ -136,7 +139,12 @@
   }
 
 sudo apt-get update
-REQUIRED_PACKAGES="launchpad-developer-dependencies apache2 apache2-mpm-worker libapache2-mod-wsgi"
+REQUIRED_PACKAGES="launchpad-developer-dependencies apache2 libapache2-mod-wsgi"
+case $DISTRIB_CODENAME in
+  precise|trusty)
+    REQUIRED_PACKAGES="$REQUIRED_PACKAGES apache2-mpm-worker"
+    ;;
+esac
 for pkg in $REQUIRED_PACKAGES; do
   do_install;
 done

Follow ups

  Thread Previous • Date Previous • • Thread Next