diff --git a/conf/app.src b/conf/app.src index b2342cc..e55d1c3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://repository.yeswiki.net/doryphore/yeswiki-doryphore-2021-11-04-6.zip -SOURCE_SUM=f29d30506c0e69e7c0cb1a8f0b4a63bb798039bdf3c92ee93138c9bf8ea00754 +SOURCE_URL=https://repository.yeswiki.net/doryphore/yeswiki-doryphore-2022-01-16-13.zip +SOURCE_SUM=2239572babfbd46e8b79ac6333827c55225b2f70990d51e934e82fda8894165f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=yeswiki-doryphore-2021-11-04-6.zip +SOURCE_FILENAME=yeswiki-doryphore-2022-01-16-13.zip diff --git a/scripts/_common.sh b/scripts/_common.sh index 6aa5058..0eb7eca 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,6 +15,19 @@ loginldap_version="2021-03-01-2" # PERSONAL HELPERS #================================================= +# update directory right +# | arg: app - The application's name ; default : yeswiki +# | arg: final_path - The path of the application's folder +# yeswiki_update_dir_rights yeswiki /var/www/yeswiki +yeswiki_update_dir_rights() { + local app="${1:-yeswiki}" + local final_path="${2}" + + chown -R $app:$app $final_path + chmod -R u=rwX,g=rX,o=rX $final_path + chmod -R g+rwX,o+rwX $final_path/{cache,files} +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 5e37eda..bbfeab6 100755 --- a/scripts/install +++ b/scripts/install @@ -107,7 +107,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # Set right permissions for cURL install -chown -R $app: $final_path +chown -R $app:$app $final_path # Set the app as temporarily public for cURL call ynh_permission_update --permission="main" --add="visitors" @@ -165,11 +165,7 @@ ynh_replace_string --match_string=");"\ #================================================= # Set permissions to app files -chown -R root: $final_path -chown -R $app $final_path/{cache,files,themes,tools,wakka.config.php} - -chown $app:www-data $final_path -chmod o-rwx $final_path +yeswiki_update_dir_rights $app $final_path #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index be15d50..2b7a635 100755 --- a/scripts/restore +++ b/scripts/restore @@ -70,11 +70,7 @@ ynh_restore_file --origin_path="$final_path" #================================================= # Restore permissions on app files -chown -R root: $final_path -chown -R $app $final_path/{cache,files,themes,tools,wakka.config.php} - -chown $app:www-data $final_path -chmod o-rwx $final_path +yeswiki_update_dir_rights $app $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index f5c71c6..9ab3549 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -147,11 +147,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # Set permissions on app files -chown -R root: $final_path -chown -R $app $final_path/{cache,files,themes,tools,wakka.config.php} - -chown $app:www-data $final_path -chmod o-rwx $final_path +yeswiki_update_dir_rights $app $final_path #================================================= # RELOAD NGINX