summaryrefslogtreecommitdiffstats
path: root/satellit_installer/static_files
diff options
context:
space:
mode:
authorChristian Rößler2015-09-01 14:54:48 +0200
committerChristian Rößler2015-09-01 14:54:48 +0200
commit6e9e3b94ff3a55ba9f32d149bfc682099efc2679 (patch)
tree3f581b3e7e2ab18897758b43e26b3c47aae77f51 /satellit_installer/static_files
parent[SSPS] (dmsd)config.properties now dmsd:images (640) (diff)
downloadsetup-scripts-6e9e3b94ff3a55ba9f32d149bfc682099efc2679.tar.gz
setup-scripts-6e9e3b94ff3a55ba9f32d149bfc682099efc2679.tar.xz
setup-scripts-6e9e3b94ff3a55ba9f32d149bfc682099efc2679.zip
[SSPS] Renaming db user bwLehrpool --> db user sat
Diffstat (limited to 'satellit_installer/static_files')
-rw-r--r--satellit_installer/static_files/rclocal_script.sh10
-rw-r--r--satellit_installer/static_files/vmchooser_list.php2
2 files changed, 6 insertions, 6 deletions
diff --git a/satellit_installer/static_files/rclocal_script.sh b/satellit_installer/static_files/rclocal_script.sh
index f8f778f..f5d1e29 100644
--- a/satellit_installer/static_files/rclocal_script.sh
+++ b/satellit_installer/static_files/rclocal_script.sh
@@ -51,8 +51,8 @@ mysqladmin -u root -p"${MYSQL_ROOT_PASS}" password "${MYSQL_ROOT_NEW}" || perror
# Just in case...
sed -i "s/^MYSQL_ROOT_PASS=.*\$/MYSQL_ROOT_PASS=${MYSQL_ROOT_NEW}/g" "/root/installer/config"
-MYSQL_BWLEHRPOOL_NEW=$(generate_password)
-echo "SET PASSWORD FOR 'bwLehrpool'@'localhost' = PASSWORD('$MYSQL_BWLEHRPOOL_NEW');" | mysql -u root -p"${MYSQL_ROOT_NEW}" || perror "Neusetzen des bwLehrpool-MySQL-Passworts fehlgeschlagen."
+MYSQL_SAT_NEW=$(generate_password)
+echo "SET PASSWORD FOR 'sat'@'localhost' = PASSWORD('$MYSQL_SAT_NEW');" | mysql -u root -p"${MYSQL_ROOT_NEW}" || perror "Neusetzen des sat-MySQL-Passworts fehlgeschlagen."
MYSQL_OPENSLX_NEW=$(generate_password)
echo "SET PASSWORD FOR 'openslx'@'localhost' = PASSWORD('$MYSQL_OPENSLX_NEW');" | mysql -u root -p"${MYSQL_ROOT_NEW}" || perror "Neusetzen des openslx-MySQL-Passworts fehlgeschlagen."
@@ -66,11 +66,11 @@ chmod 600 /root/mysqlpass
echo -n "Konfigurationsdateien werden aktualisiert..." >> /root/init.log
-# bwLehrpool mysql pass
+# sat mysql pass
# Patch dmsd, vmchooser-query-script
-patchfiles "%MYSQL_BWLEHRPOOL_PASS%" "$MYSQL_BWLEHRPOOL_NEW" "$DMSDDIR/config.properties" "/srv/openslx/www/vmchooser/list.php"
+patchfiles "%MYSQL_SAT_PASS%" "$MYSQL_SAT_NEW" "$DMSDDIR/config.properties" "/srv/openslx/www/vmchooser/list.php"
# Pureftpd
-patchfiles 'MYSQLPassword.*$' "MYSQLPassword $MYSQL_BWLEHRPOOL_NEW" "/etc/pure-ftpd/db/mysql.conf"
+patchfiles 'MYSQLPassword.*$' "MYSQLPassword $MYSQL_SAT_NEW" "/etc/pure-ftpd/db/mysql.conf"
# openslx mysql pass
# Patching openslx-mysql-userpass into slx-admin config:
diff --git a/satellit_installer/static_files/vmchooser_list.php b/satellit_installer/static_files/vmchooser_list.php
index b74e344..b90ddb6 100644
--- a/satellit_installer/static_files/vmchooser_list.php
+++ b/satellit_installer/static_files/vmchooser_list.php
@@ -1,7 +1,7 @@
<?php
-$db = new mysqli('localhost', 'bwLehrpool', '%MYSQL_BWLEHRPOOL_PASS%', 'bwLehrpool');
+$db = new mysqli('localhost', 'sat', '%MYSQL_SAT_PASS%', 'sat');
if ($db->connect_errno) {
printf("Connect failed: %s\n", $mysqli->connect_error);
exit();