Merge lp:~free.ekanayaka/landscape-charm/offline-assets-charm into lp:~landscape/landscape-charm/trunk

[Free Ekanayaka]

Change configuration code to point apache and haproxy to the new
offline pages locations introduced in:

https://code.launchpad.net/~free.ekanayaka/landscape/offline-assets/+merge/245889

Change configuration code to point apache and haproxy to the new
offline pages locations introduced in:

https://code.launchpad.net/~free.ekanayaka/landscape/offline-assets/+merge/245889

[Alberto Donato (ack)]

Looks good, +1

review: Approve

[Geoff Teale (tealeg)]

+1

review: Approve

[lp:~free.ekanayaka/landscape-charm/offline-assets-charm]

217. By Free Ekanayaka on 2015-01-12

Fix offline rewrite rule

=== modified file 'config/vhostssl.tmpl'
--- config/vhostssl.tmpl	2014-10-17 13:50:31 +0000
+++ config/vhostssl.tmpl	2015-01-12 15:08:26 +0000
@@ -49,6 +49,7 @@
     RewriteRule ^/attachment/(.*) http://{{ haproxy_msgserver }}/attachment/$1 [P,L]
     RewriteRule ^/upload/(.*) http://{{ haproxy_packageupload }}/$1 [P,L]
     RewriteRule ^/(static.*) http://{{ haproxy_static }}/$1 [P,L]
+    RewriteRule ^/(offline.*) http://{{ haproxy_static }}/$1 [P,L]
     RewriteRule ^/(config.*) http://{{ haproxy_static }}/$1 [P,L]
     RewriteRule ^/(hash-id-databases.*) http://{{ haproxy_static }}/$1 [P,L]
     RewriteRule ^/(repository.*) http://{{ haproxy_static }}/$1 [P,L]
 
=== modified file 'hooks/conf/landscape-http'
--- hooks/conf/landscape-http	2014-05-23 17:53:45 +0000
+++ hooks/conf/landscape-http	2015-01-12 15:08:26 +0000
@@ -15,11 +15,12 @@
      Allow from all
      Require all granted
      Satisfy Any
-     ErrorDocument 403 /static/offline/unauthorized.html
-     ErrorDocument 404 /static/offline/notfound.html
+     ErrorDocument 403 /offline/unauthorized.html
+     ErrorDocument 404 /offline/notfound.html
    </Directory>
 
    Alias /static /opt/canonical/landscape/canonical/landscape/static
+   Alias /offline /opt/canonical/landscape/canonical/landscape/offline
    Alias /repository /var/lib/landscape/landscape-repository
    Alias /config /opt/canonical/landscape/apacheroot
    Alias /hash-id-databases /var/lib/landscape/hash-id-databases
@@ -59,4 +60,7 @@
    <Location "/static">
      Options -Indexes
    </Location>
+   <Location "/offline">
+     Options -Indexes
+   </Location>
 </VirtualHost>
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-10-20 12:18:01 +0000
+++ hooks/hooks.py	2015-01-12 15:08:26 +0000
@@ -814,7 +814,7 @@
     return util.is_db_up(database, host, user, password)
 
 
-ERROR_PATH = "/opt/canonical/landscape/canonical/landscape/static/offline/"
+ERROR_PATH = "/opt/canonical/landscape/canonical/landscape/offline/"
 ERROR_FILES = [
     {"http_status": 403,
      "path": ERROR_PATH + "unauthorized-haproxy.html"},