YunoHost-Apps/spip_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/spip_ynh.git synced 2024-09-03 20:25:59 +02:00
Code Issues Activity Actions

with_mysql ne fonctionne pas correctement

Browse source
This commit is contained in:
magikcypress 2017-03-11 21:47:03 +01:00
parent 2764c06f3a
commit 32d81aeafb
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/remove
View file

@ -11,16 +11,16 @@ app=$YNH_APP_INSTANCE_NAME
# Retrieve app settings # Retrieve app settings
domain=$(ynh_app_setting_get "$app" domain) domain=$(ynh_app_setting_get "$app" domain)
with_mysql=$(ynh_app_setting_get "$app" with_mysql) # with_mysql=$(ynh_app_setting_get "$app" with_mysql)
# Drop MySQL database and user as needed # Drop MySQL database and user as needed
if [[ $with_mysql -eq 1 ]]; then #if [[ $with_mysql -eq 1 ]]; then
dbname=$app dbname=$app
dbuser=$app dbuser=$app
dbpass=$(ynh_app_setting_get "$app" mysqlpwd) dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
ynh_mysql_drop_db $dbname || true ynh_mysql_drop_db $dbname || true
ynh_mysql_drop_user $dbuser || true ynh_mysql_drop_user $dbuser || true
fi #fi
# Delete app directory and configurations # Delete app directory and configurations
sudo rm -rf "/var/www/${app}" sudo rm -rf "/var/www/${app}"

12
scripts/restore
View file

@ -4,7 +4,7 @@
# Exit on command errors and treat unset variables as an error # Exit on command errors and treat unset variables as an error
set -eu set -eu
# The parameter $2 is the id of the app instance ex: ynhexample__2 # The parameter $app is the id of the app instance ex: ynhexample__2
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
# Source app helpers # Source app helpers
@ -46,7 +46,7 @@ fi
sudo cp -a ./sources "$final_path" sudo cp -a ./sources "$final_path"
# Set permissions # Set permissions
sudo chown -R www-data: $final_path sudo chown -R www-data: "$final_path"
# Restore db # Restore db
# if [[ $with_mysql -eq 1 ]]; then # if [[ $with_mysql -eq 1 ]]; then
@ -55,8 +55,6 @@ db_user=$app
ynh_mysql_create_db $db_user $db_user $db_pwd ynh_mysql_create_db $db_user $db_user $db_pwd
sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql"
sudo rm -f "./db.sql" sudo rm -f "./db.sql"
# sudo sed -i -e "s/'__DB_USER__', *'[^']*'/'__DB_USER__', '$app'/g" $final_path/config/connect.php
# sudo sed -i -e "s/'__DB_PWD__', *'[^']*'/'__DB_PWD__', '$app'/g" $final_path/config/connect.php
sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php
sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php
# fi # fi
@ -68,5 +66,7 @@ sudo cp -a ./php-fpm.conf "$phpfpm_conf"
sudo cp -a ./php-fpm.ini "$phpfpm_ini" sudo cp -a ./php-fpm.ini "$phpfpm_ini"
# Reload services # Reload services
sudo service php5-fpm reload || true sudo service nginx reload
sudo service nginx reload || true sudo service php5-fpm reload
sudo yunohost app ssowatconf