From 0473c71a35d9f6a5b901c5835a085abaf8ca96db Mon Sep 17 00:00:00 2001 From: Gofannon Date: Thu, 18 Aug 2022 23:57:11 +0200 Subject: [PATCH] refactor admin permission (move in install script & clean in upgrade) --- scripts/install | 5 +++-- scripts/upgrade | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index c4bd0ff..b00cf76 100755 --- a/scripts/install +++ b/scripts/install @@ -117,8 +117,6 @@ ynh_script_progression --message="Configuring DokuWiki..." --weight=2 # This File cannot be modified directly by DokuWiki, only by hand or by YunoHost # It will only be updated by YunoHost package or directly by adventurous users -# Create the "admin" group and add the "admin" user -ynh_permission_create --permission "admin" --allowed "$admin_user" # Customize admin group in case of multiple wiki install managed by different admins # dokuwiki.admin; dokuwiki__1.admin; etc @@ -221,6 +219,9 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-error.log" --failregex #================================================= ynh_script_progression --message="Configuring permissions..." --weight=2 +# Create the "admin" permission and add the "admin_user" to it +ynh_permission_create --permission "admin" --allowed "$admin_user" + # Make app public if necessary if [ $is_public -eq 1 ] then diff --git a/scripts/upgrade b/scripts/upgrade index 46b23af..99c5ed2 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -317,9 +317,6 @@ ynh_backup_if_checksum_is_different --file="$final_path/conf/local.protected.php # Always overwrite local file with the one from package. cp ../conf/local.protected.php $final_path/conf -# Create the "admin" group and add the "admin" user -#ynh_permission_create --permission "admin" --allowed "$admin_user" - # Customize admin group in case of multiple wiki install managed by different admins # dokuwiki.admin; dokuwiki__1.admin; etc ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$final_path/conf/local.protected.php"