diff options
| author | Simon Rettberg | 2019-10-29 12:26:34 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-10-29 12:26:34 +0100 |
| commit | 4cc7274de5f83c3fcdd486646b1118ba58874d12 (patch) | |
| tree | e0711efc3e70d221db81ed910b3d92116d6ee12a | |
| parent | [SSPS] Update deprecated lighttpd.conf line (diff) | |
| download | setup-scripts-4cc7274de5f83c3fcdd486646b1118ba58874d12.tar.gz setup-scripts-4cc7274de5f83c3fcdd486646b1118ba58874d12.tar.xz setup-scripts-4cc7274de5f83c3fcdd486646b1118ba58874d12.zip | |
[SSPS] Move taskmanager.service to file; use launch script
Launch script is now included in taskmanager.tar.gz
| -rw-r--r-- | satellit_installer/includes/50-install_taskmanager.inc | 30 | ||||
| -rw-r--r-- | satellit_installer/static_files/taskmanager/taskmanager.service | 17 |
2 files changed, 22 insertions, 25 deletions
diff --git a/satellit_installer/includes/50-install_taskmanager.inc b/satellit_installer/includes/50-install_taskmanager.inc index 7b6d682..6cf9541 100644 --- a/satellit_installer/includes/50-install_taskmanager.inc +++ b/satellit_installer/includes/50-install_taskmanager.inc @@ -1,31 +1,11 @@ -install_taskmanager_service() { - # $1: directory to install taskmanager to - cat > /etc/systemd/system/taskmanager.service <<-SOMEWHEREDOC - [Unit] - Description=Taskmanager is a bwLehrpool service daemon - - [Service] - User=taskmanager - Group=taskmanager - WorkingDirectory=$1 - ExecStart=$(which java) -Xmx80M -jar taskmanager.jar - Restart=always - RestartSec=5 - SyslogIdentifier=taskmanager - StandardOutput=syslog - StandardError=syslog - - [Install] - WantedBy=multi-user.target - SOMEWHEREDOC -} - install_taskmanager() { # $1: directory to install taskmanager to - echo -n "# Installing taskmanager... " - mkdir -p "$1" 2>/dev/null + echo "# Installing taskmanager... " + mkdir -p "$1" unpack_tar_gz "$BASEDIR/static_files/taskmanager.tar.gz" "-C $1" - install_taskmanager_service "$1" chown -R root:root "$1" + install -o root "$BASEDIR/static_files/taskmanager/taskmanager.service" "/etc/systemd/system/taskmanager.service" || perror "Could not install systemd service" + systemctl daemon-reload + systemctl enable taskmanager.service || perror "Could not enable taskmanager.service" echo "ok" } diff --git a/satellit_installer/static_files/taskmanager/taskmanager.service b/satellit_installer/static_files/taskmanager/taskmanager.service new file mode 100644 index 0000000..97662cb --- /dev/null +++ b/satellit_installer/static_files/taskmanager/taskmanager.service @@ -0,0 +1,17 @@ +[Unit] +Description=bwLehrpool Taskmanager + +[Service] +User=taskmanager +Group=taskmanager +WorkingDirectory=/opt/taskmanager/ +ExecStart=/opt/taskmanager/taskmanager.sh +Restart=always +RestartSec=5 +SyslogIdentifier=taskmanager +StandardOutput=syslog +StandardError=syslog + +[Install] +WantedBy=multi-user.target + |