From 1e4815c1da9bc2ea37c8ed4c3209322d0c0d944c Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 25 Jan 2021 23:53:24 +0100
Subject: [PATCH 01/11] Small fixes

---
 README.md                | 4 ++--
 pull_request_template.md | 4 +---
 scripts/install          | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 22c949b..7325e88 100755
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # Castopod for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/castopod.svg)](https://dash.yunohost.org/appci/app/castopod) ![](https://ci-apps.yunohost.org/ci/badges/castopod.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/castopod.maintain.svg)  
-[![Install castopod with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=castopod)
+[![Install Castopod with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=castopod)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install castopod quickly and simply on a YunoHost server.  
+> *This package allows you to install Castopod quickly and simply on a YunoHost server.  
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
diff --git a/pull_request_template.md b/pull_request_template.md
index 0ec7457..6c28fc5 100755
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -13,6 +13,4 @@
 
 ## Package_check results
 ---
-*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
-
-[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/castopod_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/castopod_ynh%20PR-NUM-%20(USERNAME)/)  
+* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
diff --git a/scripts/install b/scripts/install
index 51b6589..8eef909 100755
--- a/scripts/install
+++ b/scripts/install
@@ -100,9 +100,9 @@ ynh_script_progression --message="Configuring Castopod..." --weight=1
 cp ../conf/.env.example "$final_path/.env"
 
 # Change variables in Castopod configuration
-ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$final_path/.env"
-ynh_replace_string --match_string="__DBPWD__" --replace_string="$db_pwd" --target_file="$final_path/.env"
-ynh_replace_string --match_string="__DOMAIN__" --replace_string="https://$domain" --target_file="$final_path/.env"
+ynh_replace_string --match_string="__DBNAME__"     --replace_string="$db_name"                 --target_file="$final_path/.env"
+ynh_replace_string --match_string="__DBPWD__"      --replace_string="$db_pwd"                  --target_file="$final_path/.env"
+ynh_replace_string --match_string="__DOMAIN__"     --replace_string="https://$domain"          --target_file="$final_path/.env"
 ynh_replace_string --match_string="__DOMAINPATH__" --replace_string="https://$domain$path_url" --target_file="$final_path/.env"
 
 #=================================================
@@ -130,7 +130,7 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=10
 # Make app public if necessary or protect it
 if [ $is_public -eq 1 ]
 then
-	ynh_permission_update --permission "main" --add "visitors"
+	ynh_permission_update --permission="main" --add="visitors"
 fi
 
 #=================================================

From b9a80e3a277b76d7a44c9e7033bca04032cdfd37 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 11 Feb 2021 13:25:48 +0100
Subject: [PATCH 02/11] Upgrade to alpha 33

---
 README.md     | 2 +-
 README_fr.md  | 2 +-
 conf/app.src  | 4 ++--
 manifest.json | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 22c949b..4be5fad 100755
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 Castopod Server is an open-source hosting platform made for podcasters who want engage and interact with their audience. Please note that Castopod is still under heavy development: it may not be 100% stable and some features are still being developed.
 
-**Shipped version:** 1.0.0 alpha.31
+**Shipped version:** 1.0.0 alpha.33
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index ea86f58..f87cd1e 100755
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 ## Vue d'ensemble
 Castopod Server est une plate-forme d'hébergement open source conçue pour les podcasteurs qui souhaitent s'engager et interagir avec leur public. Veuillez noter que Castopod est toujours en développement: il n'est peut-être pas stable à 100% et certaines fonctionnalités sont encore en développement.
 
-**Version incluse :** 1.0.0 alpha.31
+**Version incluse :** 1.0.0 alpha.33
 
 ## Captures d'écran
 
diff --git a/conf/app.src b/conf/app.src
index 73bd4fe..439ffb2 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/cdf2017e96987c41e0a982aa40f0d1da/castopod-1.0.0-alpha.31.zip
-SOURCE_SUM=288c3a8391b739190df4b29d169b1ea76aafbe642fac0ee126af15ff654ed13d
+SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/c11cbe9c58cd0d48c91efe5f698ad639/castopod-1.0.0-alpha.33.zip
+SOURCE_SUM=e06757f5a1de2e7dbd716b63b2449c476c7d10077f0912c9606fe8fcb48f7b39
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index e8bd332..20ca179 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~ynh1",
+    "version": "1.0.0~ynh2",
     "url": "https://podlibre.org/",
     "license": "GPL-3.0-only",
     "maintainer": {

From 0749bb65e210f8b1d9009a58d5e1d9516e598c65 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 11 Feb 2021 13:27:06 +0100
Subject: [PATCH 03/11] Update check_process

---
 check_process | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/check_process b/check_process
index a8e6ef9..72889b2 100755
--- a/check_process
+++ b/check_process
@@ -16,6 +16,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		upgrade=1	from_commit=d511db842c4f1c3c6043ab9293d7f4eddcd9c379
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
@@ -24,6 +25,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=CommitHash
+	; commit=d511db842c4f1c3c6043ab9293d7f4eddcd9c379
 		name=Name and date of the commit.
 		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&

From 9f14ddd3022d45ba8f05a424e35f52edb99fdf22 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 11 Feb 2021 14:30:43 +0100
Subject: [PATCH 04/11] Fix

---
 README.md     |  2 +-
 README_fr.md  |  2 +-
 check_process |  4 ++--
 manifest.json | 16 +++++-----------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 4be5fad..c602627 100755
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Castopod Server is an open-source hosting platform made for podcasters who want
 
 ## Limitations
 
-* Any known limitations.
+* :warning: Installation possible only on a root domain or subdomain.
 
 ## Additional information
 
diff --git a/README_fr.md b/README_fr.md
index f87cd1e..92ce0ab 100755
--- a/README_fr.md
+++ b/README_fr.md
@@ -45,7 +45,7 @@ Castopod Server est une plate-forme d'hébergement open source conçue pour les
 
 ## Limitations
 
-* Limitations connues.
+* :warning: Installation possible uniquement sur un domaine racine ou sous-domaine.
 
 ## Informations additionnelles
 
diff --git a/check_process b/check_process
index 72889b2..ca3dd77 100755
--- a/check_process
+++ b/check_process
@@ -10,7 +10,7 @@
 		is_public=1	(PUBLIC|public=1|private=0)
 	; Checks
 		pkg_linter=1
-		setup_sub_dir=1
+		setup_sub_dir=0
 		setup_root=1
 		setup_nourl=0
 		setup_private=1
@@ -20,7 +20,7 @@
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
-		change_url=0
+		change_url=1
 ;;; Options
 Email=
 Notification=none
diff --git a/manifest.json b/manifest.json
index 20ca179..29cae5a 100755
--- a/manifest.json
+++ b/manifest.json
@@ -31,17 +31,11 @@
                     "en": "Choose a domain name for Castopod",
                     "fr": "Choisissez un nom de domaine pour Castopod"
                 },
-                "example": "example.com"
-            },
-            {
-                "name": "path",
-                "type": "path",
-                "ask": {
-                    "en": "Choose a path for Castopod",
-                    "fr": "Choisissez un chemin pour Castopod"
-                },
-                "example": "/",
-                "default": "/"
+                 "help": {
+                    "en": "Castopod needs to be installed in a dedicated domain or sub-domain.",
+                    "fr": "Castopod doit être installé dans un domaine ou sous-domaine dédié."
+                    },
+                "example": "podcast.example.com"
             },
             {
                 "name": "is_public",

From 83e5195fc67b17d561c62ca7750b8003761c9c2c Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 11 Feb 2021 16:01:13 +0100
Subject: [PATCH 05/11] Fix

---
 conf/.env.example | 10 +++++-----
 scripts/install   | 10 ++--------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/conf/.env.example b/conf/.env.example
index 46cdad2..9b8ee6c 100644
--- a/conf/.env.example
+++ b/conf/.env.example
@@ -11,16 +11,16 @@
 #--------------------------------------------------------------------
 
 # Instance configuration
-app.baseURL="__DOMAIN__"
-app.mediaBaseURL="__DOMAIN__"
+app.baseURL="https://__DOMAIN__"
+app.mediaBaseURL="https://__DOMAIN__"
 app.adminGateway="cp-admin"
 app.authGateway="cp-auth"
 
 # Database configuration
 database.default.hostname="localhost"
-database.default.database="__DBNAME__"
-database.default.username="__DBNAME__"
-database.default.password="__DBPWD__"
+database.default.database="__DB_NAME__"
+database.default.username="__DB_NAME__"
+database.default.password="__DB_PWD__"
 database.default.DBPrefix="cp_"
 
 # Cache configuration (advanced)
diff --git a/scripts/install b/scripts/install
index 51b6589..dfe1453 100755
--- a/scripts/install
+++ b/scripts/install
@@ -97,13 +97,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Configuring Castopod..." --weight=1
 
-cp ../conf/.env.example "$final_path/.env"
-
-# Change variables in Castopod configuration
-ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$final_path/.env"
-ynh_replace_string --match_string="__DBPWD__" --replace_string="$db_pwd" --target_file="$final_path/.env"
-ynh_replace_string --match_string="__DOMAIN__" --replace_string="https://$domain" --target_file="$final_path/.env"
-ynh_replace_string --match_string="__DOMAINPATH__" --replace_string="https://$domain$path_url" --target_file="$final_path/.env"
+ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env"
 
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
@@ -125,7 +119,7 @@ chmod -R 755 $final_path
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..." --weight=10
+ynh_script_progression --message="Configuring permissions..." --weight=10
 
 # Make app public if necessary or protect it
 if [ $is_public -eq 1 ]

From 4ab0c72d3c81981bb49c52e1abdb47ff1b7787c1 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 11 Feb 2021 16:13:45 +0100
Subject: [PATCH 06/11] Update install

---
 scripts/install | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index a2785c9..c5137fa 100755
--- a/scripts/install
+++ b/scripts/install
@@ -99,10 +99,6 @@ ynh_script_progression --message="Configuring Castopod..." --weight=1
 
 ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env"
 
-#=================================================
-# STORE THE CONFIG FILE CHECKSUM
-#=================================================
-
 # Recalculate and store the config file checksum into the app settings
 ynh_store_file_checksum --file="$final_path/.env"
 

From 3693e96037b36b20e6f1138031a6ae9b77fd1c2d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 11 Feb 2021 16:30:43 +0100
Subject: [PATCH 07/11] Update manifest.json

---
 manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 29cae5a..a9021da 100755
--- a/manifest.json
+++ b/manifest.json
@@ -10,11 +10,11 @@
     "url": "https://podlibre.org/",
     "license": "GPL-3.0-only",
     "maintainer": {
-        "name": "",
+        "name": "eric_G",
         "email": ""
     },
     "requirements": {
-        "yunohost": ">= 3.8.1"
+        "yunohost": ">= 4.0.0"
     },
     "multi_instance": true,
     "services": [

From d578755691b7e042ae2afb3806056ed2ade40de3 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 11 Feb 2021 16:33:22 +0100
Subject: [PATCH 08/11] Update upgrade

---
 scripts/upgrade | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 2e47736..e4ffcc2 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -45,6 +45,13 @@ if [ -z "$final_path" ]; then
 	ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 fi
 
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+	ynh_legacy_permissions_delete_all
+
+	ynh_app_setting_delete --app=$app --key=is_public
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================

From f9d8e7bff12004bf362cae3925304741c1b25c36 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 11 Feb 2021 20:07:41 +0100
Subject: [PATCH 09/11] Upgrade to alpha 34

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 conf/app.src | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d0c48c0..55d263f 100755
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 Castopod Server is an open-source hosting platform made for podcasters who want engage and interact with their audience. Please note that Castopod is still under heavy development: it may not be 100% stable and some features are still being developed.
 
-**Shipped version:** 1.0.0 alpha.33
+**Shipped version:** 1.0.0 alpha.34
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 92ce0ab..c997fbd 100755
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 ## Vue d'ensemble
 Castopod Server est une plate-forme d'hébergement open source conçue pour les podcasteurs qui souhaitent s'engager et interagir avec leur public. Veuillez noter que Castopod est toujours en développement: il n'est peut-être pas stable à 100% et certaines fonctionnalités sont encore en développement.
 
-**Version incluse :** 1.0.0 alpha.33
+**Version incluse :** 1.0.0 alpha.34
 
 ## Captures d'écran
 
diff --git a/conf/app.src b/conf/app.src
index 439ffb2..b31c42a 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/c11cbe9c58cd0d48c91efe5f698ad639/castopod-1.0.0-alpha.33.zip
-SOURCE_SUM=e06757f5a1de2e7dbd716b63b2449c476c7d10077f0912c9606fe8fcb48f7b39
+SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/0d8882d560a19ace8f52b0590bae24e4/castopod-1.0.0-alpha.34.zip
+SOURCE_SUM=0690508dc5743d7f523aa25f581c1174662b90bca721461822bec0254ae04450
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true

From 1596869f24ff8740b235cc7880c015a7072eb20a Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 28 Feb 2021 15:14:28 +0100
Subject: [PATCH 10/11] Upgrade to alpha 38

---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 conf/app.src    | 4 ++--
 scripts/install | 1 -
 scripts/upgrade | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 55d263f..4f588fd 100755
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 Castopod Server is an open-source hosting platform made for podcasters who want engage and interact with their audience. Please note that Castopod is still under heavy development: it may not be 100% stable and some features are still being developed.
 
-**Shipped version:** 1.0.0 alpha.34
+**Shipped version:** 1.0.0 alpha.38
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index c997fbd..8d6d741 100755
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 ## Vue d'ensemble
 Castopod Server est une plate-forme d'hébergement open source conçue pour les podcasteurs qui souhaitent s'engager et interagir avec leur public. Veuillez noter que Castopod est toujours en développement: il n'est peut-être pas stable à 100% et certaines fonctionnalités sont encore en développement.
 
-**Version incluse :** 1.0.0 alpha.34
+**Version incluse :** 1.0.0 alpha.38
 
 ## Captures d'écran
 
diff --git a/conf/app.src b/conf/app.src
index b31c42a..85fa925 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/0d8882d560a19ace8f52b0590bae24e4/castopod-1.0.0-alpha.34.zip
-SOURCE_SUM=0690508dc5743d7f523aa25f581c1174662b90bca721461822bec0254ae04450
+SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/a3bf84c330fb9dd89477a9bbcfb0157d/castopod-1.0.0-alpha.38.zip
+SOURCE_SUM=50828c4889f4722985c8776fd036403f9b15f4255ec7675dd7e1120d6754031e
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/scripts/install b/scripts/install
index c5137fa..76265bc 100755
--- a/scripts/install
+++ b/scripts/install
@@ -44,7 +44,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=is_public --value=$is_public
 
 #=================================================
 # CREATE A MYSQL DATABASE
diff --git a/scripts/upgrade b/scripts/upgrade
index e4ffcc2..2444e21 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 

From 0fae732544fbc9907dd892332ad3ceaf3f97c6ce Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 28 Feb 2021 15:26:00 +0100
Subject: [PATCH 11/11] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index a9021da..88b4d18 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~ynh2",
+    "version": "1.0.0-38~ynh1",
     "url": "https://podlibre.org/",
     "license": "GPL-3.0-only",
     "maintainer": {