diff options
| author | Christian Rößler | 2014-07-30 14:13:22 +0200 |
|---|---|---|
| committer | Christian Rößler | 2014-07-30 14:13:22 +0200 |
| commit | 5de413587f8f3f4cd10d0574a60b1ecc7f20ff2b (patch) | |
| tree | fc05373613f544f9aef1386743b0043125dbd6b2 | |
| parent | [SSPS] Some debug stuff out-commented, started documentation (diff) | |
| download | setup-scripts-5de413587f8f3f4cd10d0574a60b1ecc7f20ff2b.tar.gz setup-scripts-5de413587f8f3f4cd10d0574a60b1ecc7f20ff2b.tar.xz setup-scripts-5de413587f8f3f4cd10d0574a60b1ecc7f20ff2b.zip | |
[SSPS] Self-made bug corrected, some explanations
| -rwxr-xr-x | satellit_installer/includes/10-query_user.inc | 13 | ||||
| -rw-r--r-- | satellit_installer/includes/10-script_dropper.inc | 1 | ||||
| -rw-r--r-- | satellit_installer/includes/90-set_directory_permissions.inc | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/satellit_installer/includes/10-query_user.inc b/satellit_installer/includes/10-query_user.inc index 96846db..45e3bee 100755 --- a/satellit_installer/includes/10-query_user.inc +++ b/satellit_installer/includes/10-query_user.inc @@ -68,9 +68,14 @@ set_passwords() { MYSQL_ROOT_PASS="$(generate_password)" MYSQL_OPENSLX_PASS="$(generate_password)" MYSQL_BWLEHRPOOL_PASS="$(generate_password)" - # echo "OPENSLX_PASS=$OPENSLX_PASS" > "$LOGDIR"/config - # echo "MYSQL_ROOT_PASS=$MYSQL_ROOT_PASS" >> "$LOGDIR"/config - # echo "MYSQL_OPENSLX_PASS=$MYSQL_OPENSLX_PASS" >> "$LOGDIR"/config - # echo "MYSQL_BWLEHRPOOL_PASS=$MYSQL_BWLEHRPOOL_PASS" >> "$LOGDIR"/config + + # Keep in mind the passwords stored here will be valid only temporary, + # as they will be changed by the dropper script. + # If you need the permanently valid password, you will need to + # decrypt static_files/new_passwords.encrypted. + echo "OPENSLX_PASS=$OPENSLX_PASS" > "$LOGDIR"/config + echo "MYSQL_ROOT_PASS=$MYSQL_ROOT_PASS" >> "$LOGDIR"/config + echo "MYSQL_OPENSLX_PASS=$MYSQL_OPENSLX_PASS" >> "$LOGDIR"/config + echo "MYSQL_BWLEHRPOOL_PASS=$MYSQL_BWLEHRPOOL_PASS" >> "$LOGDIR"/config echo "ok." } diff --git a/satellit_installer/includes/10-script_dropper.inc b/satellit_installer/includes/10-script_dropper.inc index 1098989..f531580 100644 --- a/satellit_installer/includes/10-script_dropper.inc +++ b/satellit_installer/includes/10-script_dropper.inc @@ -70,7 +70,6 @@ drop_script() { sed -i "s/pass=%MYSQL_BWLEHRPOOL_PASS%/pass=\$MYSQL_BWLEHRPOOL_NEW/g" "$INSTALLDIR/Server_Config.ini" # Patching openslx-mysql-userpass into slx-admin config: - cp -p "$OPENSLXSRVDIR/www/slx-admin/config.php.example" "$OPENSLXSRVDIR/www/slx-admin/config.php" sed -i "s/%MYSQL_OPENSLX_PASS%/\$MYSQL_OPENSLX_NEW/g" "$OPENSLXSRVDIR/www/slx-admin/config.php" # Patching bwLehrpool-mysql-userpass into pureftpd config: diff --git a/satellit_installer/includes/90-set_directory_permissions.inc b/satellit_installer/includes/90-set_directory_permissions.inc index 59b0267..1568f24 100644 --- a/satellit_installer/includes/90-set_directory_permissions.inc +++ b/satellit_installer/includes/90-set_directory_permissions.inc @@ -1,6 +1,8 @@ # Here is the place to (recursively) set directory and/or file permissions. # This is some kind of a stop gap to be sure permissions are set rightly, # as sometimes eg. archives wield not the desired permissions. +# Also, place for some last ditch copying of files, es this is executed near +# the end of script execution. set_directory_permissions() { mkdir -p -m 755 "$OPENSLXDIR" 2>/dev/null @@ -32,6 +34,7 @@ set_directory_permissions() { chmod 755 "$OPENSLXSRVDIR"/www/boot 2>/dev/null # if already there chown -R taskmanager:www-data "$OPENSLXSRVDIR"/www/boot + cp -p "$OPENSLXSRVDIR"/www/slx-admin/config.php.example "$OPENSLXSRVDIR"/www/slx-admin/config.php chmod 600 "$OPENSLXSRVDIR"/www/slx-admin/config.php mkdir -p -m 755 "$LDADPDIR" 2>/dev/null |