summaryrefslogtreecommitdiffstats
path: root/satellit_installer/static_files
diff options
context:
space:
mode:
Diffstat (limited to 'satellit_installer/static_files')
-rw-r--r--satellit_installer/static_files/slxadmin-boot.service13
-rwxr-xr-xsatellit_installer/static_files/slxadmin-bootscript11
-rw-r--r--satellit_installer/static_files/slxadmin-crontab1
3 files changed, 24 insertions, 1 deletions
diff --git a/satellit_installer/static_files/slxadmin-boot.service b/satellit_installer/static_files/slxadmin-boot.service
new file mode 100644
index 0000000..21bdf51
--- /dev/null
+++ b/satellit_installer/static_files/slxadmin-boot.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Trigger init hooks of slx-admin
+RefuseManualStart=yes
+Before=lighttpd.service
+After=mariadb.service mysql.service network.target taskmanager.service
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+ExecStart=/opt/openslx/slxadmin-bootscript
+
+[Install]
+WantedBy=multi-user.target
diff --git a/satellit_installer/static_files/slxadmin-bootscript b/satellit_installer/static_files/slxadmin-bootscript
new file mode 100755
index 0000000..98aafed
--- /dev/null
+++ b/satellit_installer/static_files/slxadmin-bootscript
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+FILE=$(mktemp)
+
+if ! php /srv/openslx/www/slx-admin/api.php init > "$FILE" 2>&1; then
+ php /srv/openslx/www/slx-admin/api.php init --crashreport "$FILE"
+fi
+
+rm -- "$FILE"
+sleep 1
+exit 0
diff --git a/satellit_installer/static_files/slxadmin-crontab b/satellit_installer/static_files/slxadmin-crontab
index ecae4b1..440ac35 100644
--- a/satellit_installer/static_files/slxadmin-crontab
+++ b/satellit_installer/static_files/slxadmin-crontab
@@ -3,6 +3,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 /opt/openslx/slxadmin-cronscript