YunoHost-Apps/etherpad_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/etherpad_ynh.git synced 2024-09-03 18:36:10 +02:00
Code Issues Activity Actions

fixed variable and settinfs names mismatch

Browse source
This commit is contained in:
Bachir Soussi Chiadmi 2016-07-10 19:15:13 +02:00
parent 48ead4b8c3
commit 94770cec4f
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/install
View file

@ -33,8 +33,11 @@ key=$(ynh_string_random 12)
dbuser=$app dbuser=$app
dbname=$app dbname=$app
dbpass=$(ynh_string_random 12) dbpass=$(ynh_string_random 12)
ynh_app_setting_set "$app" mysqlpwd "$dbpass"
ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass" ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass"
ynh_app_setting_set "$app" dbpass "$dbpass"
ynh_app_setting_set "$app" dbuser "$dbuser"
ynh_app_setting_set "$app" dbname "$dbname"
# Install dependances # Install dependances
if ! ynh_package_is_installed "nodejs-legacy" ; then if ! ynh_package_is_installed "nodejs-legacy" ; then
@ -61,9 +64,9 @@ sudo $final_path/bin/installDeps.sh > /dev/null 2>&1
sudo npm install forever -g > /dev/null 2>&1 sudo npm install forever -g > /dev/null 2>&1
# Change variables in etherpad configuration # Change variables in etherpad configuration
sudo sed -i "s/yunouser/$db_user/g" $final_path/settings.json sudo sed -i "s/yunouser/$dbuser/g" $final_path/settings.json
sudo sed -i "s/yunopass/$db_pwd/g" $final_path/settings.json sudo sed -i "s/yunopass/$dbpass/g" $final_path/settings.json
sudo sed -i "s/yunobase/$db_user/g" $final_path/settings.json sudo sed -i "s/yunobase/$dbname/g" $final_path/settings.json
sudo sed -i "s/KEY/$key/g" $final_path/settings.json sudo sed -i "s/KEY/$key/g" $final_path/settings.json
# Set permissions to etherpad directory # Set permissions to etherpad directory

7
scripts/remove
View file

@ -10,13 +10,12 @@ source /usr/share/yunohost/helpers
# Retrieve app settings # Retrieve app settings
domain=$(ynh_app_setting_get "$app" domain) domain=$(ynh_app_setting_get "$app" domain)
path=$(ynh_app_setting_get "$app" path) path=$(ynh_app_setting_get "$app" path)
db_user=$(ynh_app_setting_get "$app" db_user) dbuser=$(ynh_app_setting_get "$app" dbuser)
db_name=$(ynh_app_setting_get "$app" db_name) dbname=$(ynh_app_setting_get "$app" dbname)
db_pwd=$(ynh_app_setting_get "$app" db_pwd)
root_pwd=$(sudo cat /etc/yunohost/mysql) root_pwd=$(sudo cat /etc/yunohost/mysql)
mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;" mysql -u root -p$root_pwd -e "DROP DATABASE $dbname ; DROP USER $dbuser@localhost ;"
sudo rm -rf /var/www/$app sudo rm -rf /var/www/$app
rm -f /etc/nginx/conf.d/$domain.d/$app.conf rm -f /etc/nginx/conf.d/$domain.d/$app.conf