Kaynağa Gözat

Database passwords

Bob Mottram 10 yıl önce
ebeveyn
işleme
3571a0a12b
1 değiştirilmiş dosya ile 6 ekleme ve 3 silme
  1. 6
    3
      install-freedombone.sh

+ 6
- 3
install-freedombone.sh Dosyayı Görüntüle

622
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
622
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
623
 
623
 
624
   echo '# MariaDB password' >> /usr/bin/$BACKUP_SCRIPT_NAME
624
   echo '# MariaDB password' >> /usr/bin/$BACKUP_SCRIPT_NAME
625
-  echo "DATABASE_PASSWORD=$(<$DATABASE_PASSWORD_FILE)" >> /usr/bin/$BACKUP_SCRIPT_NAME
625
+  echo -n 'DATABASE_PASSWORD=$(<' >> /usr/bin/$BACKUP_SCRIPT_NAME
626
+  echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/$BACKUP_SCRIPT_NAME
626
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
627
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
627
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
628
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
628
       BACKUP_INCLUDES_DATABASES="yes"
629
       BACKUP_INCLUDES_DATABASES="yes"
1098
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1099
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1099
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1100
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1100
   echo '# MariaDB password' >> /usr/bin/$RESTORE_SCRIPT_NAME
1101
   echo '# MariaDB password' >> /usr/bin/$RESTORE_SCRIPT_NAME
1101
-  echo "DATABASE_PASSWORD=$(<$DATABASE_PASSWORD_FILE)" >> /usr/bin/$RESTORE_SCRIPT_NAME
1102
+  echo -n 'DATABASE_PASSWORD=$(<' >> /usr/bin/$RESTORE_SCRIPT_NAME
1103
+  echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/$RESTORE_SCRIPT_NAME
1102
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1104
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1103
 
1105
 
1104
   if [[ $BACKUP_INCLUDES_DATABASES == "yes" ]]; then
1106
   if [[ $BACKUP_INCLUDES_DATABASES == "yes" ]]; then
4066
   echo 'DATABASE=$1' >> /usr/bin/repairdatabase
4068
   echo 'DATABASE=$1' >> /usr/bin/repairdatabase
4067
   echo "EMAIL=$MY_EMAIL_ADDRESS" >> /usr/bin/repairdatabase
4069
   echo "EMAIL=$MY_EMAIL_ADDRESS" >> /usr/bin/repairdatabase
4068
   echo '' >> /usr/bin/repairdatabase
4070
   echo '' >> /usr/bin/repairdatabase
4069
-  echo "MYSQL_ROOT_PASSWORD=$(<$DATABASE_PASSWORD_FILE)" >> /usr/bin/repairdatabase
4071
+  echo -n 'MYSQL_ROOT_PASSWORD=$(<' >> /usr/bin/repairdatabase
4072
+  echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/repairdatabase
4070
   echo 'TEMPFILE=/root/repairdatabase_$DATABASE' >> /usr/bin/repairdatabase
4073
   echo 'TEMPFILE=/root/repairdatabase_$DATABASE' >> /usr/bin/repairdatabase
4071
   echo '' >> /usr/bin/repairdatabase
4074
   echo '' >> /usr/bin/repairdatabase
4072
   echo 'umask 0077' >> /usr/bin/repairdatabase
4075
   echo 'umask 0077' >> /usr/bin/repairdatabase