From a7eff444132bfca3a6ed7077c6bbd65b9feca6b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 8 Sep 2023 19:05:07 +0200 Subject: [PATCH 1/4] Update manifest.toml --- manifest.toml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index eff4142..f25f1db 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://docs.yourls.org/" code = "https://github.com/YOURLS/YOURLS" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -34,6 +34,10 @@ ram.runtime = "50M" type = "path" default = "/yourls" + [install.init_main_permission] + type = "group" + default = "visitors" + [install.admin] type = "user" @@ -43,7 +47,7 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" select = ["fr_FR", "en_US"] default = "fr_FR" @@ -72,7 +76,7 @@ ram.runtime = "50M" admin.allowed = "admins" [resources.apt] - packages = "mariadb-server php8.1-gmp php8.1-bcmath php8.1-curl php8.1-mysql php8.1-zip php8.1-gd php8.1-mbstring php8.1-xml" + packages = "mariadb-server, php8.1-gmp, php8.1-bcmath, php8.1-curl, php8.1-mysql, php8.1-zip, php8.1-gd, php8.1-mbstring, php8.1-xml" [resources.database] type = "mysql" From 8614719c227e310f808e64d3053371ff7d39e7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 8 Sep 2023 19:05:18 +0200 Subject: [PATCH 2/4] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index f25f1db..777796f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,9 +5,9 @@ name = "Yourls" description.en = "URL shortening service" description.fr = "Service de raccourcisseur d'URL" -version = "1.9.2~ynh2" +version = "1.9.2~ynh3" -maintainers = ["Anmol Sharma"] +maintainers = [""] [upstream] license = "MIT" From 1810ca2fd87b26e0c696254a00d6b220b6d6f1fd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 8 Sep 2023 17:05:27 +0000 Subject: [PATCH 3/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4c548af..cd51de4 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Running your own URL shortener is fun, geeky and useful: you own your data and d - Sample files to create your own public interface -**Shipped version:** 1.9.2~ynh2 +**Shipped version:** 1.9.2~ynh3 **Demo:** https://yourls.org/cookie+ diff --git a/README_fr.md b/README_fr.md index dcda9a7..3c52a15 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ Running your own URL shortener is fun, geeky and useful: you own your data and d - Sample files to create your own public interface -**Version incluse :** 1.9.2~ynh2 +**Version incluse :** 1.9.2~ynh3 **Démo :** https://yourls.org/cookie+ From c035bb853561d0e6faeb99d71eb01ca820777bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 8 Sep 2023 19:07:16 +0200 Subject: [PATCH 4/4] cleaning --- scripts/install | 5 ----- scripts/remove | 5 ----- scripts/restore | 11 ++--------- scripts/upgrade | 5 ----- 4 files changed, 2 insertions(+), 24 deletions(-) diff --git a/scripts/install b/scripts/install index 129dbe9..efae5bf 100644 --- a/scripts/install +++ b/scripts/install @@ -49,11 +49,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 - # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low diff --git a/scripts/remove b/scripts/remove index d10f7b0..ca07af2 100644 --- a/scripts/remove +++ b/scripts/remove @@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated nginx config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index 95c06fa..9d4d5e5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -9,15 +9,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -35,6 +26,8 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=10 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f97d992..4db063e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,11 +38,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=4 # 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 - # Create a dedicated NGINX config ynh_add_nginx_config