From 982d83c7aa0cb654e8ac0e76107601419cda0ddc Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Wed, 2 Mar 2022 22:32:45 +0100 Subject: [PATCH 01/42] Respect language choice at install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ab502b7..595c1f2 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +ynh_webpath_register --app=$app --domain=$domain --path_url="$path_url/\#/?lang=$language" #================================================= # STORE SETTINGS FROM MANIFEST From bad5f0d3b14bb6770b07679a9768185fe28c673f Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Thu, 3 Mar 2022 22:17:09 +0100 Subject: [PATCH 02/42] Revert change --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 595c1f2..ab502b7 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url="$path_url/\#/?lang=$language" +ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST From f4fd92a427e55836aefe45e9d6132a442f702513 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Thu, 3 Mar 2022 22:27:04 +0100 Subject: [PATCH 03/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 7ff75b5..d8ebddf 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,7 +10,7 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; - try_files $uri $uri/ index.php; + try_files $uri/\#/?lang=en; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; From 7b142bb2056dad0f334bf8cd6485e8eed5b747b8 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Thu, 3 Mar 2022 22:39:06 +0100 Subject: [PATCH 04/42] Trying to escape # --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d8ebddf..02f7067 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,7 +10,7 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; - try_files $uri/\#/?lang=en; + try_files $uri/%23/?lang=en; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; From bc3cad7c87a4d4ca8589fb6285589114d2b3f212 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Thu, 3 Mar 2022 22:54:28 +0100 Subject: [PATCH 05/42] Update nginx.conf --- conf/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 02f7067..d597b9d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,8 +10,8 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; - try_files $uri/%23/?lang=en; - location ~ [^/]\.php(/|$) { +try_files $uri $uri/ index.php; +location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; From cf585bce57b2b189731034c04cf3d6dfd8524063 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Thu, 3 Mar 2022 23:23:16 +0100 Subject: [PATCH 06/42] Trying another approach --- conf/nginx.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index d597b9d..8ce1ca8 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,6 +10,8 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; +set $args $args&lang=__LANG__; + try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; From ece8e7884f52a8df37ed24934e2a37b3483964ab Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Thu, 3 Mar 2022 23:29:40 +0100 Subject: [PATCH 07/42] Lang to language --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8ce1ca8..d38fba3 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,7 +10,7 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; -set $args $args&lang=__LANG__; +set $args $args&lang=__LANGUAGE__; try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { From f2556498abed3e62356f04d892c72cfe6376fb7a Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Thu, 3 Mar 2022 23:45:22 +0100 Subject: [PATCH 08/42] Adding set #args to php location --- conf/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index d38fba3..8cb64c3 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -22,6 +22,7 @@ location ~ [^/]\.php(/|$) { fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; + set $args $args&lang=__LANGUAGE__; } ### End of PHP configuration part From dff5841daff9a28ef5d5ab1c4e54c75f2b31a5ea Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 00:06:28 +0100 Subject: [PATCH 09/42] Trying another approach with rewrite --- conf/nginx.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8cb64c3..4b41811 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,8 +10,8 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; -set $args $args&lang=__LANGUAGE__; - +rewrite ^(.*)$ $1?lang=__LANGUAGE__ break; + try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; @@ -22,7 +22,6 @@ location ~ [^/]\.php(/|$) { fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; - set $args $args&lang=__LANGUAGE__; } ### End of PHP configuration part From 951da6635ba340db1e39ea5965028b8dd8f54fe8 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 00:25:43 +0100 Subject: [PATCH 10/42] Update nginx.conf --- conf/nginx.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4b41811..ec1c56b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,14 +3,13 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; + rewrite ^(.*)$ $1?lang=__LANGUAGE__ break; ### Example PHP configuration (remove it if not used) # index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; - -rewrite ^(.*)$ $1?lang=__LANGUAGE__ break; try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { From f5f1771ded87cfb4f4b10663ff096d213db295a2 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 00:34:16 +0100 Subject: [PATCH 11/42] Alias and rewrite playing nice together? --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index ec1c56b..f57f8e2 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,5 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { +location ^~ __PATH__/ { # Path to source alias __FINALPATH__/ ; From 24bfb4b43ef779e647aba5f11e46345c41a64635 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 00:46:48 +0100 Subject: [PATCH 12/42] Trying return --- conf/nginx.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index f57f8e2..7407542 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,11 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location ^~ __PATH__/ { +location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^(.*)$ $1?lang=__LANGUAGE__ break; + return 301 __FINALPATH__/%23/?lang=__LANGUAGE__; + ### Example PHP configuration (remove it if not used) # index index.php; From ccb4181f9600c4328200da50272e53f052cd4caf Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 00:54:39 +0100 Subject: [PATCH 13/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 7407542..5e4daf4 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - return 301 __FINALPATH__/%23/?lang=__LANGUAGE__; + rewrite ^ __FINALPATH__$uri?lang=en permanent; ### Example PHP configuration (remove it if not used) # index index.php; From 1464b7ab270dcd5e8e54f7a2b4fc96592a833438 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 01:05:10 +0100 Subject: [PATCH 14/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 5e4daf4..538c2b0 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^ __FINALPATH__$uri?lang=en permanent; + rewrite ^ __DOMAIN__$uri?lang=en permanent; ### Example PHP configuration (remove it if not used) # index index.php; From a3347892a90ac68dec220a8c9f9fa3b52c42377d Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 01:11:18 +0100 Subject: [PATCH 15/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 538c2b0..0e3256a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^ __DOMAIN__$uri?lang=en permanent; + rewrite ^ $uri/%23/?lang=__LANGUAGE__ permanent; ### Example PHP configuration (remove it if not used) # index index.php; From 224a2cb5a2d79c3e318ad5a80914cdf6e42b56ec Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 01:16:02 +0100 Subject: [PATCH 16/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 0e3256a..9609780 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^ $uri/%23/?lang=__LANGUAGE__ permanent; + rewrite ^ $uri%23/?lang=__LANGUAGE__ break; ### Example PHP configuration (remove it if not used) # index index.php; From 117c4707e2d155f94aae9dd5a61ca75de9f92bba Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 01:21:48 +0100 Subject: [PATCH 17/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9609780..d23cbe8 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^ $uri%23/?lang=__LANGUAGE__ break; + rewrite ^ $uri\#/?lang=__LANGUAGE__ break; ### Example PHP configuration (remove it if not used) # index index.php; From 646e2c948ec0dbe80dfdd4b83b03920b080aa0d6 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 01:25:57 +0100 Subject: [PATCH 18/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d23cbe8..ef052b9 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^ $uri\#/?lang=__LANGUAGE__ break; + rewrite ^ $uri/\#/?lang=__LANGUAGE__ break; ### Example PHP configuration (remove it if not used) # index index.php; From 7fe5219be1348636f79f441386d0c58bb71b9bd7 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 01:31:44 +0100 Subject: [PATCH 19/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index ef052b9..502a2bc 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^ $uri/\#/?lang=__LANGUAGE__ break; + rewrite ^ $uri/%23/?lang=__LANGUAGE__ break; ### Example PHP configuration (remove it if not used) # index index.php; From 0a615abc9a58787448f1426852bb56209d0b14c9 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 08:34:17 +0100 Subject: [PATCH 20/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 502a2bc..a1b6465 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^ $uri/%23/?lang=__LANGUAGE__ break; + rewrite ^ __DOMAIN__PATH_URL__/%23/?lang=__LANGUAGE__ break; ### Example PHP configuration (remove it if not used) # index index.php; From 0ea65180f2832378273ee64c8bdbc38f29bdfa09 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 08:34:48 +0100 Subject: [PATCH 21/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index a1b6465..e776012 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^ __DOMAIN__PATH_URL__/%23/?lang=__LANGUAGE__ break; + rewrite ^ __DOMAIN__/__PATH_URL__/%23/?lang=__LANGUAGE__ break; ### Example PHP configuration (remove it if not used) # index index.php; From c130e58d3abdb21af1ad32afc1a447e88cefe7d9 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 08:43:59 +0100 Subject: [PATCH 22/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index e776012..ecbe74a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^ __DOMAIN__/__PATH_URL__/%23/?lang=__LANGUAGE__ break; + rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/%23/?lang=__LANGUAGE__ break; ### Example PHP configuration (remove it if not used) # index index.php; From 58463901389bb4daf60f0ed25a7bbf78a2300c47 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 08:55:21 +0100 Subject: [PATCH 23/42] Update nginx.conf --- conf/nginx.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index ecbe74a..ba0d049 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,9 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/%23/?lang=__LANGUAGE__ break; + if ($args !~* lang=__LANGUAGE__){ + rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/%23/?lang=__LANGUAGE__ last; + } ### Example PHP configuration (remove it if not used) # index index.php; From ecce27c9de958f8bed0a13f363d4d841ed9f77c7 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Mar 2022 09:03:28 +0100 Subject: [PATCH 24/42] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index ba0d049..7a92296 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,7 +5,7 @@ location __PATH__/ { alias __FINALPATH__/ ; if ($args !~* lang=__LANGUAGE__){ - rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/%23/?lang=__LANGUAGE__ last; + rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/#/?lang=__LANGUAGE__ last; } ### Example PHP configuration (remove it if not used) From ba92115d38aedc47b2e79bd1eeb4da1d7dd29b1b Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 00:20:35 +0100 Subject: [PATCH 25/42] Exclude static files from URL rewriting --- conf/nginx.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 7a92296..0299878 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,6 +7,11 @@ location __PATH__/ { if ($args !~* lang=__LANGUAGE__){ rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/#/?lang=__LANGUAGE__ last; } + +location __PATH__/static/ { + + alias __FINALPATH__/static/ ; + } ### Example PHP configuration (remove it if not used) # index index.php; From 29e77f4276c29d9ab19b1e9361be616ef5f58919 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 00:30:59 +0100 Subject: [PATCH 26/42] Update nginx.conf --- conf/nginx.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 0299878..fe9dd53 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,13 +4,13 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - if ($args !~* lang=__LANGUAGE__){ - rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/#/?lang=__LANGUAGE__ last; - } +# if ($args !~* lang=__LANGUAGE__){ + # rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/#/?lang=__LANGUAGE__ last; + # } -location __PATH__/static/ { +#location __PATH__/static/ { - alias __FINALPATH__/static/ ; +# alias __FINALPATH__/static/ ; } ### Example PHP configuration (remove it if not used) From 61b64211939a5120c1a42a0c7c523cc11a8f9fc4 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 00:43:10 +0100 Subject: [PATCH 27/42] Update nginx.conf --- conf/nginx.conf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index fe9dd53..d9e0102 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,15 +4,10 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; -# if ($args !~* lang=__LANGUAGE__){ - # rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/#/?lang=__LANGUAGE__ last; - # } - -#location __PATH__/static/ { - -# alias __FINALPATH__/static/ ; + if ($args !~* lang=__LANGUAGE__){ + rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/#/?lang=__LANGUAGE__ last; } - + ### Example PHP configuration (remove it if not used) # index index.php; @@ -34,4 +29,9 @@ location ~ [^/]\.php(/|$) { # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; -} +} + +location __PATH__/static/ { + + alias __FINALPATH__/static/ ; + } From 4ab73dd97a0e86b175eb2930754c68fdca3106ed Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 01:02:51 +0100 Subject: [PATCH 28/42] Revert all --- conf/nginx.conf | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d9e0102..7ff75b5 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,18 +4,14 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - if ($args !~* lang=__LANGUAGE__){ - rewrite ^(.*)$ https://__DOMAIN____PATH_URL__/#/?lang=__LANGUAGE__ last; - } - ### Example PHP configuration (remove it if not used) # index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; - -try_files $uri $uri/ index.php; -location ~ [^/]\.php(/|$) { + + try_files $uri $uri/ index.php; + location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; @@ -29,9 +25,4 @@ location ~ [^/]\.php(/|$) { # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; -} - -location __PATH__/static/ { - - alias __FINALPATH__/static/ ; - } +} From aeb7e66740ad502d5012291fc070cab14e683881 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 01:17:32 +0100 Subject: [PATCH 29/42] Fixes to follow the advises from the CI tests --- manifest.json | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/manifest.json b/manifest.json index fd2ebd6..0927e62 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,8 @@ "license": "GPL-3.0-only", "website": "https://ladigitale.dev/", "demo": "https://ladigitale.dev/digiwords/#/", - "admindoc": "https://yunohost.org/packaging_apps", - "userdoc": "https://yunohost.org/apps", + "admindoc": "https://gitlab.com/ladigitale/digiwords/-/blob/master/README.md", + "userdoc": "https://ladigitale.dev/blog/digiwords-pour-creer-des-nuages-de-mots", "code": "https://gitlab.com/ladigitale/digiwords" }, "license": "GPL-3.0-only", @@ -34,10 +34,6 @@ { "name": "domain", "type": "domain", - "ask": { - "fr": "Choisissez un domaine pour Digiwords", - "en": "Choose a domain name for Digiwords" - } }, { "name": "path", @@ -48,18 +44,11 @@ { "name": "is_public", "type": "boolean", + "help": { + "en": "If public, any visitor can create word clouds and see saved ones, providing they know their secret questions and answers." + "fr": "Si l’application est public, n’importe quel visiteur pourra créer un nuage de mots et consulter ceux sauvegardés dont ils connaissent à la fois la question secrète et la réponse." "default": true }, - { - "name": "language", - "type": "string", - "ask": { - "en": "Choose the application language", - "fr": "Choisissez la langue de l'application" - }, - "choices": ["fr", "en"], - "default": "fr" - } ] } } From a5fc246fe58cba67a80a1a315152fa9575a30116 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 01:18:50 +0100 Subject: [PATCH 30/42] Minor fixes --- manifest.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0927e62..0d77582 100644 --- a/manifest.json +++ b/manifest.json @@ -45,8 +45,9 @@ "name": "is_public", "type": "boolean", "help": { - "en": "If public, any visitor can create word clouds and see saved ones, providing they know their secret questions and answers." + "en": "If public, any visitor can create word clouds and see saved ones, providing they know their secret questions and answers.", "fr": "Si l’application est public, n’importe quel visiteur pourra créer un nuage de mots et consulter ceux sauvegardés dont ils connaissent à la fois la question secrète et la réponse." + }, "default": true }, ] From 061f213d3a7c9d04051495fd0eae7abbf3508f3b Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 01:20:51 +0100 Subject: [PATCH 31/42] Remove --time --- scripts/install | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index ab502b7..f6c3f2a 100644 --- a/scripts/install +++ b/scripts/install @@ -101,7 +101,7 @@ ynh_app_setting_set --app=$app --key=language --value=$language #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --time --weight=1 +ynh_script_progression --message="Installing dependencies..." --weight=1 ### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package. ### Those deb packages will be installed as dependencies of this package. @@ -116,7 +116,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Configuring system user..." --time --weight=1 +ynh_script_progression --message="Configuring system user..." --weight=1 # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" @@ -143,7 +143,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --time --weight=1 +ynh_script_progression --message="Setting up source files..." --weight=1 ### `ynh_setup_source` is used to install an app from a zip or tar.gz file, ### downloaded from an upstream source, like a git repository. @@ -166,7 +166,7 @@ chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --time --weight=1 +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 ### `ynh_add_nginx_config` will use the file conf/nginx.conf @@ -176,7 +176,7 @@ ynh_add_nginx_config #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --time --weight=1 +ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 ### `ynh_add_fpm_config` is used to set up a PHP config. ### You can remove it if your app doesn't use PHP. @@ -375,7 +375,7 @@ ynh_add_fpm_config #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." --time --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] @@ -399,7 +399,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -407,5 +407,5 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --time --last +ynh_script_progression --message="Installation of $app completed" --last From fb47c2316bbbd4c51eb9629a0bc5e0d892e559a0 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 01:21:45 +0100 Subject: [PATCH 32/42] Remove --time --- scripts/remove | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/remove b/scripts/remove index fb5b028..2019d36 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -28,7 +28,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --time --weight=1 +ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -36,7 +36,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config @@ -44,7 +44,7 @@ ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --time --weight=1 +ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config @@ -52,7 +52,7 @@ ynh_remove_fpm_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --time --weight=1 +ynh_script_progression --message="Removing dependencies..." --weight=1 # Remove metapackage and its dependencies ynh_remove_app_dependencies @@ -60,7 +60,7 @@ ynh_remove_app_dependencies #================================================= # REMOVE FAIL2BAN CONFIGURATION #================================================= -#ynh_script_progression --message="Removing Fail2Ban configuration..." --time --weight=1 +#ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=1 # Remove the dedicated Fail2Ban config #ynh_remove_fail2ban_config @@ -70,7 +70,7 @@ ynh_remove_app_dependencies #================================================= # REMOVE VARIOUS FILES #================================================= -ynh_script_progression --message="Removing various files..." --time --weight=1 +ynh_script_progression --message="Removing various files..." --weight=1 # Remove a cron file #ynh_secure_remove --file="/etc/cron.d/$app" @@ -86,7 +86,7 @@ ynh_secure_remove --file="/var/log/$app" #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1 +ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user ynh_system_user_delete --username=$app @@ -95,4 +95,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --time --last +ynh_script_progression --message="Removal of $app completed" --last From fb7a454a1ab0dbf0d5907344e78d84f643f68eec Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 01:22:48 +0100 Subject: [PATCH 33/42] Remove --time --- scripts/upgrade | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 90943dc..9d49a21 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -38,7 +38,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -54,7 +54,7 @@ ynh_abort_if_errors #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --time --weight=1 +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # # N.B. : the followings setting migrations snippets are provided as *EXAMPLES* @@ -97,7 +97,7 @@ fi #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1 +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" @@ -108,7 +108,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --time --weight=1 + ynh_script_progression --message="Upgrading source files..." --weight=1 # Test because file doesn’t exist at first install. It is created at first page opening. if test -f "$final_path/inc/digiwords.db" @@ -149,7 +149,7 @@ chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config @@ -157,14 +157,14 @@ ynh_add_nginx_config #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --time --weight=1 +ynh_script_progression --message="Upgrading dependencies..." --weight=1 ynh_install_app_dependencies $pkg_dependencies #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config @@ -186,7 +186,7 @@ ynh_add_fpm_config #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -194,5 +194,5 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --time --last +ynh_script_progression --message="Upgrade of $app completed" --last From dc5e522850061a2d46b6d6f8bbdf8360da24ff0a Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 01:23:53 +0100 Subject: [PATCH 34/42] Remove --time --- scripts/restore | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/restore b/scripts/restore index da48f85..2c60b67 100644 --- a/scripts/restore +++ b/scripts/restore @@ -24,7 +24,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -39,7 +39,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." --time --weight=1 +ynh_script_progression --message="Validating restoration parameters..." --weight=1 test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -49,14 +49,14 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --time --weight=1 +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" #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --time --weight=1 +ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 # Create the dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" @@ -64,7 +64,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --time --weight=1 +ynh_script_progression --message="Restoring the app main directory..." --weight=1 ynh_restore_file --origin_path="$final_path" @@ -81,7 +81,7 @@ chown -R $app:www-data "$final_path" #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" @@ -99,7 +99,7 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --time --weight=1 +ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies @@ -118,7 +118,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=1 ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload @@ -127,5 +127,5 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --time --last +ynh_script_progression --message="Restoration completed for $app" --last From b765421cd688f1cbbf3e8c08e5a579544ca3224b Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 22:13:38 +0100 Subject: [PATCH 35/42] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0d77582..29cc7e3 100644 --- a/manifest.json +++ b/manifest.json @@ -33,7 +33,7 @@ "install" : [ { "name": "domain", - "type": "domain", + "type": "domain" }, { "name": "path", From 4de01d8725a715fd80b0d5e52e5c202fe0d4c990 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 22:15:01 +0100 Subject: [PATCH 36/42] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 29cc7e3..67755f5 100644 --- a/manifest.json +++ b/manifest.json @@ -49,7 +49,7 @@ "fr": "Si l’application est public, n’importe quel visiteur pourra créer un nuage de mots et consulter ceux sauvegardés dont ils connaissent à la fois la question secrète et la réponse." }, "default": true - }, + } ] } } From fcae48caaac014855660bded6c3b2ca3988a095e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 13 Mar 2022 21:15:03 +0000 Subject: [PATCH 37/42] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6cbceff..8d3e6e2 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ With Digiwords, you can create interactive wordclouds. ## Documentation and resources * Official app website: https://ladigitale.dev/ -* Official user documentation: https://yunohost.org/apps -* Official admin documentation: https://yunohost.org/packaging_apps +* Official user documentation: https://ladigitale.dev/blog/digiwords-pour-creer-des-nuages-de-mots +* Official admin documentation: https://gitlab.com/ladigitale/digiwords/-/blob/master/README.md * Upstream app code repository: https://gitlab.com/ladigitale/digiwords * YunoHost documentation for this app: https://yunohost.org/app_digiwords * Report a bug: https://github.com/YunoHost-Apps/digiwords_ynh/issues diff --git a/README_fr.md b/README_fr.md index a666ee6..da39491 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,8 +20,8 @@ Digiwords permet de créer des nuages de mots interactifs.) ## Documentations et ressources * Site officiel de l'app : https://ladigitale.dev/ -* Documentation officielle utilisateur : https://yunohost.org/apps -* Documentation officielle de l'admin : https://yunohost.org/packaging_apps +* Documentation officielle utilisateur : https://ladigitale.dev/blog/digiwords-pour-creer-des-nuages-de-mots +* Documentation officielle de l'admin : https://gitlab.com/ladigitale/digiwords/-/blob/master/README.md * Dépôt de code officiel de l'app : https://gitlab.com/ladigitale/digiwords * Documentation YunoHost pour cette app : https://yunohost.org/app_digiwords * Signaler un bug : https://github.com/YunoHost-Apps/digiwords_ynh/issues From 8aed6dee5dfebb66fe0df6893ff6855786c89a85 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 22:16:57 +0100 Subject: [PATCH 38/42] Delate language variable --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index f6c3f2a..a9da028 100644 --- a/scripts/install +++ b/scripts/install @@ -28,7 +28,7 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH #admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -language=$YNH_APP_ARG_LANGUAGE +#language=$YNH_APP_ARG_LANGUAGE #password=$YNH_APP_ARG_PASSWORD ### If it's a multi-instance app, meaning it can be installed several times independently From 57f1c9776b065ad5e6e81d6075757d0d25ff4666 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 22:17:44 +0100 Subject: [PATCH 39/42] Delete language related variable --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9d49a21..0905b70 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -language=$(ynh_app_setting_get --app=$app --key=language) +#language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) #================================================= From 1f1deb9d9b2b2dad8f22346e6c2385c56f87544f Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 13 Mar 2022 22:19:57 +0100 Subject: [PATCH 40/42] Comment language related stuff --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a9da028..282e157 100644 --- a/scripts/install +++ b/scripts/install @@ -72,7 +72,7 @@ ynh_script_progression --message="Storing installation settings..." --time --wei ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url #ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=language --value=$language +#ynh_app_setting_set --app=$app --key=language --value=$language #================================================= # STANDARD MODIFICATIONS From 528597b56ba9b4a07b4fbf192fef4ad596a05176 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Mon, 14 Mar 2022 20:59:42 +0100 Subject: [PATCH 41/42] Bump version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 67755f5..2167a28 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "With Digiwords, you can create interactive wordclouds.", "fr": "Digiwords permet de créer des nuages de mots interactifs.)" }, - "version": "0.3.2~ynh1", + "version": "0.3.2~ynh2", "url": "https://ladigitale.dev/", "upstream": { "license": "GPL-3.0-only", From 5b11285be27277336ae2f705a338cd538741e47b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 14 Mar 2022 19:59:44 +0000 Subject: [PATCH 42/42] 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 8d3e6e2..a458e60 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in With Digiwords, you can create interactive wordclouds. -**Shipped version:** 0.3.2~ynh1 +**Shipped version:** 0.3.2~ynh2 **Demo:** https://ladigitale.dev/digiwords/#/ diff --git a/README_fr.md b/README_fr.md index da39491..2494c54 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Digiwords permet de créer des nuages de mots interactifs.) -**Version incluse :** 0.3.2~ynh1 +**Version incluse :** 0.3.2~ynh2 **Démo :** https://ladigitale.dev/digiwords/#/