summaryrefslogtreecommitdiffstats
path: root/satellit_installer
diff options
context:
space:
mode:
authorSimon Rettberg2023-10-23 15:58:42 +0200
committerSimon Rettberg2023-10-23 15:58:42 +0200
commitca6b8281f3d952db5296b3116b1a8da234425380 (patch)
treec9e6c4bcef480f1a72722623fc3963853ee0eb13 /satellit_installer
parent[SSPS] Add system.conf for systemd (diff)
downloadsetup-scripts-ca6b8281f3d952db5296b3116b1a8da234425380.tar.gz
setup-scripts-ca6b8281f3d952db5296b3116b1a8da234425380.tar.xz
setup-scripts-ca6b8281f3d952db5296b3116b1a8da234425380.zip
[SSPS] slxadmin-boot: Run as proper user, log to journal
Diffstat (limited to 'satellit_installer')
-rw-r--r--satellit_installer/static_files/slxadmin/etc/systemd/system/slxadmin-boot.service1
-rwxr-xr-xsatellit_installer/static_files/slxadmin/opt/openslx/slxadmin-bootscript2
2 files changed, 3 insertions, 0 deletions
diff --git a/satellit_installer/static_files/slxadmin/etc/systemd/system/slxadmin-boot.service b/satellit_installer/static_files/slxadmin/etc/systemd/system/slxadmin-boot.service
index ede9d43..34b0153 100644
--- a/satellit_installer/static_files/slxadmin/etc/systemd/system/slxadmin-boot.service
+++ b/satellit_installer/static_files/slxadmin/etc/systemd/system/slxadmin-boot.service
@@ -7,6 +7,7 @@ Wants=network-online.target taskmanager.service
[Service]
Type=oneshot
+User=www-data
ExecStart=/opt/openslx/slxadmin-bootscript
[Install]
diff --git a/satellit_installer/static_files/slxadmin/opt/openslx/slxadmin-bootscript b/satellit_installer/static_files/slxadmin/opt/openslx/slxadmin-bootscript
index 937de4f..1df48a3 100755
--- a/satellit_installer/static_files/slxadmin/opt/openslx/slxadmin-bootscript
+++ b/satellit_installer/static_files/slxadmin/opt/openslx/slxadmin-bootscript
@@ -15,6 +15,8 @@ elif [ -s "$FILE" ]; then
php /srv/openslx/www/slx-admin/api.php init --logreport "$FILE"
fi
+cat "$FILE"
rm -- "$FILE"
sleep 1
+
exit 0