diff options
| author | Christian Rößler | 2015-06-24 10:56:24 +0200 |
|---|---|---|
| committer | Christian Rößler | 2015-06-24 10:56:24 +0200 |
| commit | f99af2cddc247c9597fea30505153a8d6eb835fc (patch) | |
| tree | f9b62ec8928a6c516729d2b27559a56b1b6ba217 /satellit_installer/static_files/rclocal_script.sh | |
| parent | [SSPS] systemd service files re-checked, simplified. (diff) | |
| download | setup-scripts-f99af2cddc247c9597fea30505153a8d6eb835fc.tar.gz setup-scripts-f99af2cddc247c9597fea30505153a8d6eb835fc.tar.xz setup-scripts-f99af2cddc247c9597fea30505153a8d6eb835fc.zip | |
[SSPS] WARNING: syncdaemon removed!
Diffstat (limited to 'satellit_installer/static_files/rclocal_script.sh')
| -rw-r--r-- | satellit_installer/static_files/rclocal_script.sh | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/satellit_installer/static_files/rclocal_script.sh b/satellit_installer/static_files/rclocal_script.sh index 8d70942..46ae9aa 100644 --- a/satellit_installer/static_files/rclocal_script.sh +++ b/satellit_installer/static_files/rclocal_script.sh @@ -67,8 +67,8 @@ chmod 600 /root/mysqlpass echo -n "Konfigurationsdateien werden aktualisiert..." >> /root/init.log # bwLehrpool mysql pass -# Patch dmsd, syncdaemon, vmchooser-query-script -patchfiles "%MYSQL_BWLEHRPOOL_PASS%" "$MYSQL_BWLEHRPOOL_NEW" "$DMSDDIR/Server_Config.ini" "/opt/syncdaemon/config/mysql.properties" "/srv/openslx/www/vmchooser/list.php" +# Patch dmsd, vmchooser-query-script +patchfiles "%MYSQL_BWLEHRPOOL_PASS%" "$MYSQL_BWLEHRPOOL_NEW" "$DMSDDIR/Server_Config.ini" "/srv/openslx/www/vmchooser/list.php" # Pureftpd patchfiles 'MYSQLPassword.*$' "MYSQLPassword $MYSQL_BWLEHRPOOL_NEW" "/etc/pure-ftpd/db/mysql.conf" @@ -83,8 +83,7 @@ echo " ok." >> /root/init.log echo -n "Dienste werden aktiviert..." >> /root/init.log -which systemctl >/dev/null -if [ $? -eq 0 ]; then +if [ $(ps -p 1 -o comm=) = systemd ]; then echo "Systemd erkannt (systemctl vorhanden)." >> /root/init.log if [ ! -f /etc/systemd/system/dmsd.service ]; then cat > /etc/systemd/system/dmsd.service <<-HEREDOC @@ -120,24 +119,7 @@ if [ $? -eq 0 ]; then SOMEWHEREDOC echo "taskmanager.service geschrieben." >> /root/init.log fi - if [ ! -f /etc/systemd/system/syncdaemon.service ]; then - cat > /etc/systemd/system/syncdaemon.service <<-ANOTHERDOC - [Unit] - Description=The syncdaemon is a bwLehrpool syncing daemon - - [Service] - User=syncdaemon - Group=images - WorkingDirectory=$SYNCDAEMONDIR - ExecStart=$(which java) -Xmx96M -jar syncdaemon.jar - Restart=always - - [Install] - WantedBy=multi-user.target - ANOTHERDOC - echo "syncdaemon.service geschrieben." >> /root/init.log - fi - for i in dmsd.service taskmanager.service syncdaemon.service; do + for i in dmsd.service taskmanager.service; do systemctl enable $i [ $? -ne 0 ] && echo "Warnung - konnte systemd-Service $i nicht aktivieren!" >> /root/init.log done @@ -151,11 +133,6 @@ else if ! grep -q "tman.*respawn" /etc/inittab; then echo "tman:2345:respawn:$TASKMANDIR/taskmanager.sh" >> /etc/inittab fi - - # inittab-entry syncdaemon: - if ! grep -q "synd.*respawn" /etc/inittab; then - echo "synd:2:once:/opt/syncdaemon/syncdaemon.sh" >> /etc/inittab - fi fi echo -n " ok." >> /root/init.log |