Merged from central repo

Rewritten-From: ae6bb8f92b6f6be6ac4bddd833c65797f1aa443f

diff --cc trusty/debian/control
index 286c908c6993288e058a8d25bc930e540a6774db,49286da775428a29723370b5b573285e53de6869..5ea2e423b6fc80d51594e480644a19080c5f890c
--- 1/trusty/debian/control
--- 2/trusty/debian/control
+++ b/trusty/debian/control
@@@ -63,8 -63,10 +63,10 @@@ Depends: ${shlibs:Depends}
   python-django-horizon (= ${source:Version}),
   libjs-jquery,
   libjs-jquery-cookie,
-  adduser
- Recommends: openstack-dashboard-apache
+  node-less,
+  adduser,
+  libapache2-mod-wsgi (>= 2.3)
 -Recommends: memcached
++Recommends: memcached, openstack-dashboard-apache
  Description: OpenStack Dashboard
   The OpenStack Dashboard is a Web application allowing to control an
   OpenStack cloud.

diff --cc trusty/debian/rules
index fed090fe2ce1078013def4ff9caa49ada399b1bb,32d48152f73c6900a01043b9298a584aba948590..73c6b04f78ca2e3280f8005f30c5d21bef0d14d6
--- 1/trusty/debian/rules
--- 2/trusty/debian/rules
+++ b/trusty/debian/rules
@@@ -34,8 -40,17 +40,17 @@@ override_dh_auto_install
        chmod 644 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js/*.js
        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
 -      
 +
-       dh_auto_install
+       # 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
+       rm -r $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css
+       ln -s /var/lib/openstack-dashboard/static/js $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js
+       ln -s /var/lib/openstack-dashboard/static/css $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css
  
  override_dh_builddeb:
        dh_builddeb -- -Zxz -z9