undo unannounced push that was commited after work start was advertised on #debian...

Rewritten-From: b01d2cdd4ef28cf92e2e8b3455d330b45e3a5514

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index b94362ce420e36d16742435cb27055afc93fe297..a1aa69552e515cfb9d84f403e66ae3b32c4c581a 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,9 +1,12 @@
-horizon (2012.1.1-2) UNRELEASED; urgency=low
+horizon (2012.1.1-2) unstable; urgency=low
 
-  * Add /static alias (Closes: #679440)
-  * Don't listen on a new port by default
+  * Add a /static alias to serve the static files. By default django is
+    configured in debug mode and will serve the static files. However,
+    when it is configured in production mode, it will no longer serve them
+    and it is expected that apache will take care of it. (Closes: #679440).
+  * Add Loic Dachary as Uploader
 
- -- Julien Danjou <acid@debian.org>  Fri, 29 Jun 2012 10:37:56 +0200
+ -- Loic Dachary (OuoU) <loic@debian.org>  Fri, 29 Jun 2012 10:23:33 +0200
 
 horizon (2012.1.1-1) unstable; urgency=low
 

diff --git a/xenial/debian/openstack-dashboard-apache.conf b/xenial/debian/openstack-dashboard-apache.conf
index b78ae8e7a626634a82796d042a7a5105319bef5f..62646fa7caed0eab0bc2dfbeb2a043a163491d22 100644 (file)
--- a/xenial/debian/openstack-dashboard-apache.conf
+++ b/xenial/debian/openstack-dashboard-apache.conf
@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:8080>
     WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
     WSGIDaemonProcess openstack-dashboard user=horizon group=horizon
     WSGIProcessGroup openstack-dashboard