Quellcode durchsuchen

Le backup se passe mal, suite à la création étrange

magikcypress vor 8 Jahren
Ursprung
Commit
25f7570cda
2 geänderte Dateien mit 6 neuen und 9 gelöschten Zeilen
  1. 5 2
      scripts/backup
  2. 1 7
      scripts/install

+ 5 - 2
scripts/backup

@@ -11,6 +11,7 @@ source /usr/share/yunohost/helpers
 
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
+with_mysql=$(ynh_app_setting_get "$app" with_mysql)
 
 # Copy the app files
 final_path="/var/www/${app}"
@@ -23,5 +24,7 @@ ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "php-fpm.conf"
 ynh_backup "/etc/php5/fpm/conf.d/20-${app}.ini" "php-fpm.ini"
 
 # Backup db
-root_pwd=$(sudo cat /etc/yunohost/mysql)
-sudo su -c "mysqldump -u root -p$root_pwd --no-create-db $app > ./db.sql"
+if [[ $with_mysql -eq 1 ]]; then
+	root_pwd=$(sudo cat /etc/yunohost/mysql)
+	sudo su -c "mysqldump -u root -p$root_pwd --no-create-db $app > ./db.sql"
+fi

+ 1 - 7
scripts/install

@@ -66,13 +66,7 @@ ynh_app_setting_set $app email $email
 # CREATE A SQL BDD
 #=================================================
 
-db_name=$app
-db_user=$app
-db_pwd=$(ynh_string_random)
-ynh_mysql_create_db "$db_name" "$db_user" "$db_pwd"
-ynh_app_setting_set "$app" db_name "$db_name"
-ynh_app_setting_set "$app" db_pwd "$db_pwd"
-ynh_app_setting_set "$app" db_user "$db_user"
+GENERATE_DB $app	# Create a database and a dedicated user in the app name
 
 #=================================================
 # NGINX CONFIGURATION