Merge lp:~allenap/maas/trailing-slash-optional into lp:~maas-committers/maas/trunk

[Gavin Panella]

In Apache, redirect requests for /MAAS to /MAAS/.

[Blake Rouse (blake-rouse)]

review: Approve

[Gavin Panella (allenap)]

Thanks!

[Christian Reis (kiko)]

On Sat, Jan 17, 2015 at 06:47:22PM -0000, Gavin Panella wrote:
> Gavin Panella has proposed merging lp:~allenap/maas/trailing-slash-optional into lp:maas.
>
> Commit message:
> In Apache, redirect requests for /MAAS to /MAAS/.

Would it be too much to do the same for the lowercase variant, /maas[/]?
--
Christian Robottom Reis | [+1] 612 888 4935 | http://launchpad.net/~kiko
Canonical VP Hyperscale | [+55 16] 9 9112 6430

=== modified file 'contrib/maas-http.conf'
--- contrib/maas-http.conf	2014-12-05 16:46:01 +0000
+++ contrib/maas-http.conf	2015-01-17 22:48:49 +0000
@@ -8,7 +8,7 @@
 </IfModule>
 
 <IfModule mod_expires.c>
-    <Location /MAAS>
+    <Location /MAAS/>
         ExpiresActive On
         ExpiresByType text/javascript "access plus 1 years"
         ExpiresByType application/javascript "access plus 1 years"
@@ -29,3 +29,9 @@
     ProxyPass /MAAS/static/ !
     ProxyPass /MAAS/ http://localhost:5243/MAAS/ retry=1
 </IfModule>
+
+<IfModule rewrite_module>
+    RewriteEngine On
+    # Redirect (permanently) requests for /MAAS to /MAAS/.
+    RewriteRule ^/MAAS$ %{REQUEST_URI}/ [R=301,L]
+</IfModule>

=== removed file 'etc/apache.conf'
--- etc/apache.conf	2014-09-23 19:09:47 +0000
+++ etc/apache.conf	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-PidFile run/apache.pid
-
-Include /etc/apache2/mods-available/proxy.load
-Include /etc/apache2/mods-available/proxy.conf
-Include /etc/apache2/mods-available/proxy_http.load
-
-# The development server listens for http on port 5240, on all interfaces,
-# for both IPv4 and IPv6.
-Listen 5240
-
-ErrorLog /dev/stderr
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-CustomLog /dev/stdout common
-
-ProxyPreserveHost on
-
-# Proxy Django's dev server.
-ProxyPass / http://localhost:5243/ retry=1

=== renamed file 'etc/apache.saucy.conf' => 'etc/apache.conf'
--- etc/apache.saucy.conf	2014-11-06 14:08:21 +0000
+++ etc/apache.conf	2015-01-17 22:48:49 +0000
@@ -12,23 +12,61 @@
 Include /etc/apache2/mods-available/proxy_http.load
 Include /etc/apache2/mods-available/alias.load
 Include /etc/apache2/mods-available/alias.conf
+Include /etc/apache2/mods-available/expires.load
+Include /etc/apache2/mods-available/rewrite.load
+# mod_mime is required so that ExpiresByType works.
+Include /etc/apache2/mods-available/mime.load
+Include /etc/apache2/mods-available/mime.conf
 
 # The development server listens for http on port 5240, on all interfaces,
 # for both IPv4 and IPv6.
 Listen 5240
 
+# Log to stdout/stderr.
 ErrorLog /dev/stderr
 LogFormat "%h %l %u %t \"%r\" %>s %O" common
 CustomLog /dev/stdout common
 
-# Serve static files here.
+#
+# The remainder of this file is derived from contrib/maas-http.conf, but
+# is not quite identical. Please update the configuration here when
+# changing maas-http.conf, paying careful attention to the differences.
+#
+
+<IfModule mod_ssl.c>
+    <VirtualHost *:443>
+        SSLEngine On
+        # Do not rely on these certificates, generate your own.
+        SSLCertificateFile    /etc/ssl/certs/ssl-cert-snakeoil.pem
+        SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+    </VirtualHost>
+</IfModule>
+
+<IfModule mod_expires.c>
+    <Location /MAAS/>
+        ExpiresActive On
+        ExpiresByType text/javascript "access plus 1 years"
+        ExpiresByType application/javascript "access plus 1 years"
+        ExpiresByType application/x-javascript "access plus 1 years"
+        ExpiresByType text/css "access plus 1 years"
+        ExpiresByType image/gif "access plus 1 years"
+        ExpiresByType image/jpeg "access plus 1 years"
+        ExpiresByType image/png "access plus 1 years"
+    </Location>
+</IfModule>
+
 <IfModule alias_module>
     Alias /MAAS/static/ src/maasserver/static/
 </IfModule>
 
-# Proxy to maas-regiond.
 <IfModule proxy_module>
     ProxyPreserveHost on
     ProxyPass /MAAS/static/ !
     ProxyPass /MAAS/ http://localhost:5243/MAAS/ retry=1
 </IfModule>
+
+<IfModule rewrite_module>
+    RewriteEngine On
+    # Redirect (permanently) requests for /MAAS to /MAAS/.
+    RewriteRule ^/MAAS$ %{REQUEST_URI}/ [R=301,L]
+</IfModule>

=== removed symlink 'etc/apache.trusty.conf'
=== target was u'apache.saucy.conf'
=== removed symlink 'etc/apache.utopic.conf'
=== target was u'apache.saucy.conf'