|
@@ -344,22 +344,22 @@ echo '}'
|
344
|
344
|
if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"* || "$database_type" == "mongo"* ]]; then
|
345
|
345
|
echo ''
|
346
|
346
|
echo "function ${app_name}_create_database {"
|
347
|
|
- echo " if [ -f \$IMAGE_PASSWORD_FILE ]; then"
|
|
347
|
+ echo " if [ -f \"\$IMAGE_PASSWORD_FILE\" ]; then"
|
348
|
348
|
echo " ${app_name_upper}_ADMIN_PASSWORD=\"\$(printf \"%d\" \"\$(cat \"$IMAGE_PASSWORD_FILE\")\")\""
|
349
|
349
|
echo ' else'
|
350
|
|
- echo " if [ ! \$${app_name_upper}_ADMIN_PASSWORD ]; then"
|
351
|
|
- echo " ${app_name_upper}_ADMIN_PASSWORD=\"\$(create_password \${MINIMUM_PASSWORD_LENGTH})\""
|
|
350
|
+ echo " if [ ! \"\$${app_name_upper}_ADMIN_PASSWORD\" ]; then"
|
|
351
|
+ echo " ${app_name_upper}_ADMIN_PASSWORD=\$(create_password \"\${MINIMUM_PASSWORD_LENGTH}\")"
|
352
|
352
|
echo ' fi'
|
353
|
353
|
echo ' fi'
|
354
|
|
- echo " if [ ! \$${app_name_upper}_ADMIN_PASSWORD ]; then"
|
|
354
|
+ echo " if [ ! \"\$${app_name_upper}_ADMIN_PASSWORD\" ]; then"
|
355
|
355
|
echo ' return'
|
356
|
356
|
echo ' fi'
|
357
|
357
|
echo ''
|
358
|
358
|
if [[ "$database_type" = "mysql" || "$database_type" = "mariadb" ]]; then
|
359
|
|
- echo " create_database ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \$MY_USERNAME"
|
|
359
|
+ echo " create_database ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \"\$MY_USERNAME\""
|
360
|
360
|
fi
|
361
|
361
|
if [[ "$database_type" = "mongo"* ]]; then
|
362
|
|
- echo " create_database_mongodb ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \$MY_USERNAME"
|
|
362
|
+ echo " create_database_mongodb ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \"\$MY_USERNAME\""
|
363
|
363
|
fi
|
364
|
364
|
if [[ "$database_type" == "postgres"* ]]; then
|
365
|
365
|
echo ' systemctl restart postgresql'
|