Restores sanity on how to install files in etc/apache2/sites-available

Rewritten-From: f8ee35931c773ec79fb824403c13af24d07c47f9

diff --git a/trusty/debian/apache-sites-available/openstack-dashboard b/trusty/debian/apache-sites-available/openstack-dashboard
new file mode 100644 (file)
index 0000000..895c565
--- /dev/null
+++ b/trusty/debian/apache-sites-available/openstack-dashboard
@@ -0,0 +1,35 @@
+<VirtualHost *:80>
+    ServerAdmin webmaster@localhost
+    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>
+
+    Alias /static/horizon /usr/share/pyshared/horizon/static/horizon
+
+    <Directory /usr/share/pyshared/horizon/static/horizon>
+       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>

diff --git a/trusty/debian/apache-sites-available/openstack-dashboard-ssl b/trusty/debian/apache-sites-available/openstack-dashboard-ssl
new file mode 100644 (file)
index 0000000..3d5b30b
--- /dev/null
+++ b/trusty/debian/apache-sites-available/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
+    </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 3067864b8ca491d4f6c6c22ba48e2654b5d01fc3..ef3b776c8be33cee9d6ce5092249af280047b541 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.install
+++ b/trusty/debian/openstack-dashboard-apache.install
@@ -1,2 +1,2 @@
-etc/apache2/openstack-dashboard /etc/apache2/sites-available
-etc/apache2/openstack-dashboard-ssl /etc/apache2/sites-available
+debian/apache-sites-available/openstack-dashboard      /etc/apache2/sites-available
+debian/apache-sites-available/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
deleted file mode 100644 (file)
index 16d43ba..0000000
--- a/trusty/debian/patches/apache-config-file.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: horizon/etc/apache2/openstack-dashboard
-===================================================================
---- /dev/null
-+++ horizon/etc/apache2/openstack-dashboard
-@@ -0,0 +1,35 @@
-+<VirtualHost *:80>
-+    ServerAdmin webmaster@localhost
-+    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>
-+
-+    Alias /static/horizon /usr/share/pyshared/horizon/static/horizon
-+
-+    <Directory /usr/share/pyshared/horizon/static/horizon>
-+      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
-+    </Directory>
-+
-+    ErrorLog ${APACHE_LOG_DIR}/error.log
-+    LogLevel warn
-+    CustomLog ${APACHE_LOG_DIR}/access.log combined
-+</VirtualHost>

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 47eb7dee477119b16399605a4bb1d9b3876668df..64c0a5e0eacebb22ec185c86a926f52196dec9ab 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -2,4 +2,3 @@ fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fix-ubuntu-tests.patch
 debian_local_settings.patch
-apache-config-file.patch