diff --git a/doc/DESCRIPTIONS.md b/doc/DESCRIPTIONS.md new file mode 100644 index 0000000..277c1bd --- /dev/null +++ b/doc/DESCRIPTIONS.md @@ -0,0 +1 @@ +ChuWiki is first and foremost a wiki. A wiki is a website whose pages can be edited by the visitor. However, a history system allows you to track modifications made to a page and restore an old version of the page if necessary. \ No newline at end of file diff --git a/doc/DESCRIPTIONS_fr.md b/doc/DESCRIPTIONS_fr.md new file mode 100644 index 0000000..41428bf --- /dev/null +++ b/doc/DESCRIPTIONS_fr.md @@ -0,0 +1 @@ +ChuWiki est tout d'abord un wiki. Un wiki est un site web dont les pages sont éditables par le visiteur. Un système d'historique permet toutefois de suivre les modifications effectuées sur une page et de restaurer une ancienne version de la page si besoin. \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index d01089c..13d0450 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ admindoc = "http://chuwiki.genezys.net/" code = "https://github.com/genezys/chuwiki" [integration] -yunohost = ">= 11.0.9" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -51,8 +51,6 @@ ram.runtime = "50M" default = "en" [install.init_main_permission] - help.en = "If yes, this app will can be accessible by everyone." - help.fr = "Si oui, cette app pourra être accessible par tout le monde." type = "group" default = "visitors" @@ -72,5 +70,5 @@ ram.runtime = "50M" [resources.apt] packages = [ - "php7.4" + "php8.2-fpm" ] diff --git a/scripts/install b/scripts/install index 4c348f5..73cd630 100755 --- a/scripts/install +++ b/scripts/install @@ -32,7 +32,6 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" @@ -43,22 +42,8 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 ynh_add_fpm_config --usage="$fpm_usage" --footprint="$fpm_footprint" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - ynh_add_nginx_config -#================================================= -# CREATE DATA DIRECTORY -#================================================= -ynh_script_progression --message="Creating a data directory..." --weight=1 - -chmod 750 "$data_dir" -chmod -R o-rwx "$data_dir" -chown -R "$app:www-data" "$data_dir" - #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/remove b/scripts/remove index cd3d61d..ac762c0 100755 --- a/scripts/remove +++ b/scripts/remove @@ -16,11 +16,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - ynh_remove_fpm_config #================================================= diff --git a/scripts/restore b/scripts/restore index 29c368e..218c40b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -25,7 +25,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" @@ -36,9 +35,6 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1 ynh_restore_file --origin_path="$data_dir" --not_mandatory -# this will be treated as a security issue. -chmod 750 "$data_dir" -chmod -R o-rwx "$data_dir" chown -R "$app:www-data" "$data_dir" #================================================= @@ -48,9 +44,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -# Recreate a dedicated php-fpm config -ynh_add_fpm_config --usage="$fpm_usage" --footprint="$fpm_footprint" --phpversion="$phpversion" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 02da7a8..37d9949 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -74,12 +74,7 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage ynh_add_nginx_config