diff --git a/README.md b/README.md index 1f6fed5..a82080e 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ GetSimple is an XML based, stand-alone, fully independent and lite Content Manag - Simple Theme Customization - Designed For the Small-Site Market -**Shipped version:** 3.3.16~ynh3 +**Shipped version:** 3.3.16~ynh4 ## Screenshots diff --git a/README_es.md b/README_es.md index 4a84eaa..2ae69be 100644 --- a/README_es.md +++ b/README_es.md @@ -27,7 +27,7 @@ GetSimple is an XML based, stand-alone, fully independent and lite Content Manag - Simple Theme Customization - Designed For the Small-Site Market -**Versión actual:** 3.3.16~ynh3 +**Versión actual:** 3.3.16~ynh4 ## Capturas diff --git a/README_eu.md b/README_eu.md index 6c2ca1d..785fce8 100644 --- a/README_eu.md +++ b/README_eu.md @@ -27,7 +27,7 @@ GetSimple is an XML based, stand-alone, fully independent and lite Content Manag - Simple Theme Customization - Designed For the Small-Site Market -**Paketatutako bertsioa:** 3.3.16~ynh3 +**Paketatutako bertsioa:** 3.3.16~ynh4 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index b4c299e..8b0510f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ GetSimple is an XML based, stand-alone, fully independent and lite Content Manag - Simple Theme Customization - Designed For the Small-Site Market -**Version incluse :** 3.3.16~ynh3 +**Version incluse :** 3.3.16~ynh4 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 07e5552..b6853bb 100644 --- a/README_gl.md +++ b/README_gl.md @@ -27,7 +27,7 @@ GetSimple is an XML based, stand-alone, fully independent and lite Content Manag - Simple Theme Customization - Designed For the Small-Site Market -**Versión proporcionada:** 3.3.16~ynh3 +**Versión proporcionada:** 3.3.16~ynh4 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index be37596..acef2b4 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -27,7 +27,7 @@ GetSimple is an XML based, stand-alone, fully independent and lite Content Manag - Simple Theme Customization - Designed For the Small-Site Market -**分发版本：** 3.3.16~ynh3 +**分发版本：** 3.3.16~ynh4 ## 截图 diff --git a/manifest.toml b/manifest.toml index 9f284e2..28dba37 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "GetSimple" description.en = "Flatfile CMS that works fast and efficient" description.fr = "Flatfile CMS that works fast and efficient" -version = "3.3.16~ynh3" +version = "3.3.16~ynh4" maintainers = [] @@ -16,7 +16,7 @@ admindoc = "http://get-simple.info/wiki/fr:start" code = "https://github.com/GetSimpleCMS/GetSimpleCMS" [integration] -yunohost = ">= 11.1.20" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/backup b/scripts/backup index 18f83fe..c5c603d 100755 --- a/scripts/backup +++ b/scripts/backup @@ -27,10 +27,6 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= diff --git a/scripts/install b/scripts/install index 7548fa6..07bcbaf 100755 --- a/scripts/install +++ b/scripts/install @@ -32,10 +32,8 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 -# Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config -# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -45,7 +43,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/temp.gsconfig.php" --destination="$install_dir/gsconfig.php" +ynh_add_config --template="temp.gsconfig.php" --destination="$install_dir/gsconfig.php" chmod 400 "$install_dir/gsconfig.php" chown $app:$app "$install_dir/gsconfig.php" @@ -55,9 +53,6 @@ chown $app:$app "$install_dir/gsconfig.php" #================================================= ynh_script_progression --message="Setuping application with CURL..." -# Set the app as temporarily public for curl call -ynh_script_progression --message="Configuring SSOwat..." - # Installation with curl ynh_script_progression --message="Finalizing installation..." ynh_local_curl "/admin/install.php" "lang=$language" "continue=continue" diff --git a/scripts/remove b/scripts/remove index 79cb058..ac762c0 100755 --- a/scripts/remove +++ b/scripts/remove @@ -14,15 +14,8 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 -# Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - -# Remove the dedicated PHP-FPM config ynh_remove_fpm_config #================================================= diff --git a/scripts/restore b/scripts/restore index a81e60e..a40b0a4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,11 +27,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6342dcb..0ff7d90 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,23 +15,13 @@ source /usr/share/yunohost/helpers timezone="$(cat /etc/timezone)" -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=5 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=5 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="gsconfig.php data/ backups/" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="gsconfig.php data/ backups/" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -42,12 +32,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config @@ -59,7 +44,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Updating a configuration file..." -ynh_add_config --template="../conf/temp.gsconfig.php" --destination="$install_dir/gsconfig.php" +ynh_add_config --template="temp.gsconfig.php" --destination="$install_dir/gsconfig.php" chmod 400 "$install_dir/gsconfig.php" chown $app:$app "$install_dir/gsconfig.php"