* adds || true when calling invoke-rc.d --quiet apache2 reload in dashboard postrm

* Packages a openstack-dashboard-ssl-redirect apache sites-available config file.

Rewritten-From: 39272bc33cf652a1ec33f4f6e68f6ab2ab1d9814

diff --git a/trusty/debian/apache-sites-available/openstack-dashboard-ssl-redirect b/trusty/debian/apache-sites-available/openstack-dashboard-ssl-redirect
new file mode 100644 (file)
index 0000000..9246c1d
--- /dev/null
+++ b/trusty/debian/apache-sites-available/openstack-dashboard-ssl-redirect
@@ -0,0 +1,16 @@
+<VirtualHost *:80>
+    ServerAdmin webmaster@localhost
+    DocumentRoot /var/www
+
+    <Directory />
+       AllowOverride None
+    </Directory>
+
+    RewriteEngine On
+    RewriteCond %{HTTPS} off
+    RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+
+    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 ef3b776c8be33cee9d6ce5092249af280047b541..9f2865ea56a2c078b54cbc1699d33d2e39ce9f19 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.install
+++ b/trusty/debian/openstack-dashboard-apache.install
@@ -1,2 +1,3 @@
 debian/apache-sites-available/openstack-dashboard      /etc/apache2/sites-available
 debian/apache-sites-available/openstack-dashboard-ssl  /etc/apache2/sites-available
+debian/apache-sites-available/openstack-dashboard-ssl-redirect /etc/apache2/sites-available

diff --git a/trusty/debian/openstack-dashboard-apache.postrm b/trusty/debian/openstack-dashboard-apache.postrm
index 0f3a2539541da614217c32c712962cbfec4abe86..1ecb2bb9db056dd685bbf8e988aec9b423d8d518 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.postrm
+++ b/trusty/debian/openstack-dashboard-apache.postrm
@@ -3,7 +3,7 @@
 set -e
 
 if [ -x "`which invoke-rc.d 2>/dev/null`" -a -x "/etc/init.d/apache2" ] ; then
-        invoke-rc.d --quiet apache2 reload
+        invoke-rc.d --quiet apache2 reload || true
 fi
 
 #DEBHELPER#
\ No newline at end of file