Simplify shipping of the Apache config files

Rewritten-From: 5f0e437a427456e45575e5605756852f8ba501e7

diff --git a/trusty/debian/openstack-dashboard-apache-ssl.conf b/trusty/debian/openstack-dashboard-apache-ssl.conf
deleted file mode 100644 (file)
index c9927ce..0000000
--- a/trusty/debian/openstack-dashboard-apache-ssl.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-<VirtualHost *:443>
-       ServerAdmin webmaster@localhost
-       SSLEngine on
-       SSLCertificateFile    /etc/ssl/certs/ssl-cert-snakeoil.pem
-       SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
-       BrowserMatch "MSIE [2-6]" \
-               nokeepalive ssl-unclean-shutdown \
-               downgrade-1.0 force-response-1.0
-       BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
-       WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-       WSGIDaemonProcess horizon user=www-data group=www-data
-       #WSGIProcessGroup openstack-dashboard
-       Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
-
-       DocumentRoot /var/www
-
-       <Directory />
-               AllowOverride None
-       </Directory>
-
-       <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
-               Order allow,deny
-               Allow from all
-       </Directory>
-
-       <Directory /usr/share/pyshared/horizon/static/horizon>
-               Order allow,deny
-               Allow from all
-       </Directory>
-
-       <Directory /usr/share/openstack-dashboard/openstack_dashboard/static/>
-               Order allow,deny
-               Allow from all
-       </Directory>
-
-       ErrorLog ${APACHE_LOG_DIR}/error.log
-       LogLevel warn
-       CustomLog ${APACHE_LOG_DIR}/access.log combined
-</VirtualHost>

diff --git a/trusty/debian/openstack-dashboard-apache.install b/trusty/debian/openstack-dashboard-apache.install
index 8ba5ad2729cd82d875158485de78ebc9f5eeee0b..3067864b8ca491d4f6c6c22ba48e2654b5d01fc3 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.install
+++ b/trusty/debian/openstack-dashboard-apache.install
@@ -1 +1,2 @@
 etc/apache2/openstack-dashboard /etc/apache2/sites-available
+etc/apache2/openstack-dashboard-ssl /etc/apache2/sites-available

diff --git a/trusty/debian/patches/apache-config-file.patch b/trusty/debian/patches/apache-config-file.patch
index 4436ee7e5e39d77d17337122f5cea3bd798588e2..16d43ba23b7fc0430276b9081dadfd4825793615 100644 (file)
--- a/trusty/debian/patches/apache-config-file.patch
+++ b/trusty/debian/patches/apache-config-file.patch
@@ -2,36 +2,84 @@ Index: horizon/etc/apache2/openstack-dashboard
 ===================================================================
 --- /dev/null
 +++ horizon/etc/apache2/openstack-dashboard
-@@ -0,0 +1,32 @@
-+NameVirtualHost *:8080
-+Listen 8080
-+
-+<VirtualHost *:8080>
+@@ -0,0 +1,35 @@
++<VirtualHost *:80>
++    ServerAdmin webmaster@localhost
 +    WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-+    WSGIDaemonProcess openstack-dashboard user=horizon group=horizon
-+    WSGIProcessGroup openstack-dashboard
++    WSGIDaemonProcess horizon user=www-data group=www-data
++    #WSGIProcessGroup openstack-dashboard
++    Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
++
++    DocumentRoot /var/www
 +
 +    <Directory />
-+        AllowOverride None
++      AllowOverride None
 +    </Directory>
 +
 +    <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
-+        Order allow,deny
-+        Allow from all
++      Order allow,deny
++      Allow from all
 +    </Directory>
 +
 +    Alias /static/horizon /usr/share/pyshared/horizon/static/horizon
 +
 +    <Directory /usr/share/pyshared/horizon/static/horizon>
-+        Order allow,deny
-+        Allow from all
++      Order allow,deny
++      Allow from all
++    </Directory>
++
++    #Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
++
++    <Directory /usr/share/openstack-dashboard/openstack_dashboard/static/>
++      Order allow,deny
++      Allow from all
 +    </Directory>
++    ErrorLog ${APACHE_LOG_DIR}/error.log
++    LogLevel warn
++    CustomLog ${APACHE_LOG_DIR}/access.log combined
++ </VirtualHost>
+Index: horizon/etc/apache2/openstack-dashboard-ssl
+===================================================================
+--- /dev/null
++++ horizon/etc/apache2/openstack-dashboard-ssl
+@@ -0,0 +1,40 @@
++<VirtualHost *:443>
++    ServerAdmin webmaster@localhost
++    SSLEngine on
++    SSLCertificateFile    /etc/ssl/certs/ssl-cert-snakeoil.pem
++    SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
++    BrowserMatch "MSIE [2-6]" \
++      nokeepalive ssl-unclean-shutdown \
++      downgrade-1.0 force-response-1.0
++    BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 +
++    WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
++    WSGIDaemonProcess horizon user=www-data group=www-data
++    #WSGIProcessGroup openstack-dashboard
 +    Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
 +
++    DocumentRoot /var/www
++
++    <Directory />
++      AllowOverride None
++    </Directory>
++
++    <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
++      Order allow,deny
++      Allow from all
++    </Directory>
++
++    <Directory /usr/share/pyshared/horizon/static/horizon>
++      Order allow,deny
++      Allow from all
++    </Directory>
++
 +    <Directory /usr/share/openstack-dashboard/openstack_dashboard/static/>
-+      Order allow,deny
-+      Allow from all
++      Order allow,deny
++      Allow from all
 +    </Directory>
 +
++    ErrorLog ${APACHE_LOG_DIR}/error.log
++    LogLevel warn
++    CustomLog ${APACHE_LOG_DIR}/access.log combined
 +</VirtualHost>

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 73c6b04f78ca2e3280f8005f30c5d21bef0d14d6..099ecc114844bc60c866dc9a884ac86ce2c99491 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -41,10 +41,6 @@ override_dh_auto_install:
        chmod 644 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css/*.css
        chmod 644 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/manifest.json
 
-       # openstack-dashboard-apache
-       install -D -m 0644 $(CURDIR)/debian/openstack-dashboard-apache.conf $(CURDIR)/debian/tmp/etc/apache2/sites-available/openstack-dashboard
-       install -D -m 0644 $(CURDIR)/debian/openstack-dashboard-apache-ssl.conf $(CURDIR)/debian/tmp/etc/apache2/sites-available/openstack-dashboard-ssl
-
 override_dh_install:
        dh_install
        rm -r $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js