Merge pull request #796 from lmorchard/vagrant-ubuntu

fix bug 800914: Excise mindtouch, switch vagrant to ubuntu

apps/wiki/migrations/0010_add_locale_slug_uniqueness.py

@@ -8,8 +8,12 @@ class Migration(SchemaMigration):
 
     def forwards(self, orm):
 
-        # Removing unique constraint on 'Document', fields ['locale', 'title']
-        db.delete_unique('wiki_document', ['locale', 'title'])
+        try:
+            # Removing unique constraint on 'Document', fields ['locale', 'title']
+            db.delete_unique('wiki_document', ['locale', 'title'])
+        except:
+            # Ignore any errors, since this constraint may not exist on a fresh install
+            pass
 
 
     def backwards(self, orm):

puppet/files/etc/httpd/conf.d/mozilla-kuma-apache.conf → puppet/files/etc/apache2/conf.d/mozilla-kuma-apache.conf

@@ -1,7 +1,3 @@
-# HACK: All WSGI apps go though the virtualenv, but we'll probably only have
-# the one anyway.
-WSGIPythonHome /home/vagrant/kuma-venv
-
 WSGISocketPrefix /var/run/wsgi
 
 <VirtualHost *:80>
@@ -12,8 +8,8 @@ WSGISocketPrefix /var/run/wsgi
 
 <VirtualHost *:443>
     SSLEngine on
-    SSLCertificateFile /etc/pki/tls/certs/localhost.crt
-    SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
+    SSLCertificateFile /etc/apache2/ssl/apache.crt
+    SSLCertificateKeyFile /etc/apache2/ssl/apache.key
 
     # Covering all pre-bug-702988 past-known server aliases
     ServerName developer-local.allizom.org
@@ -26,9 +22,9 @@ WSGISocketPrefix /var/run/wsgi
 
     RewriteEngine On
 
-    DocumentRoot /vagrant/webroot
+    DocumentRoot /var/www
 
-    <Directory "/vagrant/webroot">
+    <Directory "/var/www">
         Options All
         AllowOverride All
         Order allow,deny

puppet/files/etc/apache2/ssl/apache.crt

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEGTCCAwGgAwIBAgIJAN2NnJKGSB2PMA0GCSqGSIb3DQEBBQUAMIGiMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4g
+VmlldzEQMA4GA1UECgwHTW96aWxsYTEPMA0GA1UECwwGV2ViZGV2MR4wHAYDVQQD
+DBVkZXZlbG9wZXIubW96aWxsYS5vcmcxIzAhBgkqhkiG9w0BCQEWFGxvcmNoYXJk
+QG1vemlsbGEuY29tMB4XDTEzMDEwNzIyMzMzM1oXDTE0MDEwNzIyMzMzM1owgaIx
+CzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3Vu
+dGFpbiBWaWV3MRAwDgYDVQQKDAdNb3ppbGxhMQ8wDQYDVQQLDAZXZWJkZXYxHjAc
+BgNVBAMMFWRldmVsb3Blci5tb3ppbGxhLm9yZzEjMCEGCSqGSIb3DQEJARYUbG9y
+Y2hhcmRAbW96aWxsYS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDPo9epXkeZRlNEKIo569UYxMgudNSliFABXkzXUv4QEiNazGqYONSBXSjO6MCz
+bSD2/mkeUmHQ32qLOhLk/ucLdY8x77F2M/soH2SjDP87DBoX29onT+0rBFxsGYE0
+uNvuPTcQ3TEiyIbaLKzG9mWEyoPzxpyBed94pNc9iOyeqeq5WfWTc+LTJEBJDasG
+f6qFEuciSe+qJ0odqG9TE28G6UnLNgovQsG6c0cb+LVproO3PkBoHuLatkyhqkgB
+NIw5vVxzg+2An0134q9rJvW/4RASLHAwFP+v0kCazjbgTrl8BwYfdbspfgZ6PVVQ
+UlwQoMxzNnrLKcYKpyOFnJ7BAgMBAAGjUDBOMB0GA1UdDgQWBBQFNQJgXmUgXt0O
+mND3HoqeOTojIDAfBgNVHSMEGDAWgBQFNQJgXmUgXt0OmND3HoqeOTojIDAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQATN5erelVWoqm41Hoz3aShq/lW
+CxSE1x4mD3949B1L9xKccpbupkk7vVoK/P4z3cWZq1Ek2wdUymlJq/OSavm3N1pr
+8N9BeyMYLp1jVEYowVXWt60J/AENGzvXondp3GUz8i5uHUtTqvVaJkyaaZixmSRl
+OFthu1sO7sg88irXx7v/52Ft1sPQf/rgx3j8hEPZkcRhuk0rP2cdonjaH6AvdDWL
+y4forEXPZZut2HEexatsGLx076ytq7IIRcvYzm9A4uY/CjLe9dikXlhtkQwhqDoy
+S+TAl4P8PbohDQIlhCLo6F/aEaqJHJarnLx9xQY3BU5IAJxqrAJH03UafGoc
+-----END CERTIFICATE-----

