[SSPS] Install slx-admin db via install script

1 files changed, 10 insertions, 6 deletions

diff --git a/satellit_installer/static_files/rclocal_script.sh b/satellit_installer/static_files/rclocal_script.sh
index 07a69d3..bfb11a6 100644
--- a/satellit_installer/static_files/rclocal_script.sh
+++ b/satellit_installer/static_files/rclocal_script.sh
@@ -67,10 +67,8 @@ chmod 600 /root/mysqlpass
 echo -n "Konfigurationsdateien werden aktualisiert..."	>> /root/init.log
 
 # sat mysql pass
-# Patch dmsd, vmchooser-query-script
-patchfiles "%MYSQL_SAT_PASS%" "$MYSQL_SAT_NEW" "$DMSDDIR/config.properties" "/srv/openslx/www/vmchooser/list.php"
-# Pureftpd
-patchfiles 'MYSQLPassword.*$' "MYSQLPassword $MYSQL_SAT_NEW" "/etc/pure-ftpd/db/mysql.conf"
+# Patch dmsd
+patchfiles "%MYSQL_SAT_PASS%" "$MYSQL_SAT_NEW"                         "$DMSDDIR/config.properties"
 
 # openslx mysql pass
 # Patching openslx-mysql-userpass into slx-admin config:
@@ -81,14 +79,20 @@ patchfiles 'password *=.*$' "password = $MYSQL_SYSMAINT_NEW"           "/etc/mys
 
 echo " ok."	>> /root/init.log
 
-echo -n "Dienste werden aktiviert..."	>> /root/init.log
+echo "Dienste werden aktiviert..."	>> /root/init.log
 
 # Enable bwLehrpool related services
 for i in dmsd.service taskmanager.service; do
 	systemctl enable $i
 	[ $? -ne 0 ] && echo "Warnung - konnte systemd-Service $i nicht aktivieren!" >> /root/init.log
+	systemctl start $i
 done
-echo -n " ok."  >> /root/init.log
+
+# Install slx-admin DB
+(
+	cd "/srv/openslx/www/slx-admin"
+	sudo -n -u www-data ./install-all >> /root/init.log
+)
 
 # Write MOTD
 cat > /etc/motd <<THEREDOC