summaryrefslogtreecommitdiffstats
path: root/satellit_installer
diff options
context:
space:
mode:
authorSimon Rettberg2020-12-09 08:53:38 +0100
committerSimon Rettberg2020-12-09 08:53:38 +0100
commit04a0327e9fa7f69ea6ce1d9d25d828ef485118b5 (patch)
tree71d5353e1c8c9f409ff6929f90fd5d1a825af46e /satellit_installer
parent[SSPS] slx-cert: Include hashed links with config.tgz (diff)
downloadsetup-scripts-04a0327e9fa7f69ea6ce1d9d25d828ef485118b5.tar.gz
setup-scripts-04a0327e9fa7f69ea6ce1d9d25d828ef485118b5.tar.xz
setup-scripts-04a0327e9fa7f69ea6ce1d9d25d828ef485118b5.zip
[SSPS] slx-cert: Also restart if running via terminal
Diffstat (limited to 'satellit_installer')
-rw-r--r--satellit_installer/includes/10-sudo_config.inc15
-rwxr-xr-xsatellit_installer/static_files/slx-cert2
2 files changed, 2 insertions, 15 deletions
diff --git a/satellit_installer/includes/10-sudo_config.inc b/satellit_installer/includes/10-sudo_config.inc
index e37a7d1..8b3b369 100644
--- a/satellit_installer/includes/10-sudo_config.inc
+++ b/satellit_installer/includes/10-sudo_config.inc
@@ -9,20 +9,7 @@ sudo_config() {
taskmanager ALL=(ldadp) NOPASSWD: /opt/taskmanager/scripts/ldadp-launcher
taskmanager ALL=(root) NOPASSWD: /sbin/reboot
taskmanager ALL=(root) NOPASSWD: /bin/netstat
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl start dmsd
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl stop dmsd
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl enable dmsd
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl disable dmsd
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl restart dmsd
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl status dmsd
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl start dnbd3-server
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl stop dnbd3-server
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl enable dnbd3-server
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl disable dnbd3-server
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl restart dnbd3-server
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl status dnbd3-server
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl restart taskmanager
- taskmanager ALL=(root) NOPASSWD: /bin/systemctl status taskmanager
+ taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/systemctl
taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/mount-store
taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/system-backup
taskmanager ALL=(root) NOPASSWD: /opt/taskmanager/scripts/system-restore
diff --git a/satellit_installer/static_files/slx-cert b/satellit_installer/static_files/slx-cert
index 51dde1b..fac8d26 100755
--- a/satellit_installer/static_files/slx-cert
+++ b/satellit_installer/static_files/slx-cert
@@ -209,7 +209,7 @@ if [ -n "$mknew" ] || [ "${#srv_list[@]}" = 0 ] \
# Create ca-chain
cat "${in_list[@]}" > "${LIGHT}/ca-chain.pem"
- if [ "$1" = "--restart" ] && [ -n "$restart" ]; then
+ if [ "$1" = "--restart" ] || [ -t 0 ]; then
echo "Restarting lighttpd..."
systemctl restart lighttpd.service
fi