From dd0a24699d1fdbc7bee48b6455f22a3bc6b8191e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 19 Jul 2022 22:41:08 +0200
Subject: [PATCH 1/5] fix

---
 conf/.env.example | 8 +++++++-
 conf/cron         | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/conf/.env.example b/conf/.env.example
index cfed94a..3068d48 100644
--- a/conf/.env.example
+++ b/conf/.env.example
@@ -23,7 +23,7 @@ auth.gateway="cp-auth"
 #--------------------------------------------------------------------
 database.default.hostname="localhost"
 database.default.database="__DB_NAME__"
-database.default.username="__DB_NAME__"
+database.default.username="__DB_USER__"
 database.default.password="__DB_PWD__"
 database.default.DBPrefix="cp_"
 
@@ -35,3 +35,9 @@ cache.redis.host="127.0.0.1"
 cache.redis.password=null
 cache.redis.port=6379
 cache.redis.database=__REDIS_DB__
+
+#--------------------------------------------------------------------
+# REST API configuration
+#--------------------------------------------------------------------
+# restapi.enabled=true
+
diff --git a/conf/cron b/conf/cron
index 991a6e9..cff475d 100644
--- a/conf/cron
+++ b/conf/cron
@@ -1,3 +1,3 @@
-* * * * * __USER__ /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-activities
-* * * * * __USER__ /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-video-clips
-* * * * * __USER__ /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-websub-publish
\ No newline at end of file
+* * * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-activities
+* * * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-video-clips
+* * * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-websub-publish
\ No newline at end of file

From 1915e1ae9cde8f53aed0e8c798fc80e730928658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 19 Jul 2022 22:42:19 +0200
Subject: [PATCH 2/5] Update nginx.conf

---
 conf/nginx.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index c5aa3be..e1a1f03 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,4 +1,5 @@
-location / {
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+location __PATH__/ {
 
   # Path to source
   alias __FINALPATH__/public/;

From 7d3b4f9ac29cfd67729d97c564649fd00afa4773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 19 Jul 2022 22:45:26 +0200
Subject: [PATCH 3/5] Fix

---
 conf/app.src    | 4 ++--
 manifest.json   | 2 +-
 scripts/install | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 4d134ff..c29b919 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://code.castopod.org/adaures/castopod/uploads/ca9489b2a78f3434dc7b98065ab8caab/castopod-1.0.0-beta.16.zip
-SOURCE_SUM=dba778738f7d2800051422f57886f0230d3a4f30e94167528632de5e1267949a
+SOURCE_URL=https://code.castopod.org/adaures/castopod/uploads/34c2c6a92d934a403425219e59524177/castopod-1.0.0-beta.18.zip
+SOURCE_SUM=33889bf23cc133fbd735a19ec1cc92a61195da7d806163e4b266e668c5ad4833
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index da56f1d..d7c8a72 100755
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Hosting platform made for podcasters",
         "fr": "Plateforme d'hébergement conçue pour les podcasteurs"
     },
-    "version": "1.0.0-96~ynh1",
+    "version": "1.0.0-98~ynh1",
     "url": "https://castopod.org/",
     "upstream": {
         "license": "GPL-3.0-only",
diff --git a/scripts/install b/scripts/install
index 344f4a1..48673f8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -49,7 +49,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 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=phpversion --value=$phpversion
 ynh_app_setting_set --app=$app --key=password --value="$password"
 
 #=================================================
@@ -160,6 +159,8 @@ ynh_script_progression --message="Configuring permissions..." --weight=10
 # Make app public if necessary or protect it
 if [ $is_public -eq 1 ]
 then
+	# Everyone can access the app.
+	# The "main" permission is automatically created before the install script.
 	ynh_permission_update --permission="main" --add="visitors"
 fi
 

From 7c57310e3e7e072dc28e7d40d30abfed285592b0 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Tue, 19 Jul 2022 20:45:31 +0000
Subject: [PATCH 4/5] 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 45b20c3..54da2cf 100755
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Castopod is currently in beta but already quite stable and used by podcasters ar
 - Multi-user: add contributors and set roles
 - i18n support: translated in English, French & Polish with more to come!
 
-**Shipped version:** 1.0.0-96~ynh1
+**Shipped version:** 1.0.0-98~ynh1
 
 **Demo:** https://podcast.podlibre.org/@podlibre_fr
 
diff --git a/README_fr.md b/README_fr.md
index 1ef7a3d..4b88baa 100755
--- a/README_fr.md
+++ b/README_fr.md
@@ -40,7 +40,7 @@ Castopod is currently in beta but already quite stable and used by podcasters ar
 - Multi-user: add contributors and set roles
 - i18n support: translated in English, French & Polish with more to come!
 
-**Version incluse :** 1.0.0-96~ynh1
+**Version incluse :** 1.0.0-98~ynh1
 
 **Démo :** https://podcast.podlibre.org/@podlibre_fr
 

From 5c3eb843fa4dbbfce5f35c50b41b1fc412edaf2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 19 Jul 2022 22:49:59 +0200
Subject: [PATCH 5/5] Fix

---
 scripts/install | 4 ++++
 scripts/restore | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/scripts/install b/scripts/install
index 48673f8..5586713 100755
--- a/scripts/install
+++ b/scripts/install
@@ -13,6 +13,10 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
+ynh_clean_setup () {
+	### Remove this function if there's nothing to clean before calling the remove script.
+	true
+}
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
diff --git a/scripts/restore b/scripts/restore
index e332f60..ba36ab0 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -14,6 +14,10 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
+ynh_clean_setup () {
+	#### Remove this function if there's nothing to clean before calling the remove script.
+	true
+}
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors