From b1faa4f4338a16c63a4d4cd4faa251fcae4af144 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 20:52:46 +0200 Subject: [PATCH 1/7] set relative path to keep option --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 399c7fa..e8c30b0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -73,7 +73,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/venv" + ynh_setup_source --dest_dir="$final_path" --keep="venv" chmod 750 "$final_path" chmod -R o-rwx "$final_path" From 38a8bf0165fe9ee45d18e37ffcf1173587235674 Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Tue, 23 Aug 2022 01:42:25 -0600 Subject: [PATCH 2/7] fix 404 --- conf/nginx.conf | 4 ++-- manifest.json | 2 +- scripts/upgrade | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4fb4e65..c64b7b1 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -14,11 +14,11 @@ location / { } location /static/ { - alias __FINALPATH__/staticfiles/; + alias __FINALPATH__/staticfiles; } location /media/ { - alias __DATADIR__/; + alias __FINALPATH__/mediafiles; } diff --git a/manifest.json b/manifest.json index 9fc40c4..9f980f0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Application for managing recipes, planning meals, building shopping lists and much much more!", "fr": "Expliquez en *quelques* (10~15) mots l'utilité de l'app ou ce qu'elle fait (l'objectif est de donner une idée grossière pour des utilisateurs qui naviguent dans un catalogue de 100+ apps)" }, - "version": "1.3.3~ynh1", + "version": "1.3.3~ynh2", "url": "https://tandoor.dev", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/upgrade b/scripts/upgrade index 399c7fa..6d769b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -73,7 +73,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/venv" + ynh_setup_source --dest_dir="$final_path" --keep="venv mediafiles" chmod 750 "$final_path" chmod -R o-rwx "$final_path" From b5c447fa24e6fbf7a0130211f8c1f619efd22375 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 Aug 2022 07:42:39 +0000 Subject: [PATCH 3/7] 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 1d22369..6d8df72 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ a public page. - 📥️ **Import your collection** from many other [recipe managers](https://docs.tandoor.dev/features/import_export/) - ➕ Many more like recipe scaling, image compression, printing views and supermarkets -**Shipped version:** 1.3.3~ynh1 +**Shipped version:** 1.3.3~ynh2 **Demo:** https://app.tandoor.dev/accounts/login/?demo diff --git a/README_fr.md b/README_fr.md index 9637611..fdb8c08 100644 --- a/README_fr.md +++ b/README_fr.md @@ -44,7 +44,7 @@ a public page. - 📥️ **Import your collection** from many other [recipe managers](https://docs.tandoor.dev/features/import_export/) - ➕ Many more like recipe scaling, image compression, printing views and supermarkets -**Version incluse :** 1.3.3~ynh1 +**Version incluse :** 1.3.3~ynh2 **Démo :** https://app.tandoor.dev/accounts/login/?demo From 706b2e9a7c209369ac2a063f340f80db1e63993c Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Sun, 28 Aug 2022 18:23:23 -0600 Subject: [PATCH 4/7] fix license --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 9f980f0..75374ef 100644 --- a/manifest.json +++ b/manifest.json @@ -16,7 +16,7 @@ "userdoc": "https://docs.tandoor.dev", "code": "https://github.com/TandoorRecipes/recipes" }, - "license": "MIT", + "license": "AGPL-3.0-or-later", "maintainer": { "name": "Navan Chauhan", "email": "tandoor@navan.email" From 9bf5396b09b78ae2bb8c58bf104cfe26dcd5c876 Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Sun, 28 Aug 2022 18:39:50 -0600 Subject: [PATCH 5/7] fixed 404 --- conf/nginx.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index c64b7b1..9d4a737 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,12 +13,8 @@ location / { include conf.d/yunohost_panel.conf.inc; } -location /static/ { - alias __FINALPATH__/staticfiles; -} - location /media/ { - alias __FINALPATH__/mediafiles; + alias __FINALPATH__/mediafiles/; } From 3a3b4b3d172fd262bc7ee05f28c63d880b63da7e Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Sun, 28 Aug 2022 18:56:56 -0600 Subject: [PATCH 6/7] fix import --- conf/.env.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/.env.template b/conf/.env.template index 7b3d03a..25c75d1 100644 --- a/conf/.env.template +++ b/conf/.env.template @@ -1,7 +1,7 @@ # only set this to true when testing/debugging # when unset: 1 (true) - dont unset this, just for development -DEBUG=0 -SQL_DEBUG=0 +DEBUG=1 +SQL_DEBUG=1 # HTTP port to bind to TANDOOR_PORT=__PORT__ From 677631bb85899d3ef9ff7e0f8137f85dd3740e68 Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Sun, 28 Aug 2022 19:03:23 -0600 Subject: [PATCH 7/7] disable ynh portal --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9d4a737..21a201c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,7 +10,7 @@ location / { proxy_set_header X-Forwarded-Host $server_name; # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; + # include conf.d/yunohost_panel.conf.inc; } location /media/ {