entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

init.d: fix multitenant detection 

Conclusion: I'm tired.
This commit is contained in:
Thomas NOËL 2014-10-02 17:10:29 +02:00
parent 5bb12774dd
commit 77b77c02fd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
init.d
View File

@ -64,8 +64,9 @@ fi
export DJANGO_SETTINGS_MODULE
export DJANGO_CONFIG_FILE
# multitenant mode
if [ "x$DJANGO_SETTINGS_MODULE" != "xpasserelle.tenant_settings" ]; then
if [ "x$DJANGO_SETTINGS_MODULE" = "xpasserelle.tenant_settings" ]; then
TENANT_BASE=/var/lib/$NAME/tenants
MANAGE_SCRIPT="$MANAGE_SCRIPT --multitenant"
fi
#
@ -126,9 +127,9 @@ do_reload() {
do_migrate() {
log_action_msg "Applying new migrations .."
if [ "x$TENANT_BASE" != "x" ]; then
su $USER -p -c "$MANAGE_SCRIPT --multitenant create_schema"
su $USER -p -c "$MANAGE_SCRIPT --multitenant sync_schemas --noinput"
su $USER -p -c "$MANAGE_SCRIPT --multitenant migrate_schemas --noinput"
su $USER -p -c "$MANAGE_SCRIPT create_schema"
su $USER -p -c "$MANAGE_SCRIPT sync_schemas --noinput"
su $USER -p -c "$MANAGE_SCRIPT migrate_schemas --noinput"
else
su $USER -p -c "$MANAGE_SCRIPT syncdb --migrate --noinput"
fi
@ -203,13 +204,13 @@ case "$1" in
log_failure_msg "multitenant mode not set in /etc/default/$NAME"
log_end_msg 1
shift
TENANT=`su $USER -p -c "$MANAGE_SCRIPT --multitenant get_tenant_by_domain \"$1\""`
TENANT=`su $USER -p -c "$MANAGE_SCRIPT get_tenant_by_domain \"$1\""`
log_daemon_msg "Creating tenant" "$TENANT"
else
TENANT_DIR="$TENANT_BASE/$TENANT/"
mkdir "$TENANT_DIR" "$TENANT_DIR/media/" "$TENANT_DIR/static" "$TENANT_DIR/templates"
chown $USER:$GROUP "$TENANT_DIR/media/"
su $USER -p -c "$MANAGE_SCRIPT --multitenant create_schema"
su $USER -p -c "$MANAGE_SCRIPT create_schema"
fi
;;
*)