mirror of
https://github.com/YunoHost-Apps/nextcloud_ynh.git
synced 2024-09-03 19:55:57 +02:00
[fix] Check correct user id at removal
This commit is contained in:
parent
fe1b69d0f7
commit
626144f59e
1 changed files with 11 additions and 5 deletions
|
@ -14,8 +14,8 @@ dbuser=$app
|
||||||
. /usr/share/yunohost/helpers
|
. /usr/share/yunohost/helpers
|
||||||
|
|
||||||
# Drop MySQL database and user
|
# Drop MySQL database and user
|
||||||
ynh_mysql_drop_db $dbname || true
|
ynh_mysql_drop_db "$dbname" 2>/dev/null || true
|
||||||
ynh_mysql_drop_user $dbuser || true
|
ynh_mysql_drop_user "$dbuser" 2>/dev/null || true
|
||||||
|
|
||||||
# Retrieve domain from app settings
|
# Retrieve domain from app settings
|
||||||
domain=$(ynh_app_setting_get $app domain)
|
domain=$(ynh_app_setting_get $app domain)
|
||||||
|
@ -29,10 +29,16 @@ sudo rm -f "/etc/php5/fpm/pool.d/${app}.conf"
|
||||||
sudo service php5-fpm restart || true
|
sudo service php5-fpm restart || true
|
||||||
sudo service nginx reload || true
|
sudo service nginx reload || true
|
||||||
|
|
||||||
# Remove app dependencies and system user
|
# Remove app dependencies
|
||||||
ynh_package_autoremove "$DEPS_PKG_NAME" || true
|
ynh_package_autoremove "$DEPS_PKG_NAME" || true
|
||||||
|
|
||||||
|
# Clean home folders ACLs
|
||||||
for i in $(ls /home); do
|
for i in $(ls /home); do
|
||||||
[[ ! $i == yunohost.* ]] \
|
[[ ! $i == yunohost.* ]] \
|
||||||
&& sudo setfacl -x g:$app:rwx > /dev/null 2>&1
|
&& sudo setfacl -x g:$app:rwx >/dev/null 2>&1
|
||||||
done
|
done
|
||||||
sudo deluser --quiet --remove-home $app > /dev/null
|
|
||||||
|
# Remove the user account
|
||||||
|
id "$app" >/dev/null 2>&1 \
|
||||||
|
&& sudo deluser --quiet --remove-home "$app" >/dev/null \
|
||||||
|
|| true
|
||||||
|
|
Loading…
Add table
Reference in a new issue