* Now also allowing Horizon to be installed in /horizon, not just on the

    takeover of webroot. This will be the default.

Rewritten-From: 4b10d90671c8f1d8e97c14d13fd79ef22d3d8753

diff --git a/xenial/debian/apache-sites-available/openstack-dashboard-alias-only.conf b/xenial/debian/apache-sites-available/openstack-dashboard-alias-only.conf
new file mode 100644 (file)
index 0000000..20f7f34
--- /dev/null
+++ b/xenial/debian/apache-sites-available/openstack-dashboard-alias-only.conf
@@ -0,0 +1,18 @@
+WSGIScriptAlias /horizon /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
+WSGIDaemonProcess horizon user=www-data group=www-data
+Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
+Alias /horizon/static /usr/share/openstack-dashboard/openstack_dashboard/static
+
+
+<Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
+       Order allow,deny
+       Allow from all
+</Directory>
+<Directory /usr/lib/python2.7/dist-packages/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>

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 59d8d30d2813dc26e0f61662e2bcd3d04c253e35..ccca7ccc197be063518cc036f4e518cfc992e238 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,10 @@
+horizon (1:8.0.0~b3-4) experimental; urgency=medium
+
+  * Now also allowing Horizon to be installed in /horizon, not just on the
+    takeover of webroot. This will be the default.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 22 Sep 2015 13:27:52 +0000
+
 horizon (1:8.0.0~b3-3) experimental; urgency=medium
 
   * Also adds symlink to the fonts-roboto-fontface and materialdesignicons

diff --git a/xenial/debian/openstack-dashboard-apache.install b/xenial/debian/openstack-dashboard-apache.install
index 08de3d0d46569a92b141b9bde58b20c2473ace55..b4567e1fecbb1457a29690c4488fca0dffeefc47 100644 (file)
--- a/xenial/debian/openstack-dashboard-apache.install
+++ b/xenial/debian/openstack-dashboard-apache.install
@@ -1,3 +1,4 @@
 debian/apache-sites-available/openstack-dashboard-ssl-redirect.conf    /etc/apache2/sites-available
 debian/apache-sites-available/openstack-dashboard-ssl.conf     /etc/apache2/sites-available
 debian/apache-sites-available/openstack-dashboard.conf /etc/apache2/sites-available
+debian/apache-sites-available/openstack-dashboard-alias-only.conf      /etc/apache2/sites-available

diff --git a/xenial/debian/openstack-dashboard-apache.postinst b/xenial/debian/openstack-dashboard-apache.postinst
index 5ea427221f50b7a99a85b1fcfa69aa5c16a63ed5..8df75b6cfeee89949daad2c2b9d68160600b4a41 100644 (file)
--- a/xenial/debian/openstack-dashboard-apache.postinst
+++ b/xenial/debian/openstack-dashboard-apache.postinst
@@ -23,24 +23,38 @@ HORIZON_USE_SSL=yes" >/etc/default/openstack-dashboard-apache
        db_get horizon/activate_vhost
        if [ "${RET}" = "true" ] && [ -x /etc/init.d/apache2 ] ; then
                sed -i 's#[ \t]*HORIZON_ACTIVATE_VHOSTS=.*#HORIZON_ACTIVATE_VHOSTS=yes#' /etc/default/openstack-dashboard-apache
-               a2dissite default || true
+               a2dissite 000-default.conf || true
+               a2dissite default-ssl.conf || true
+               sed -i "s|^[ \t]*WEBROOT[ \t]=.*|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings.py
                db_get horizon/use_ssl
                if [ "${RET}" = "true" ] ; then
                        sed -i 's#[ \t]*HORIZON_USE_SSL=.*#HORIZON_USE_SSL=yes#' /etc/default/openstack-dashboard-apache
                        a2enmod ssl
                        a2enmod rewrite
                        a2dissite openstack-dashboard.conf
+                       a2dissite openstack-dashboard-alias-only.conf
                        a2ensite openstack-dashboard-ssl-redirect.conf
                        a2ensite openstack-dashboard-ssl.conf
                else
                        sed -i 's#[ \t]*HORIZON_USE_SSL=.*#HORIZON_USE_SSL=no#' /etc/default/openstack-dashboard-apache
                        a2dissite openstack-dashboard-ssl.conf
                        a2dissite openstack-dashboard-ssl-redirect.conf