puppet/files/etc/apache2/ssl/apache.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDPo9epXkeZRlNE
+KIo569UYxMgudNSliFABXkzXUv4QEiNazGqYONSBXSjO6MCzbSD2/mkeUmHQ32qL
+OhLk/ucLdY8x77F2M/soH2SjDP87DBoX29onT+0rBFxsGYE0uNvuPTcQ3TEiyIba
+LKzG9mWEyoPzxpyBed94pNc9iOyeqeq5WfWTc+LTJEBJDasGf6qFEuciSe+qJ0od
+qG9TE28G6UnLNgovQsG6c0cb+LVproO3PkBoHuLatkyhqkgBNIw5vVxzg+2An013
+4q9rJvW/4RASLHAwFP+v0kCazjbgTrl8BwYfdbspfgZ6PVVQUlwQoMxzNnrLKcYK
+pyOFnJ7BAgMBAAECggEBALE75OWIuAy43nIbOIFgL7DIpyYgSzJQPBou5+AT0xDc
+qpjiS0pLl/gkEKUsPu/ogm7RkeBz6VJkoYjdtSsJ+STq36N8OTnv/L2urjQO7/zy
+w4MCAh/0NTi2rD0JOCRMdk3QqqQWac6K47Bu2buqrdS/GAqIySYrZPiRm7fGnFKA
+pSGyGfnQlK2JSjItMF0ljRLpsnEywOwDHd0CS+2DZUnoX40RKSOEun4iZCzsrxyV
+z4mXPN99QO+q44MA9iDzOngOIxLpGyIs30DGb3NXM90XVKZdCY7XBDqZKOgrA98p
+p4dok6iwEmNG7U7HpKUcqem9RfOYA8JnAsicoKeGqMECgYEA7zgksGExEmb5pRlW
+7QG4mo8uSgtK/e+LRAA1VacHQ+1tMP/64t7Pqv0p+wAUERkAd0d0QLaJa/QujXRR
+a8DwmAxZutr45bvd+SoTU/pJz4rsMxwF7AF5uBsMczG5u/8hqQu7uRnMivkiRWg2
+jiEdFgSz7cbZxdsOs8WqHrJpuE0CgYEA3jSaks+xg2uude/+7UW3U/HC+wT/C1yv
+RcMYAjlLZoM+zc8EWwrArQgF3kMGpyo8Bi3Sf9+X/Re3rIPt3EwVoC1sSyvvz2Q2
+fsPHtFwqrQrlALQ+WajKv+UJAOWz+WCzx3NQZN5AMW/HxXAFHWrXQw1D6b55tJQ8
+p/2QTDcOukUCgYBFBUDotxIuihGLhjUjavS1e4xShtGbVOssspaw4OFiwvVXRvQ/
+UyQ95I+hQROJH1qYD8DGDyS1Rh3MaHw5h9CjPiUBmb5oonzYMEClYTi8rguab4Jx
+5rcU3JEKB5XcXS98E8uVC5GNo3Y06m2bMoiu2qqDd3VL9flW+zgrZTTFnQKBgENo
+P8/zk40jmGwMnxAJiyC7AYQ2sswWlNEb6ueZy+bQP7gdadvYejTDb0xKlvUVGdpi
+Ai5qfOf5Tu3Vo82lgxXxUZ3IOVp3sxRnfeiX4RZXbLr28scuLjtiVoXgKOWo0UDb
+GXNP/LdCip65acPPynd7ybNZ5f/CzFfF0wVb2mrlAoGAFM4XcCXbrqs7mi1gqN9D
+bar1i3kZgMC/AHrQlTqDh/8bT55FG52oSDKb/DTiyoqvggy4fD08sLhUKIsPmRI5
+BhCTWlomW1r2qpGMkIiosrPfmv5QKJAUYzJ108tLg6g9E6AiNwik/DBl1ZcQLXNR
+wlPThuxSTNVRCyTbjRIMVs0=
+-----END PRIVATE KEY-----

puppet/files/etc/hostname

@@ -0,0 +1 @@
+developer-local

puppet/files/etc/hosts

@@ -1,4 +1,4 @@
 # Do not remove the following line, or various programs
 # that require network functionality will fail.
-127.0.0.1		localhost kuma developer-local.allizom.org developer-dev.mozilla.org
+127.0.0.1		localhost kuma developer-local.allizom.org developer-dev.mozilla.org developer-local precise64
 ::1		localhost6.localdomain6 localhost6