From 0035af374ed9b5f5e6b33328d83c5b7e7b22669d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 9 Sep 2023 07:55:06 +0200 Subject: [PATCH 1/5] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index eff4142..9c345d5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Service de raccourcisseur d'URL" version = "1.9.2~ynh2" -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.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -43,7 +43,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 +72,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 f4c3eb3b265cfb274117c38879fe55520248930c Mon Sep 17 00:00:00 2001 From: Salamandar <6552989+Salamandar@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:27:47 +0200 Subject: [PATCH 2/5] Fix manifest.toml: select is actually named choices --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 777796f..49ad692 100644 --- a/manifest.toml +++ b/manifest.toml @@ -48,7 +48,7 @@ ram.runtime = "50M" ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" type = "select" - select = ["fr_FR", "en_US"] + choices = ["fr_FR", "en_US"] default = "fr_FR" [resources] From 5279dca755c6954c143b8f5410bed4beef676349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Oct 2023 23:41:29 +0200 Subject: [PATCH 3/5] cleaning --- scripts/install | 4 ++-- scripts/upgrade | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index efae5bf..bd47ba3 100644 --- a/scripts/install +++ b/scripts/install @@ -50,14 +50,14 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 ynh_add_nginx_config # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # ADD A CONFIGURATION #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config-sample.php" --destination="$install_dir/user/config.php" +ynh_add_config --template="config-sample.php" --destination="$install_dir/user/config.php" chmod 600 "$install_dir/user/config.php" chown $app:$app "$install_dir/user/config.php" diff --git a/scripts/upgrade b/scripts/upgrade index 4db063e..320f234 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,7 +36,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=4 # 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 From 3ae2468464cda44efe8890ed2109f1e060faa123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Oct 2023 23:46:34 +0200 Subject: [PATCH 4/5] cleaning --- scripts/change_url | 2 +- scripts/install | 2 +- scripts/restore | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 7d940e9..6a0f44b 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -23,7 +23,7 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 domain=$new_domain path=$new_path -ynh_add_config --template="../conf/config-sample.php" --destination="$install_dir/user/config.php" +ynh_add_config --template="config-sample.php" --destination="$install_dir/user/config.php" chmod 600 "$install_dir/user/config.php" chown $app:$app "$install_dir/user/config.php" diff --git a/scripts/install b/scripts/install index bd47ba3..1af5f6c 100644 --- a/scripts/install +++ b/scripts/install @@ -36,7 +36,7 @@ ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir/user/languages" --source_id="fr" # copy index file -cp ../conf/index.php $install_dir/ +ynh_add_config --template="index.php" --destination="$install_dir/index.php" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" diff --git a/scripts/restore b/scripts/restore index 9d4d5e5..d25e51e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -19,6 +19,13 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= +ynh_script_progression --message="Restoring the MySQL database..." --weight=5 + +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -28,13 +35,6 @@ 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 -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=5 - -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql - #================================================= # GENERIC FINALIZATION #================================================= From e4295ba84a4a72ecbca1c532bef4642c91fa8a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 Nov 2023 20:10:23 +0100 Subject: [PATCH 5/5] Update manifest.toml --- manifest.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 49ad692..88a4b94 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yourls" description.en = "URL shortening service" description.fr = "Service de raccourcisseur d'URL" -version = "1.9.2~ynh3" +version = "1.9.2~ynh4" maintainers = [""] @@ -20,8 +20,11 @@ code = "https://github.com/YOURLS/YOURLS" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "150M" ram.runtime = "50M"