summaryrefslogtreecommitdiffstats
path: root/satellit_installer/static_files
diff options
context:
space:
mode:
authorSimon Rettberg2017-05-12 22:51:26 +0200
committerSimon Rettberg2017-05-12 22:51:26 +0200
commit52c71d09b8e236148440efc170042ea6d63a4a08 (patch)
treecff2ad693eed10d082a48f11d156ff9fa5adab43 /satellit_installer/static_files
parent[SSPS] lighttpd ssl: Set redirect code to 302 (diff)
downloadsetup-scripts-52c71d09b8e236148440efc170042ea6d63a4a08.tar.gz
setup-scripts-52c71d09b8e236148440efc170042ea6d63a4a08.tar.xz
setup-scripts-52c71d09b8e236148440efc170042ea6d63a4a08.zip
[SSPS] Update slx-admin cronjob handling
Diffstat (limited to 'satellit_installer/static_files')
-rwxr-xr-xsatellit_installer/static_files/slxadmin-cronscript17
-rw-r--r--satellit_installer/static_files/slxadmin-crontab (renamed from satellit_installer/static_files/slx-admin)2
2 files changed, 18 insertions, 1 deletions
diff --git a/satellit_installer/static_files/slxadmin-cronscript b/satellit_installer/static_files/slxadmin-cronscript
new file mode 100755
index 0000000..4ab7a21
--- /dev/null
+++ b/satellit_installer/static_files/slxadmin-cronscript
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+PIDFILE="/tmp/bwlp-cronphppid"
+OLDPID=
+[ -s "$PIDFILE" ] && OLDPID=$(cat "$PIDFILE")
+
+[ -n "$OLDPID" ] && kill -0 "$OLDPID" && exit 0
+
+echo $$ > "$PIDFILE"
+
+FILE=$(mktemp)
+if ! php /srv/openslx/www/slx-admin/api.php cron >"$FILE" 2>&1; then
+ php /srv/openslx/www/slx-admin/api.php cron --crashreport "$FILE"
+fi
+rm -f -- "$FILE" "$PIDFILE"
+exit 0
+
diff --git a/satellit_installer/static_files/slx-admin b/satellit_installer/static_files/slxadmin-crontab
index aa95e02..ecae4b1 100644
--- a/satellit_installer/static_files/slx-admin
+++ b/satellit_installer/static_files/slxadmin-crontab
@@ -4,5 +4,5 @@ SHELL=/bin/sh
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
@reboot www-data sleep 15 && php /srv/openslx/www/slx-admin/api.php init > /dev/null 2>&1
-*/5 * * * * www-data php /srv/openslx/www/slx-admin/api.php cron > /dev/null 2>&1
+*/5 * * * * www-data /opt/openslx/slxadmin-cronscript