diff --git a/README.md b/README.md index 03f394b..cd51de4 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,9 @@ 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 +### Features - Private (your links only) or Public (everybody can create short links, fine for an intranet) - Dozens of plugins to easily implement new features @@ -30,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 dfcbd95..3c52a15 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,10 +17,9 @@ 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 +### Features - Private (your links only) or Public (everybody can create short links, fine for an intranet) - Dozens of plugins to easily implement new features @@ -30,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+ 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 52d2357..5405cbf 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,8 +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 diff --git a/manifest.toml b/manifest.toml index 5a4c9c0..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" @@ -17,7 +17,7 @@ admindoc = "https://docs.yourls.org/" code = "https://github.com/YOURLS/YOURLS" [integration] -yunohost = ">= 11.1.15" +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,8 +47,8 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" - choices = ["fr_FR", "en_US"] + type = "select" + select = ["fr_FR", "en_US"] default = "fr_FR" [resources] @@ -54,10 +58,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,13 +71,12 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - admin.url = "/admin" admin.show_tile = false 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" 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