+                       a2dissite openstack-dashboard-alias-only.conf
                        a2ensite openstack-dashboard.conf
                fi
+               /usr/share/openstack-dashboard/manage.py compress --force
                invoke-rc.d --quiet apache2 reload
        else
                sed -i 's#[ \t]*HORIZON_ACTIVATE_VHOSTS=.*#HORIZON_ACTIVATE_VHOSTS=no#' /etc/default/openstack-dashboard-apache
+               a2ensite 000-default.conf || true
+               a2ensite default-ssl.conf || true
+               sed -i "s|^[ \t]*WEBROOT[ \t]=.*|WEBROOT = '/horizon'|" /etc/openstack-dashboard/local_settings.py
+               a2dissite openstack-dashboard.conf
+               a2dissite openstack-dashboard-ssl-redirect.conf
+               a2dissite openstack-dashboard-ssl.conf
+               a2ensite openstack-dashboard-alias-only.conf
+               /usr/share/openstack-dashboard/manage.py compress --force
+               invoke-rc.d --quiet apache2 reload
        fi
        db_stop
 fi

diff --git a/xenial/debian/openstack-dashboard-apache.templates b/xenial/debian/openstack-dashboard-apache.templates
index 627eddd1eb003532c976776965d778f3b60ac3f2..248acc4a5ca921b7f16b74785f4cfad1776c06b5 100644 (file)
--- a/xenial/debian/openstack-dashboard-apache.templates
+++ b/xenial/debian/openstack-dashboard-apache.templates
@@ -14,6 +14,9 @@ _Description: Activate Dashboard and disable default VirtualHost?
  The Apache package sets up a default web site and a default page, configured
  in /etc/apache2/sites-available/default.
  .
+ If this option is not selected, Horizon will be installed using /horizon
+ instead of the webroot.
+ .
  Choose this option to replace that default with the OpenStack Dashboard
  configuration.
 

diff --git a/xenial/debian/po/cs.po b/xenial/debian/po/cs.po
index 32c52a818e0f9feb510c830a6cb5e69d7fc556c0..43a9a68591bf7755cb6a5791c4796464b988a43d 100644 (file)
--- a/xenial/debian/po/cs.po
+++ b/xenial/debian/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon 2013.1.3-2\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-08 19:12+0200\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2013-10-12 10:41+0200\n"
 "Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -32,6 +32,14 @@ msgstr ""
 "Balíček Apache má výchozí web a výchozí stránku nastavené v /etc/apache2/"
 "sites-available/default."
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001
@@ -39,8 +47,8 @@ msgid ""
 "Choose this option to replace that default with the OpenStack Dashboard "
 "configuration."
 msgstr ""
-"Tuto možnost zvolte k nahrazení výchozího nastavení nastavením "
-"Ovládacího panelu pro OpenStack."
+"Tuto možnost zvolte k nahrazení výchozího nastavení nastavením Ovládacího "
+"panelu pro OpenStack."
 
 #. Type: boolean
 #. Description

diff --git a/xenial/debian/po/da.po b/xenial/debian/po/da.po
index d33303a11222c27a91e0704a8f60575c02b95031..31e3f015f6269367a1f64d54c83e85d3319dde7e 100644 (file)
--- a/xenial/debian/po/da.po
+++ b/xenial/debian/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-08 19:12+0200\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2013-10-10 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -29,8 +29,16 @@ msgid ""
 "The Apache package sets up a default web site and a default page, configured "
 "in /etc/apache2/sites-available/default."
 msgstr ""
-"Pakken Apache opsætter en standardnetside og en standardside, konfigureret i !"
-"/etc/apache2/sites-available/default."
+"Pakken Apache opsætter en standardnetside og en standardside, konfigureret "
+"i !/etc/apache2/sites-available/default."
+
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -39,8 +47,8 @@ msgid ""
 "Choose this option to replace that default with the OpenStack Dashboard "
 "configuration."
 msgstr ""
-"Vælg denne indstilling for at erstatte den standard med Openstack "
-"Dashboard-konfigurationen."
+"Vælg denne indstilling for at erstatte den standard med Openstack Dashboard-"
+"konfigurationen."
 
 #. Type: boolean
 #. Description

