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

remove manage from init.d (first step)

This commit is contained in:
Thomas NOËL 2014-10-02 16:43:55 +02:00
parent 7b6442dfb5
commit 91db31f15d
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
init.d
View File

@ -23,9 +23,9 @@ BIND=unix:$RUN_DIR/$NAME.sock
WORKERS=5
TIMEOUT=10
MANAGE_SCRIPT=/usr/lib/$NAME/manage.py
DJANGO_SETTINGS_MODULE=passerelle.settings
DJANGO_CONFIG_FILE=/usr/lib/$NAME/debian_config.py
MANAGE_SCRIPT="python /usr/lib/$NAME/manage.py --config=$DJANGO_CONFIG_FILE"
USER=$NAME
GROUP=$NAME
@ -126,18 +126,18 @@ do_reload() {
do_migrate() {
log_action_msg "Applying new migrations .."
if [ "x$TENANT_BASE" != "x" ]; then
su $USER -p -c "python $MANAGE_SCRIPT create_schema"
su $USER -p -c "python $MANAGE_SCRIPT sync_schemas --noinput"
su $USER -p -c "python $MANAGE_SCRIPT migrate_schemas --noinput"
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"
else
su $USER -p -c "python $MANAGE_SCRIPT syncdb --migrate --noinput"
su $USER -p -c "$MANAGE_SCRIPT syncdb --migrate --noinput"
fi
log_action_msg ".. done"
}
do_collectstatic() {
log_action_msg "Collect static files.."
su $USER -p -c "python $MANAGE_SCRIPT collectstatic --noinput"
su $USER -p -c "$MANAGE_SCRIPT collectstatic --noinput --link"
log_action_msg ".. done"
}
@ -198,26 +198,18 @@ case "$1" in
;;
esac
;;
manage)
shift
if [ $(id -un) != "$USER" ]; then
sudo -E -H -u $USER python $MANAGE_SCRIPT "$@"
else
python $MANAGE_SCRIPT "$@"
fi
;;
create-tenant)
shift
TENANT=`su $USER -p -c "python $MANAGE_SCRIPT get_tenant_by_domain \"$1\""`
log_daemon_msg "Creating tenant" "$TENANT"
if [ "x$TENANT_BASE" == "x" ]; then
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\""`
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/"
$SCRIPTNAME manage create_schema
su $USER -p -c "$MANAGE_SCRIPT --multitenant create_schema"
fi
;;
*)