Merge pull request #10 from YunoHost-Apps/testing

Merge testing

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

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

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__

conf/nginx.conf

@@ -10,15 +10,11 @@ location / {
   proxy_set_header  X-Forwarded-Host $server_name;
 
   # Include SSOWAT user panel.
-  include conf.d/yunohost_panel.conf.inc;
-}
-
-location /static/ {
-  alias __FINALPATH__/staticfiles/;
+  # include conf.d/yunohost_panel.conf.inc;
 }
 
 location /media/ {
-  alias __DATADIR__/;
+  alias __FINALPATH__/mediafiles/;
 }
 
 

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",
@@ -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"

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"