mirror of
https://github.com/YunoHost-Apps/etherpad_ynh.git
synced 2024-09-03 18:36:10 +02:00
fixed variable and settinfs names mismatch
This commit is contained in:
parent
48ead4b8c3
commit
94770cec4f
2 changed files with 10 additions and 8 deletions
|
@ -33,8 +33,11 @@ key=$(ynh_string_random 12)
|
|||
dbuser=$app
|
||||
dbname=$app
|
||||
dbpass=$(ynh_string_random 12)
|
||||
ynh_app_setting_set "$app" mysqlpwd "$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
|
||||
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
|
||||
|
||||
# Change variables in etherpad configuration
|
||||
sudo sed -i "s/yunouser/$db_user/g" $final_path/settings.json
|
||||
sudo sed -i "s/yunopass/$db_pwd/g" $final_path/settings.json
|
||||
sudo sed -i "s/yunobase/$db_user/g" $final_path/settings.json
|
||||
sudo sed -i "s/yunouser/$dbuser/g" $final_path/settings.json
|
||||
sudo sed -i "s/yunopass/$dbpass/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
|
||||
|
||||
# Set permissions to etherpad directory
|
||||
|
|
|
@ -10,13 +10,12 @@ source /usr/share/yunohost/helpers
|
|||
# Retrieve app settings
|
||||
domain=$(ynh_app_setting_get "$app" domain)
|
||||
path=$(ynh_app_setting_get "$app" path)
|
||||
db_user=$(ynh_app_setting_get "$app" db_user)
|
||||
db_name=$(ynh_app_setting_get "$app" db_name)
|
||||
db_pwd=$(ynh_app_setting_get "$app" db_pwd)
|
||||
dbuser=$(ynh_app_setting_get "$app" dbuser)
|
||||
dbname=$(ynh_app_setting_get "$app" dbname)
|
||||
|
||||
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
|
||||
|
||||
rm -f /etc/nginx/conf.d/$domain.d/$app.conf
|
||||
|
|
Loading…
Add table
Reference in a new issue