diff --git a/xenial/debian/po/de.po b/xenial/debian/po/de.po
index d00430e192662a1e61c084f1351ffe5f5710f281..14ec44f0f7470ccecfc710858e216bdcdebd009a 100644 (file)
--- a/xenial/debian/po/de.po
+++ b/xenial/debian/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon 2014.1-2\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2014-03-07 10:34+0100\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2014-06-05 22:45+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -34,6 +34,14 @@ msgstr ""
 "Das Paket Apache richtet eine Standard-Website und eine Standardseite ein, "
 "die in /etc/apache2/sites-available/default konfiguriert werden."
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001
@@ -41,8 +49,8 @@ msgid ""
 "Choose this option to replace that default with the OpenStack Dashboard "
 "configuration."
 msgstr ""
-"Wählen Sie diese Option, um diese Voreinstellung durch die "
-"OpenStack-Dashboard-Konfiguration zu ersetzen."
+"Wählen Sie diese Option, um diese Voreinstellung durch die OpenStack-"
+"Dashboard-Konfiguration zu ersetzen."
 
 #. Type: boolean
 #. Description

diff --git a/xenial/debian/po/es.po b/xenial/debian/po/es.po
index 98e8cbfb6cc514cfc3a6b00317e88ef411e17b91..bdf69ad4e0ee7ea3b8a6e9d6f0862a3bb6ee5951 100644 (file)
--- a/xenial/debian/po/es.po
+++ b/xenial/debian/po/es.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2014-03-07 10:34+0100\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2013-12-08 21:21-0300\n"
 "Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -63,6 +63,14 @@ msgstr ""
 "Seleccione esta opción si desea desactivar esta configuración y reemplazarla "
 "con la configuración del panel de control de OpenStack («Dashboard»)."
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001

diff --git a/xenial/debian/po/fr.po b/xenial/debian/po/fr.po
index 68873f1052bd5947030aba960675f75b69573688..3ee591ff7e7ced3e168bf3dca47a9c68a9a3d733 100644 (file)
--- a/xenial/debian/po/fr.po
+++ b/xenial/debian/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2014-03-07 10:34+0100\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2013-10-09 09:09+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: FRENCH <debian-l10n-french@lists.debian.org>\n"
@@ -33,6 +33,16 @@ msgstr ""
 "Le paquet Apache installe un site et une page par défaut, configurés dans /"
 "etc/apache2/sites-available/default."
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+"Si cette option n'est pas selectionée, Horizon sera installé sur /horizon "
+"plustot que la racine du server web."
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001
@@ -40,14 +50,14 @@ msgid ""
 "Choose this option to replace that default with the OpenStack Dashboard "
 "configuration."
 msgstr ""
-"Choisissez cette option pour remplacer ce réglage par défaut par la "
+"Choisissez cette option pour remplacer le réglage par défaut par la "
 "configuration d'OpenStack Dashboard."
 
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:3001
 msgid "Should the Dashboard use HTTPS?"
-msgstr "Faut-il utiliser HTTPS pour Dashboard ?"
+msgstr "Faut-il utiliser HTTPS pour le Dashboard ?"
 
 #. Type: boolean
 #. Description
@@ -56,5 +66,5 @@ msgid ""
 "Select this option if you would like Horizon to be served over HTTPS only, "
 "with a redirection to HTTPS if HTTP is in use."
 msgstr ""
-"Veuillez choisir si vous souhaitez qu'Horizon soit installé sur HTTPS "
+"Veuillez choisir cette option si vous souhaitez qu'Horizon soit installé sur HTTPS "
 "uniquement, avec une redirection vers HTTPS si HTTP est utilisé."

diff --git a/xenial/debian/po/it.po b/xenial/debian/po/it.po
index ca63d7faa70eee2778407072d633d3f24f8a994e..63a0b6549cc84015925d505a7e133e620aed01dc 100644 (file)
--- a/xenial/debian/po/it.po
+++ b/xenial/debian/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2014-03-07 10:34+0100\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2013-10-19 18:48+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -33,6 +33,14 @@ msgstr ""
 "Il pacchetto Apache imposta un sito web e una pagina predefiniti, "
 "configurati in /etc/apache2/sites-available/default."
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001

