From 135ddffcb85e4fde7d2a229aea505d85825e2c10 Mon Sep 17 00:00:00 2001
From: Serghei MIHAI <smihai@entrouvert.com>
Date: Fri, 20 Feb 2015 15:50:07 +0100
Subject: [PATCH 1/2] multitenant: static files collecting on initialization
 (#6562)

---
 debian/authentic2-multitenant.dirs  |  2 ++
 debian/authentic2-multitenant.init  | 14 ++++++++++++--
 debian/multitenant/debian_config.py |  3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/authentic2-multitenant.dirs b/debian/authentic2-multitenant.dirs
index bf059c0..edfdc47 100644
--- a/debian/authentic2-multitenant.dirs
+++ b/debian/authentic2-multitenant.dirs
@@ -1,5 +1,7 @@
 etc/authentic2-multitenant
 usr/lib/authentic2-multitenant
 var/lib/authentic2-multitenant/tenants
+var/lib/authentic2-multitenant/static
+var/lib/authentic2-multitenant/collected-static
 var/run/authentic2-multitenant
 var/log/authentic2-multitenant
diff --git a/debian/authentic2-multitenant.init b/debian/authentic2-multitenant.init
index 4bbfed4..bbc8ded 100644
--- a/debian/authentic2-multitenant.init
+++ b/debian/authentic2-multitenant.init
@@ -23,6 +23,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 BIND=unix:$PID_DIR/$NAME.sock
 
 export AUTHENTIC2_SETTINGS_FILE=/usr/lib/$NAME/debian_config.py
+MANAGE_SCRIPT="/usr/bin/$NAME-manage"
 
 USER=authentic-multitenant
 GROUP=authentic-multitenant
@@ -61,6 +62,13 @@ if [ ! -d $CACHE_DIR ]; then
     install -d -m 755 -o $USER -g $GROUP $CACHE_DIR
 fi
 
+# Function collecting static files
+do_collectstatic() {
+    log_action_msg "Collect static files.."
+    su $USER -p -c "$MANAGE_SCRIPT collectstatic --noinput"
+    log_action_msg ".. done"
+}
+
 #
 # Function that starts the daemon/service
 #
@@ -118,13 +126,14 @@ do_reload() {
 
 do_migrate() {
     log_action_msg "Applying new migrations .."
-    su $USER -p -c "/usr/bin/authentic2-multitenant-manage migrate_schemas --noinput"
+    su $USER -p -c "/usr/bin/$MANAGE_SCRIPT migrate_schemas --noinput"
     log_action_msg ".. done"
 }
 
 case "$1" in
   start)
     do_migrate
+    do_collectstatic
     log_daemon_msg "Starting $DESC " "$NAME"
     do_start
     case "$?" in
@@ -159,7 +168,8 @@ case "$1" in
 	#
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	do_stop
-    do_migrate
+        do_migrate
+        do_collectstatic
 	case "$?" in
 	  0|1)
 		do_start
diff --git a/debian/multitenant/debian_config.py b/debian/multitenant/debian_config.py
index 72ee7f2..ade980b 100644
--- a/debian/multitenant/debian_config.py
+++ b/debian/multitenant/debian_config.py
@@ -12,6 +12,9 @@ except ImportError:
 VAR_DIR = os.path.join('/var/lib', PROJECT_NAME)
 ETC_DIR = os.path.join('/etc', PROJECT_NAME)
 
+STATIC_ROOT = os.path.join(VAR_DIR, 'collected-static')
+STATICFILES_DIRS = (os.path.join(VAR_DIR, 'static'),)
+
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 TEMPLATE_DEBUG = False
-- 
2.1.4