From 3418b2a1a2b3439959c476e31e44a48cf46c6813 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 4 Jan 2021 23:43:04 +0100 Subject: [PATCH 01/13] fix --- conf/nginx.conf | 4 +--- manifest.json | 4 ++-- scripts/install | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 63785a1..91f2c50 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,4 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { +location / { # Path to source alias __FINALPATH__/public/ ; @@ -18,7 +17,6 @@ location __PATH__/ { location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; - fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; diff --git a/manifest.json b/manifest.json index 28f2b77..cce6326 100755 --- a/manifest.json +++ b/manifest.json @@ -40,8 +40,8 @@ "en": "Choose a path for Castopod", "fr": "Choisissez un chemin pour Castopod" }, - "example": "/castopod", - "default": "/castopod" + "example": "/", + "default": "/" }, { "name": "is_public", diff --git a/scripts/install b/scripts/install index 1125921..51b6589 100755 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,7 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH +path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME From 8155176092f789d57f69868b66ee873751ab0677 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 5 Jan 2021 10:18:52 +0100 Subject: [PATCH 02/13] Update nginx.conf --- conf/nginx.conf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 91f2c50..fef01e2 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,19 +1,17 @@ location / { # Path to source - alias __FINALPATH__/public/ ; + alias __FINALPATH__/public/; # Force usage of https if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } - index index.php index.html ; + index index.php; - # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - #client_max_body_size 50M; + rewrite ^/.*$ /index.php last; - 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 f64959e9244ead1328207daedb2836c75d07e699 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 5 Jan 2021 11:12:52 +0100 Subject: [PATCH 03/13] Fix --- README.md | 9 +++++---- README_fr.md | 6 +++--- check_process | 4 ++-- pull_request_template.md | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index feb37dd..56e8085 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 +**Shipped version:** 1.0.0 alpha.31 ## Screenshots @@ -19,10 +19,11 @@ Castopod Server is an open-source hosting platform made for podcasters who want ## Demo -* [Official demo](Link to a demo site for this app.) +* [podcast.podlibre.org](https://podcast.podlibre.org/@podlibre_fr) ## Configuration + * How to configure this app: From an admin panel. ## Documentation @@ -33,8 +34,8 @@ Castopod Server is an open-source hosting platform made for podcasters who want #### Multi-user support -Are LDAP and HTTP auth supported? -Can the app be used by multiple users? + * Are LDAP and HTTP auth supported? + * Can the app be used by multiple users? #### Supported architectures diff --git a/README_fr.md b/README_fr.md index ac98ec5..cc29926 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 +**Version incluse :** 1.0.0 alpha.31 ## Captures d'écran @@ -19,11 +19,11 @@ Castopod Server est une plate-forme d'hébergement open source conçue pour les ## Démo -* [Démo officielle](Lien vers un site de démonstration de cette application.) +* [podcast.podlibre.org](https://podcast.podlibre.org/@podlibre_fr) ## Configuration -Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH ou tout autre moyen. + * Comment configurer cette application : via le panneau d'administration. ## Documentation diff --git a/check_process b/check_process index 16710ab..672f05f 100755 --- a/check_process +++ b/check_process @@ -17,9 +17,9 @@ setup_public=1 upgrade=1 backup_restore=1 - multi_instance=0 + multi_instance=1 port_already_use=0 - change_url=1 + change_url=0 ;;; Options Email= Notification=none diff --git a/pull_request_template.md b/pull_request_template.md index f7a36a9..0ec7457 100755 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -15,4 +15,4 @@ --- *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(ericgaspar)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/castopod_ynh%20PR-NUM-%20(ericgaspar)/) +[![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)/) From b0a9d952e3da612d87cfbc793216b176458dfcfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jan 2021 16:53:42 +0100 Subject: [PATCH 04/13] 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 fef01e2..9a1e778 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,7 +10,7 @@ location / { index index.php; - rewrite ^/.*$ /index.php last; + try_files $uri $uri/ /index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; From 0bcfd849c576985cc9201e5c2078d44ed6ba6e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jan 2021 17:32:55 +0100 Subject: [PATCH 05/13] 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 9a1e778..a760716 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,7 +9,9 @@ location / { } index index.php; - + + client_max_body_size 500M; + try_files $uri $uri/ /index.php; location ~ [^/]\.php(/|$) { From 2ab6129e58b444ae40c2304368a664111a5602d7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 5 Jan 2021 18:25:21 +0100 Subject: [PATCH 06/13] Set upload filesize --- README.md | 7 ++++--- README_fr.md | 7 ++++--- conf/php-fpm.conf | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 56e8085..7ea9a17 100755 --- a/README.md +++ b/README.md @@ -19,15 +19,16 @@ Castopod Server is an open-source hosting platform made for podcasters who want ## Demo -* [podcast.podlibre.org](https://podcast.podlibre.org/@podlibre_fr) + * [podcast.podlibre.org](https://podcast.podlibre.org/@podlibre_fr) ## Configuration - * How to configure this app: From an admin panel. + * Go to `domain.ltd/cp-install` to creat an admin user. + * How to configure this app: From an admin panel `domain.ltd/cp-admin`. ## Documentation - * Official documentation: Link to the official documentation of this app + * Documentation: https://podlibre.org/create-a-podcast-in-3mn-with-castopod/ * YunoHost documentation: If specific documentation is needed, feel free to contribute. ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index cc29926..ea86f58 100755 --- a/README_fr.md +++ b/README_fr.md @@ -19,15 +19,16 @@ Castopod Server est une plate-forme d'hébergement open source conçue pour les ## Démo -* [podcast.podlibre.org](https://podcast.podlibre.org/@podlibre_fr) + * [podcast.podlibre.org](https://podcast.podlibre.org/@podlibre_fr) ## Configuration - * Comment configurer cette application : via le panneau d'administration. + * Allez dans `domain.ltd/cp-install` pour créer un utilisateur administrateur. + * Comment configurer cette application : via le panneau d'administration `domain.ltd/cp-admin`. ## Documentation - * Documentation officielle : Lien vers la documentation officielle de cette application. + * Documentation : https://podlibre.org/create-a-podcast-in-3mn-with-castopod/ * Documentation YunoHost : Si une documentation spécifique est nécessaire, n'hésitez pas à contribuer. ## Caractéristiques spécifiques YunoHost diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index ab1a471..4e1f5d2 100755 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,12 +419,12 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M +php_admin_value[upload_max_filesize] = 500M +php_admin_value[post_max_size] = 50M ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters ; php_admin_value[max_execution_time] = 600 ; php_admin_value[max_input_time] = 300 -; php_admin_value[memory_limit] = 256M +php_admin_value[memory_limit] = 256M ; php_admin_flag[short_open_tag] = On From 220fd28551d9ba565bc13f233abcba36325474ce Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 6 Jan 2021 08:59:54 +0100 Subject: [PATCH 07/13] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index cce6326..e8bd332 100755 --- a/manifest.json +++ b/manifest.json @@ -16,7 +16,7 @@ "requirements": { "yunohost": ">= 3.8.1" }, - "multi_instance": false, + "multi_instance": true, "services": [ "nginx", "php7.3-fpm", From e8ca8ab57ea09ac319f62a2c5247f59a28f31036 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 6 Jan 2021 09:19:02 +0100 Subject: [PATCH 08/13] Update check_process --- check_process | 1 - 1 file changed, 1 deletion(-) diff --git a/check_process b/check_process index 672f05f..a8e6ef9 100755 --- a/check_process +++ b/check_process @@ -27,4 +27,3 @@ Notification=none ; commit=CommitHash name=Name and date of the commit. manifest_arg=domain=DOMAIN&path=PATH&is_public=1& - From d511db842c4f1c3c6043ab9293d7f4eddcd9c379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 6 Jan 2021 15:57:33 +0100 Subject: [PATCH 09/13] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 7ea9a17..22c949b 100755 --- a/README.md +++ b/README.md @@ -51,9 +51,6 @@ Castopod Server is an open-source hosting platform made for podcasters who want * Other info you would like to add about this app. -**More info on the documentation page:** -https://yunohost.org/packaging_apps - ## Links * Report a bug: https://github.com/YunoHost-Apps/castopod_ynh/issues From 1e4815c1da9bc2ea37c8ed4c3209322d0c0d944c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 25 Jan 2021 23:53:24 +0100 Subject: [PATCH 10/13] 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 Date: Thu, 11 Feb 2021 13:25:48 +0100 Subject: [PATCH 11/13] 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 Date: Thu, 11 Feb 2021 13:27:06 +0100 Subject: [PATCH 12/13] 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 Date: Thu, 11 Feb 2021 14:30:43 +0100 Subject: [PATCH 13/13] 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",