From 5d36d645bf29f2ea513cdf3e8fe58b989801d159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 30 Mar 2023 18:03:56 +0200 Subject: [PATCH 01/12] cleaning --- doc/DESCRIPTION.md | 1 - manifest.toml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 52d2357..74549cc 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,5 +1,4 @@ YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or bitly). - Running your own URL shortener is fun, geeky and useful: you own your data and don't depend on third-party services. It's also a great way to add branding to your short URLs, instead of using the same public URL shortener everyone uses. ### YOURLS Features diff --git a/manifest.toml b/manifest.toml index 5a4c9c0..0feaa96 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,10 +54,12 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/YOURLS/YOURLS/archive/1.9.2.zip" sha256 = "65e242aaf007f86d7bf8f7f2776ee814a632a783749151d043d669512c3b41cb" + autoupdate.strategy = "latest_github_tag" [resources.sources.fr] url = "https://github.com/ozh/YOURLS-fr_FR/archive/refs/tags/1.8.zip" sha256 = "ef9c0e71d4559994b9df0cd0a558f6faf11eba185c4793ba0e30f3500dab1b04" + autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -65,7 +67,6 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - admin.url = "/admin" admin.show_tile = false admin.allowed = "admins" From 6b948f7d137370c8ac2877d0ae9350389576e228 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 30 Mar 2023 16:04:02 +0000 Subject: [PATCH 02/12] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 03f394b..73392db 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or bitly). - Running your own URL shortener is fun, geeky and useful: you own your data and don't depend on third-party services. It's also a great way to add branding to your short URLs, instead of using the same public URL shortener everyone uses. ### YOURLS Features diff --git a/README_fr.md b/README_fr.md index dfcbd95..75da5ff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,6 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or bitly). - Running your own URL shortener is fun, geeky and useful: you own your data and don't depend on third-party services. It's also a great way to add branding to your short URLs, instead of using the same public URL shortener everyone uses. ### YOURLS Features From edfc6270cdf7cd1a6e625c4dbb48d0df5d0363a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 2 Apr 2023 22:14:15 +0200 Subject: [PATCH 03/12] cleaning --- conf/app.src | 5 ----- doc/DESCRIPTION.md | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 conf/app.src diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index fd8ab5a..0000000 --- a/conf/app.src +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE_URL=https://github.com/YOURLS/YOURLS/archive/1.9.2.zip -SOURCE_SUM=65e242aaf007f86d7bf8f7f2776ee814a632a783749151d043d669512c3b41cb -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=true diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 74549cc..5405cbf 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,7 +1,7 @@ YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or bitly). Running your own URL shortener is fun, geeky and useful: you own your data and don't depend on third-party services. It's also a great way to add branding to your short URLs, instead of using the same public URL shortener everyone uses. -### YOURLS Features +### Features - Private (your links only) or Public (everybody can create short links, fine for an intranet) - Dozens of plugins to easily implement new features From 4c240f076568245fd054039e8635820908d63834 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 2 Apr 2023 20:14:19 +0000 Subject: [PATCH 04/12] 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 73392db..4c548af 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or bitly). Running your own URL shortener is fun, geeky and useful: you own your data and don't depend on third-party services. It's also a great way to add branding to your short URLs, instead of using the same public URL shortener everyone uses. -### YOURLS Features +### Features - Private (your links only) or Public (everybody can create short links, fine for an intranet) - Dozens of plugins to easily implement new features diff --git a/README_fr.md b/README_fr.md index 75da5ff..dcda9a7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or bitly). Running your own URL shortener is fun, geeky and useful: you own your data and don't depend on third-party services. It's also a great way to add branding to your short URLs, instead of using the same public URL shortener everyone uses. -### YOURLS Features +### Features - Private (your links only) or Public (everybody can create short links, fine for an intranet) - Dozens of plugins to easily implement new features From 6f4752ca9daf43e8bfb067fb638eb1ea392fdb98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 1 May 2023 17:44:34 +0200 Subject: [PATCH 05/12] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0feaa96..612eefc 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.15" +yunohost = ">= 11.1.18" architectures = "all" multi_instance = true ldap = false From 8c3acf258f39ea2cd3fe8a88480b36954b2de96c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 May 2023 08:15:05 +0200 Subject: [PATCH 06/12] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 612eefc..8befb42 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.18" +yunohost = ">= 11.1.19" architectures = "all" multi_instance = true ldap = false From d3bd3910206b92758695746702c101e2aaecf72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 18 Jul 2023 21:17:23 +0200 Subject: [PATCH 07/12] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 8befb42..63d3e06 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.19" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = false From 1a956995751b2137eb1016f2f9db74ffcadf649d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Jul 2023 12:31:03 +0200 Subject: [PATCH 08/12] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 63d3e06..eff4142 100644 --- a/manifest.toml +++ b/manifest.toml @@ -44,7 +44,7 @@ ram.runtime = "50M" ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" type = "string" - choices = ["fr_FR", "en_US"] + select = ["fr_FR", "en_US"] default = "fr_FR" [resources] 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 09/12] 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 10/12] 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 11/12] 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 12/12] 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