diff --git a/xenial/debian/po/ja.po b/xenial/debian/po/ja.po
index bb7baf5876c543a15c1be2887d36d71cec1b40c1..310c44d37dcd536aec2f723dd83d6b59647c2c9c 100644 (file)
--- a/xenial/debian/po/ja.po
+++ b/xenial/debian/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2014-03-07 10:34+0100\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2013-07-19 23:32+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -32,6 +32,14 @@ msgstr ""
 "Apache パッケージがデフォルトウェブサイトやデフォルトページを用意しています。"
 "これは /etc/apache2/sites-available/default で設定されています。"
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001

diff --git a/xenial/debian/po/nl.po b/xenial/debian/po/nl.po
index f40775573fc510bb6e261a366235bf721b50c7bd..def81262358c3318256ca4bc8049051271ac3404 100644 (file)
--- a/xenial/debian/po/nl.po
+++ b/xenial/debian/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2014-03-07 10:34+0100\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2014-10-08 23:05+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -33,6 +33,14 @@ msgstr ""
 "Het pakket Apache zet een standaardwebsite en een standaardpagina op in /etc/"
 "apache2/sites-available/default."
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001

diff --git a/xenial/debian/po/pt.po b/xenial/debian/po/pt.po
index fc79e71f7f3afb1e44bdfbce22e8659a5d76e5d3..c58585770672afdf48caa4f883cdb99bb0918058 100644 (file)
--- a/xenial/debian/po/pt.po
+++ b/xenial/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon 2013.2-1\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2014-03-07 10:34+0100\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2013-11-18 19:42+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -34,6 +34,14 @@ msgstr ""
 "O pacote Apache define um sítio web predefinido e uma página predefinida, "
 "configurada em /etc/apache2/sites-available/default."
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001

diff --git a/xenial/debian/po/ru.po b/xenial/debian/po/ru.po
index d0eba5501de0dc1bf33e1addfcf7fcabffc2c0d4..f057ee093d5665a6fb469fab72b2bdb643d73650 100644 (file)
--- a/xenial/debian/po/ru.po
+++ b/xenial/debian/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon 2013.1.3-2\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2014-03-07 10:34+0100\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2013-10-09 19:26+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -34,6 +34,14 @@ msgstr ""
 "В пакете Apache уже настроен веб-сайт и страница по умолчанию согласно /etc/"
 "apache2/sites-available/default."
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001

diff --git a/xenial/debian/po/sv.po b/xenial/debian/po/sv.po
index 862ab7ca98c5634aa1bd53b3adecb9a57a3cd91c..afab3ff5d4a4596cdbe26c5b4d76fe558eec28f4 100644 (file)
--- a/xenial/debian/po/sv.po
+++ b/xenial/debian/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2014-03-07 10:34+0100\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: 2015-04-01 16:51+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -34,6 +34,14 @@ msgstr ""
 "Apache-paketet levereras med en standard webbplats och en standard sida, "
 "dessa inställningar finns i /etc/apache2/sites-available/default."
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001

diff --git a/xenial/debian/po/templates.pot b/xenial/debian/po/templates.pot
index f283499c9cc6c6fd4f5377d2aa17d0dfff0a931f..2dc11e63fb1861c472cffc66a069da5f0c46e79b 100644 (file)
--- a/xenial/debian/po/templates.pot
+++ b/xenial/debian/po/templates.pot
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the horizon package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: horizon\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
-"POT-Creation-Date: 2014-03-07 10:34+0100\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,6 +31,14 @@ msgid ""
 "in /etc/apache2/sites-available/default."
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../openstack-dashboard-apache.templates:2001

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 39cf2fc25b6c1628a06d95d83e47c74a01fa03ee..b5a4d5c3f8e680099b8facdd66cee89c3dd70bec 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -43,6 +43,9 @@ override_dh_link:
        mv $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss/* $(CURDIR)/debian/openstack-dashboard/var/lib/openstack-dashboard/static/scss
        rmdir $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss
        dh_link
+       for i in auth framework horizon ; do \
+               ln -s /usr/lib/python2.7/dist-packages/horizon/static/$$i $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/$$i ; \
+       done
 
 override_dh_auto_clean:
        dh_auto_clean