debian: only execute migrate and collectstatic in postinst
* reload and restart should be a lot faster * collectstatic is now always done using parameter -l * collectstatic and migrate target are removed from init script, for a simpler "update"
This commit is contained in:
parent
2ba4944404
commit
4e0c85c4c4
|
|
@ -1,8 +1,10 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: authentic2-multitenant
|
||||
# Required-Start: $network $local_fs
|
||||
# Required-Stop:
|
||||
# Required-Start: $network $local_fs $syslog
|
||||
# Required-Stop: $network $local_fs $syslog
|
||||
# Should-Start: postgresql
|
||||
# Should-Stop: postgresql
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Authentic2 is a versatile identity provider
|
||||
|
|
@ -127,14 +129,12 @@ do_reload() {
|
|||
|
||||
do_migrate() {
|
||||
log_action_msg "Applying new migrations .."
|
||||
su $USER -s /bin/sh -p -c "$MANAGE_SCRIPT migrate_schemas --noinput"
|
||||
su $USER -s /bin/sh -p -c "$MANAGE_SCRIPT migrate_schemas -l --noinput"
|
||||
log_action_msg ".. done"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
do_migrate
|
||||
do_collectstatic
|
||||
log_daemon_msg "Starting $DESC " "$NAME"
|
||||
do_start
|
||||
case "$?" in
|
||||
|
|
@ -153,20 +153,23 @@ case "$1" in
|
|||
status)
|
||||
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
|
||||
;;
|
||||
reload|force-reload)
|
||||
reload)
|
||||
log_daemon_msg "Reloading $DESC" "$NAME"
|
||||
do_reload
|
||||
log_end_msg $?
|
||||
;;
|
||||
restart|force-reload)
|
||||
update)
|
||||
log_daemon_msg "Updating $DESC" "$NAME"
|
||||
do_migrate && do_collectstatic
|
||||
log_end_msg $?
|
||||
;;
|
||||
restart)
|
||||
#
|
||||
# If the "reload" option is implemented then remove the
|
||||
# 'force-reload' alias
|
||||
#
|
||||
log_daemon_msg "Restarting $DESC" "$NAME"
|
||||
do_stop
|
||||
do_migrate
|
||||
do_collectstatic
|
||||
case "$?" in
|
||||
0|1)
|
||||
do_start
|
||||
|
|
@ -183,7 +186,7 @@ case "$1" in
|
|||
esac
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|reload|update}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ case "$1" in
|
|||
/var/run/$NAME \
|
||||
/var/log/$NAME
|
||||
;;
|
||||
/etc/init.d/$NAME update
|
||||
triggered)
|
||||
su -s /bin/sh -c "$MANAGE_SCRIPT hobo_deploy --redeploy" $AUTHENTIC_USER
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: authentic2
|
||||
# Required-Start: $network $local_fs
|
||||
# Required-Stop:
|
||||
# Required-Start: $network $local_fs $syslog
|
||||
# Required-Stop: $network $local_fs $syslog
|
||||
# Should-Start: postgresql
|
||||
# Should-Stop: postgresql
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Authentic2 is a versatile identity provider
|
||||
|
|
@ -138,7 +140,7 @@ do_migrate() {
|
|||
|
||||
do_collectstatic() {
|
||||
log_action_msg "Collecting static files .."
|
||||
su $USER -p -c "$MANAGE_SCRIPT collectstatic --noinput"
|
||||
su $USER -p -c "$MANAGE_SCRIPT collectstatic -l --noinput"
|
||||
log_action_msg ".. done"
|
||||
}
|
||||
|
||||
|
|
@ -165,26 +167,21 @@ case "$1" in
|
|||
status)
|
||||
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
|
||||
;;
|
||||
reload|force-reload)
|
||||
#
|
||||
# If do_reload() is not implemented then leave this commented out
|
||||
# and leave 'force-reload' as an alias for 'restart'.
|
||||
#
|
||||
reload)
|
||||
log_daemon_msg "Reloading $DESC" "$NAME"
|
||||
do_reload
|
||||
log_end_msg $?
|
||||
;;
|
||||
restart|force-reload)
|
||||
#
|
||||
# If the "reload" option is implemented then remove the
|
||||
# 'force-reload' alias
|
||||
#
|
||||
update)
|
||||
log_daemon_msg "Updating $DESC" "$NAME"
|
||||
do_migrate && do_collectstatic
|
||||
log_end_msg $?
|
||||
;;
|
||||
restart)
|
||||
log_daemon_msg "Restarting $DESC" "$NAME"
|
||||
do_stop
|
||||
case "$?" in
|
||||
0|1)
|
||||
do_migrate
|
||||
do_collectstatic
|
||||
do_start
|
||||
case "$?" in
|
||||
0) log_end_msg 0 ;;
|
||||
|
|
@ -198,12 +195,6 @@ case "$1" in
|
|||
;;
|
||||
esac
|
||||
;;
|
||||
collectstatic)
|
||||
do_collectstatic
|
||||
;;
|
||||
migrate)
|
||||
do_migrate
|
||||
;;
|
||||
manage)
|
||||
shift
|
||||
if [ $(id -un) != "$USER" ]; then
|
||||
|
|
@ -213,7 +204,7 @@ case "$1" in
|
|||
fi
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|update|reload}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ case "$1" in
|
|||
chmod 640 /etc/authentic2/cert.pem /etc/authentic2/key.pem
|
||||
echo "..done" >&2
|
||||
fi
|
||||
/etc/init.d/$NAME update
|
||||
;;
|
||||
|
||||
reconfigure|abort-upgrade|abort-remove|abort-deconfigure)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: authentic2-multitenant
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $network $local_fs $remote_fs $syslog
|
||||
# Required-Start: $network $local_fs $syslog
|
||||
# Required-Stop: $network $local_fs $syslog
|
||||
# Should-Start: postgresql
|
||||
# Should-Stop: postgresql
|
||||
# Default-Start: 2 3 4 5
|
||||
|
|
@ -129,14 +129,12 @@ do_reload() {
|
|||
|
||||
do_migrate() {
|
||||
log_action_msg "Applying new migrations .."
|
||||
su $USER -s /bin/sh -p -c "$MANAGE_SCRIPT migrate_schemas --noinput"
|
||||
su $USER -s /bin/sh -p -c "$MANAGE_SCRIPT migrate_schemas -l --noinput"
|
||||
log_action_msg ".. done"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
do_migrate
|
||||
do_collectstatic
|
||||
log_daemon_msg "Starting $DESC " "$NAME"
|
||||
do_start
|
||||
case "$?" in
|
||||
|
|
@ -155,20 +153,23 @@ case "$1" in
|
|||
status)
|
||||
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
|
||||
;;
|
||||
reload|force-reload)
|
||||
reload)
|
||||
log_daemon_msg "Reloading $DESC" "$NAME"
|
||||
do_reload
|
||||
log_end_msg $?
|
||||
;;
|
||||
restart|force-reload)
|
||||
update)
|
||||
log_daemon_msg "Updating $DESC" "$NAME"
|
||||
do_migrate && do_collectstatic
|
||||
log_end_msg $?
|
||||
;;
|
||||
restart)
|
||||
#
|
||||
# If the "reload" option is implemented then remove the
|
||||
# 'force-reload' alias
|
||||
#
|
||||
log_daemon_msg "Restarting $DESC" "$NAME"
|
||||
do_stop
|
||||
do_migrate
|
||||
do_collectstatic
|
||||
case "$?" in
|
||||
0|1)
|
||||
do_start
|
||||
|
|
@ -185,7 +186,7 @@ case "$1" in
|
|||
esac
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|reload|update}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ case "$1" in
|
|||
/var/run/$NAME \
|
||||
/var/log/$NAME
|
||||
;;
|
||||
/etc/init.d/$NAME update
|
||||
triggered)
|
||||
su -s /bin/sh -c "$MANAGE_SCRIPT hobo_deploy --redeploy" $AUTHENTIC_USER
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: authentic2
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $network $local_fs $remote_fs $syslog
|
||||
# Required-Start: $network $local_fs $syslog
|
||||
# Required-Stop: $network $local_fs $syslog
|
||||
# Should-Start: postgresql
|
||||
# Should-Stop: postgresql
|
||||
# Default-Start: 2 3 4 5
|
||||
|
|
@ -167,26 +167,21 @@ case "$1" in
|
|||
status)
|
||||
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
|
||||
;;
|
||||
reload|force-reload)
|
||||
#
|
||||
# If do_reload() is not implemented then leave this commented out
|
||||
# and leave 'force-reload' as an alias for 'restart'.
|
||||
#
|
||||
reload)
|
||||
log_daemon_msg "Reloading $DESC" "$NAME"
|
||||
do_reload
|
||||
log_end_msg $?
|
||||
;;
|
||||
restart|force-reload)
|
||||
#
|
||||
# If the "reload" option is implemented then remove the
|
||||
# 'force-reload' alias
|
||||
#
|
||||
update)
|
||||
log_daemon_msg "Updating $DESC" "$NAME"
|
||||
do_migrate && do_collectstatic
|
||||
log_end_msg $?
|
||||
;;
|
||||
restart)
|
||||
log_daemon_msg "Restarting $DESC" "$NAME"
|
||||
do_stop
|
||||
case "$?" in
|
||||
0|1)
|
||||
do_migrate
|
||||
do_collectstatic
|
||||
do_start
|
||||
case "$?" in
|
||||
0) log_end_msg 0 ;;
|
||||
|
|
@ -200,12 +195,6 @@ case "$1" in
|
|||
;;
|
||||
esac
|
||||
;;
|
||||
collectstatic)
|
||||
do_collectstatic
|
||||
;;
|
||||
migrate)
|
||||
do_migrate
|
||||
;;
|
||||
manage)
|
||||
shift
|
||||
if [ $(id -un) != "$USER" ]; then
|
||||
|
|
@ -215,7 +204,7 @@ case "$1" in
|
|||
fi
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|update|reload}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ case "$1" in
|
|||
chmod 640 /etc/authentic2/cert.pem /etc/authentic2/key.pem
|
||||
echo "..done" >&2
|
||||
fi
|
||||
/etc/init.d/$NAME update
|
||||
;;
|
||||
|
||||
reconfigure|abort-upgrade|abort-remove|abort-deconfigure)
|
||||
|
|
|
|||
Loading…
Reference in New Issue