From 556f4a1e257d67dd3d9d475164728fe731824fd7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 00:08:16 +0200 Subject: [PATCH 01/20] Upgrade to alpha 42 --- README.md | 2 +- README_fr.md | 2 +- check_process | 4 ++++ conf/app.src | 4 ++-- manifest.json | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 747b15c..50de055 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.41 +**Shipped version:** 1.0.0 alpha.42 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a1b651c..9f750eb 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.41 +**Version incluse :** 1.0.0 alpha.42 ## Captures d'écran diff --git a/check_process b/check_process index 62db8d4..4e5524c 100755 --- a/check_process +++ b/check_process @@ -18,6 +18,8 @@ upgrade=1 #1.0.0 alpha.40 upgrade=1 from_commit=ac00b520875beed49bb138e795562e1f74700ab9 + #1.0.0 alpha.41 + upgrade=1 from_commit=9c603f6b659e4191028cc909311a0cbde9955155 backup_restore=1 multi_instance=1 change_url=1 @@ -27,4 +29,6 @@ Notification=none ;;; Upgrade options ; commit=ac00b520875beed49bb138e795562e1f74700ab9 name=1.0.0 alpha.40 + ; commit=9c603f6b659e4191028cc909311a0cbde9955155 + name=1.0.0 alpha.41 manifest_arg=domain=DOMAIN&path=PATH&is_public=1& diff --git a/conf/app.src b/conf/app.src index a32eee0..5ac6a92 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/f73810f885b378fcbbe1dd9d715e40ac/castopod-1.0.0-alpha.41.zip -SOURCE_SUM=18ef5b60f8cdf151c1bcaf27c8d0e74d8c10751541f51f32b9e004d596709c59 +SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/6f3bc35190c44b30ad14bded534f1a05/castopod-1.0.0-alpha.42.zip +SOURCE_SUM=dd58a861810485f599d5bd51bc8eaf52b6b1b6cb1c6f5b415a8a1083195e286e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 1815907..54d0b1b 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-41~ynh1", + "version": "1.0.0-42~ynh1", "url": "https://podlibre.org/", "license": "GPL-3.0-only", "maintainer": { From e37e7ad94c6237cce667e3786ac6fc403ef63aff Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 10:02:57 +0200 Subject: [PATCH 02/20] Update screenshot --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 50de055..0e8a2fd 100755 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Castopod Server is an open-source hosting platform made for podcasters who want ## Screenshots -![](https://podlibre.org/content/images/2020/12/Parisian-Podcast.png) +![](https://podlibre.org/content/images/2021/04/activity-feed.png) ## Demo diff --git a/README_fr.md b/README_fr.md index 9f750eb..0dbf369 100755 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ Castopod Server est une plate-forme d'hébergement open source conçue pour les ## Captures d'écran -![](https://podlibre.org/content/images/2020/12/Parisian-Podcast.png) +![](https://podlibre.org/content/images/2021/04/activity-feed.png) ## Démo From 21f914ff92a39453623e2180f10c489b9efd2960 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 10:11:48 +0200 Subject: [PATCH 03/20] Add cron --- conf/cron | 1 + scripts/backup | 6 ++++++ scripts/install | 7 +++++++ scripts/remove | 7 +++++++ scripts/restore | 6 ++++++ 5 files changed, 27 insertions(+) create mode 100644 conf/cron diff --git a/conf/cron b/conf/cron new file mode 100644 index 0000000..bc9c1b2 --- /dev/null +++ b/conf/cron @@ -0,0 +1 @@ +* * * * * /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-activities \ No newline at end of file diff --git a/scripts/backup b/scripts/backup index 6f4f9c1..35163de 100755 --- a/scripts/backup +++ b/scripts/backup @@ -45,6 +45,12 @@ ynh_backup --src_path="$final_path" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# BACKUP VARIOUS FILES +#================================================= + +ynh_backup --src_path="/etc/cron.d/$app" + #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/install b/scripts/install index 4f96b62..bfc7fae 100755 --- a/scripts/install +++ b/scripts/install @@ -98,6 +98,13 @@ ynh_script_progression --message="Configuring Castopod..." --weight=1 ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" +#================================================= +# SETUP A CRON +#================================================= +ynh_script_progression --message="Setuping a cron..." + +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/remove b/scripts/remove index 5d4bbf6..f0dd710 100755 --- a/scripts/remove +++ b/scripts/remove @@ -53,6 +53,13 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config +#================================================= +# REMOVE VARIOUS FILES +#================================================= + +# Remove a cron file +ynh_secure_remove --file="/etc/cron.d/$app" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index d21b214..72bfb17 100755 --- a/scripts/restore +++ b/scripts/restore @@ -91,6 +91,12 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql +#================================================= +# RESTORE VARIOUS FILES +#================================================= + +ynh_restore_file --origin_path="/etc/cron.d/$app" + #================================================= # GENERIC FINALIZATION #================================================= From e3361f6601190c1345be36a5662879081c923e89 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 10:17:21 +0200 Subject: [PATCH 04/20] Set permissions --- scripts/install | 13 +++++++++---- scripts/restore | 13 +++++++++---- scripts/upgrade | 13 +++++++++---- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index bfc7fae..9371e50 100755 --- a/scripts/install +++ b/scripts/install @@ -111,10 +111,15 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" # SECURE FILES AND DIRECTORIES #================================================= -# Set permissions to app files -chown -R $app:$app $final_path -#chmod o-rwx $final_path -chmod 600 $final_path/.env +# # Set permissions to app files +# chown -R $app:$app $final_path +# #chmod o-rwx $final_path +# chmod 600 $final_path/.env + +chown -R root:root $final_path +chmod o-rwx $final_path +chown -R www-data:www-data $final_path/writable +chown -R www-data:www-data $final_path/public/media #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 72bfb17..34db7d4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -71,10 +71,15 @@ ynh_restore_file --origin_path="$final_path" # RESTORE USER RIGHTS #================================================= -# Set permissions to app files -chown -R $app:$app $final_path -#chmod o-rwx $final_path -chmod 600 $final_path/.env +# # Set permissions to app files +# chown -R $app:$app $final_path +# #chmod o-rwx $final_path +# chmod 600 $final_path/.env + +chown -R root:root $final_path +chmod o-rwx $final_path +chown -R www-data:www-data $final_path/writable +chown -R www-data:www-data $final_path/public/media #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 9c9e238..77c2d2a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -107,10 +107,15 @@ ynh_add_fpm_config --package="$extra_php_dependencies" # SECURE FILES AND DIRECTORIES #================================================= -# Set permissions to app files -chown -R $app:$app $final_path -#chmod o-rwx $final_path -chmod 600 $final_path/.env +# # Set permissions to app files +# chown -R $app:$app $final_path +# #chmod o-rwx $final_path +# chmod 600 $final_path/.env + +chown -R root:root $final_path +chmod o-rwx $final_path +chown -R www-data:www-data $final_path/writable +chown -R www-data:www-data $final_path/public/media #================================================= # RELOAD NGINX From 299d2019476a345e29b438f7781244ecf032590f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 10:26:28 +0200 Subject: [PATCH 05/20] Update install --- scripts/install | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 9371e50..f4e88f9 100755 --- a/scripts/install +++ b/scripts/install @@ -111,15 +111,15 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" # SECURE FILES AND DIRECTORIES #================================================= -# # Set permissions to app files -# chown -R $app:$app $final_path -# #chmod o-rwx $final_path -# chmod 600 $final_path/.env +# Set permissions to app files +chown -R $app:$app $final_path +#chmod o-rwx $final_path +chmod 600 $final_path/.env -chown -R root:root $final_path -chmod o-rwx $final_path -chown -R www-data:www-data $final_path/writable -chown -R www-data:www-data $final_path/public/media +# chown -R root:root $final_path +# chmod o-rwx $final_path +# chown -R www-data:www-data $final_path/writable +# chown -R www-data:www-data $final_path/public/media #================================================= # SETUP SSOWAT From 266d81380be46e3cb492d5356d6680373910670c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 10:46:17 +0200 Subject: [PATCH 06/20] Fix --- scripts/restore | 16 ++++++++-------- scripts/upgrade | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/restore b/scripts/restore index 34db7d4..f155b92 100755 --- a/scripts/restore +++ b/scripts/restore @@ -71,15 +71,15 @@ ynh_restore_file --origin_path="$final_path" # RESTORE USER RIGHTS #================================================= -# # Set permissions to app files -# chown -R $app:$app $final_path -# #chmod o-rwx $final_path -# chmod 600 $final_path/.env +# Set permissions to app files +chown -R $app:$app $final_path +#chmod o-rwx $final_path +chmod 600 $final_path/.env -chown -R root:root $final_path -chmod o-rwx $final_path -chown -R www-data:www-data $final_path/writable -chown -R www-data:www-data $final_path/public/media +# chown -R root:root $final_path +# chmod o-rwx $final_path +# chown -R www-data:www-data $final_path/writable +# chown -R www-data:www-data $final_path/public/media #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 77c2d2a..8d32e96 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -107,15 +107,15 @@ ynh_add_fpm_config --package="$extra_php_dependencies" # SECURE FILES AND DIRECTORIES #================================================= -# # Set permissions to app files -# chown -R $app:$app $final_path -# #chmod o-rwx $final_path -# chmod 600 $final_path/.env +# Set permissions to app files +chown -R $app:$app $final_path +#chmod o-rwx $final_path +chmod 600 $final_path/.env -chown -R root:root $final_path -chmod o-rwx $final_path -chown -R www-data:www-data $final_path/writable -chown -R www-data:www-data $final_path/public/media +# chown -R root:root $final_path +# chmod o-rwx $final_path +# chown -R www-data:www-data $final_path/writable +# chown -R www-data:www-data $final_path/public/media #================================================= # RELOAD NGINX From c3c0149f7fee5bae1aa1c61d78a5edb7622c3b6b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 12:06:00 +0200 Subject: [PATCH 07/20] Fix --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0e8a2fd..6d0009f 100755 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Castopod Server is an open-source hosting platform made for podcasters who want ## Configuration - * Go to `domain.ltd/cp-install` to creat an admin user. + * Go to `domain.ltd/cp-install` to finish installation and create an admin user. * How to configure this app: From an admin panel `domain.ltd/cp-admin`. ## Documentation diff --git a/README_fr.md b/README_fr.md index 0dbf369..3a61d24 100755 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ Castopod Server est une plate-forme d'hébergement open source conçue pour les ## Configuration - * Allez dans `domain.ltd/cp-install` pour créer un utilisateur administrateur. + * Allez dans `domain.ltd/cp-install` pour finir l'installation et créer un utilisateur administrateur. * Comment configurer cette application : via le panneau d'administration `domain.ltd/cp-admin`. ## Documentation From 4d65f2175dad11993c35263b27612750225138fe Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 13:07:09 +0200 Subject: [PATCH 08/20] Fix --- scripts/install | 6 ------ scripts/restore | 6 ------ scripts/upgrade | 6 ------ 3 files changed, 18 deletions(-) diff --git a/scripts/install b/scripts/install index f4e88f9..c1dd1b8 100755 --- a/scripts/install +++ b/scripts/install @@ -113,14 +113,8 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" # Set permissions to app files chown -R $app:$app $final_path -#chmod o-rwx $final_path chmod 600 $final_path/.env -# chown -R root:root $final_path -# chmod o-rwx $final_path -# chown -R www-data:www-data $final_path/writable -# chown -R www-data:www-data $final_path/public/media - #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/restore b/scripts/restore index f155b92..563c0c2 100755 --- a/scripts/restore +++ b/scripts/restore @@ -73,14 +73,8 @@ ynh_restore_file --origin_path="$final_path" # Set permissions to app files chown -R $app:$app $final_path -#chmod o-rwx $final_path chmod 600 $final_path/.env -# chown -R root:root $final_path -# chmod o-rwx $final_path -# chown -R www-data:www-data $final_path/writable -# chown -R www-data:www-data $final_path/public/media - #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8d32e96..d1073cd 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -109,14 +109,8 @@ ynh_add_fpm_config --package="$extra_php_dependencies" # Set permissions to app files chown -R $app:$app $final_path -#chmod o-rwx $final_path chmod 600 $final_path/.env -# chown -R root:root $final_path -# chmod o-rwx $final_path -# chown -R www-data:www-data $final_path/writable -# chown -R www-data:www-data $final_path/public/media - #================================================= # RELOAD NGINX #================================================= From 1309bc430d4f2a6bfebbfff28fbc760bad96c8c3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 15:31:00 +0200 Subject: [PATCH 09/20] Update install --- scripts/install | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index c1dd1b8..a88d152 100755 --- a/scripts/install +++ b/scripts/install @@ -55,13 +55,13 @@ db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=1 +# #================================================= +# # CREATE DEDICATED USER +# #================================================= +# ynh_script_progression --message="Configuring system user..." --weight=1 -# Create a system user -ynh_system_user_create --username=$app --home_dir=$final_path +# # Create a system user +# ynh_system_user_create --username=$app --home_dir=$final_path #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -111,9 +111,13 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" # SECURE FILES AND DIRECTORIES #================================================= -# Set permissions to app files -chown -R $app:$app $final_path -chmod 600 $final_path/.env +# # Set permissions to app files +# chown -R $app:$app $final_path +# chmod 600 $final_path/.env + +chown -R root:root $final_path +chown -R www-data:www-data $final_path/writable +chown -R www-data:www-data $final_path/public/media #================================================= # SETUP SSOWAT From b9ae7c5fd745976a7815ad38dc3a677153c0d4f9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 15:40:08 +0200 Subject: [PATCH 10/20] Fix --- scripts/install | 21 ++++++++++++--------- scripts/restore | 10 +++++++--- scripts/upgrade | 8 ++++++-- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/scripts/install b/scripts/install index a88d152..9a2ae63 100755 --- a/scripts/install +++ b/scripts/install @@ -55,13 +55,13 @@ db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name -# #================================================= -# # CREATE DEDICATED USER -# #================================================= -# ynh_script_progression --message="Configuring system user..." --weight=1 +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." --weight=1 -# # Create a system user -# ynh_system_user_create --username=$app --home_dir=$final_path +# Create a system user +ynh_system_user_create --username=$app --home_dir=$final_path #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -104,6 +104,8 @@ ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env ynh_script_progression --message="Setuping a cron..." ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION @@ -115,9 +117,10 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" # chown -R $app:$app $final_path # chmod 600 $final_path/.env -chown -R root:root $final_path -chown -R www-data:www-data $final_path/writable -chown -R www-data:www-data $final_path/public/media +chown -R $app: $final_path +chown -R $app:www-data $final_path/writable +chown -R $app:www-data $final_path/public/media +chmod 640 $final_path/.env #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 563c0c2..63dec2e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -71,9 +71,13 @@ ynh_restore_file --origin_path="$final_path" # RESTORE USER RIGHTS #================================================= -# Set permissions to app files -chown -R $app:$app $final_path -chmod 600 $final_path/.env +# # Set permissions to app files +# chown -R $app:$app $final_path +# chmod 600 $final_path/.env + +chown -R root:root $final_path +chown -R www-data:www-data $final_path/writable +chown -R www-data:www-data $final_path/public/media #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index d1073cd..add9025 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -107,9 +107,13 @@ ynh_add_fpm_config --package="$extra_php_dependencies" # SECURE FILES AND DIRECTORIES #================================================= -# Set permissions to app files +# # Set permissions to app files +# chown -R $app:$app $final_path +# chmod 600 $final_path/.env + chown -R $app:$app $final_path -chmod 600 $final_path/.env +chown -R www-data:www-data $final_path/writable +chown -R www-data:www-data $final_path/public/media #================================================= # RELOAD NGINX From cbf65c2441ecd3f8dd2bb1a1036c267db9ff9f8c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 15:54:00 +0200 Subject: [PATCH 11/20] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 4e5524c..b58d080 100755 --- a/check_process +++ b/check_process @@ -6,7 +6,7 @@ ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) - path="/cp-install" (PATH) + path="/" (PATH) is_public=1 (PUBLIC|public=1|private=0) ; Checks pkg_linter=1 From 63be10ac7dd2b7151fbcd3567330bc45133c1861 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 15:58:22 +0200 Subject: [PATCH 12/20] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index b58d080..2e9e448 100755 --- a/check_process +++ b/check_process @@ -5,7 +5,7 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) + domain="domain.tld/cp-install" (DOMAIN) path="/" (PATH) is_public=1 (PUBLIC|public=1|private=0) ; Checks From 9c37dbfe51c68a7c994f569bf1f8156fedb37fdb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 16:04:33 +0200 Subject: [PATCH 13/20] Update check_process --- check_process | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 2e9e448..654d3ea 100755 --- a/check_process +++ b/check_process @@ -5,7 +5,7 @@ ;; Test complet ; Manifest - domain="domain.tld/cp-install" (DOMAIN) + domain="domain.tld" (DOMAIN) path="/" (PATH) is_public=1 (PUBLIC|public=1|private=0) ; Checks @@ -32,3 +32,4 @@ Notification=none ; commit=9c603f6b659e4191028cc909311a0cbde9955155 name=1.0.0 alpha.41 manifest_arg=domain=DOMAIN&path=PATH&is_public=1& + manifest_arg=domain=DOMAIN/cp-install&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& From 4e7f59ee0d56fa7d30bb1425012318d9c21809fe Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 17:16:23 +0200 Subject: [PATCH 14/20] Update check_process --- check_process | 1 - 1 file changed, 1 deletion(-) diff --git a/check_process b/check_process index 654d3ea..b58d080 100755 --- a/check_process +++ b/check_process @@ -32,4 +32,3 @@ Notification=none ; commit=9c603f6b659e4191028cc909311a0cbde9955155 name=1.0.0 alpha.41 manifest_arg=domain=DOMAIN&path=PATH&is_public=1& - manifest_arg=domain=DOMAIN/cp-install&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& From 2fd6a2f5ebbccc75e9820c7d5e0499b1b29290a0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 9 Apr 2021 16:10:15 +0200 Subject: [PATCH 15/20] upgrade to alpha 46 --- 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 6d0009f..219f819 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.42 +**Shipped version:** 1.0.0 alpha.46 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 3a61d24..3ba103d 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.42 +**Version incluse :** 1.0.0 alpha.46 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 5ac6a92..ca2f4ef 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/6f3bc35190c44b30ad14bded534f1a05/castopod-1.0.0-alpha.42.zip -SOURCE_SUM=dd58a861810485f599d5bd51bc8eaf52b6b1b6cb1c6f5b415a8a1083195e286e +SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/57048d507c2bc1647dfc939bbeeb5273/castopod-1.0.0-alpha.46.zip +SOURCE_SUM=ab6552a245b3fb56fa3fde75d5c88c32a9b6a73a2f0e9923b1aacd0193025f30 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 54d0b1b..b81da44 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-42~ynh1", + "version": "1.0.0-46~ynh1", "url": "https://podlibre.org/", "license": "GPL-3.0-only", "maintainer": { From 27155e88eebc0543caae0701718a05308afdc70a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 9 Apr 2021 23:44:11 +0200 Subject: [PATCH 16/20] Fix --- scripts/install | 12 ++++-------- scripts/restore | 11 ++++------- scripts/upgrade | 9 +++------ 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/scripts/install b/scripts/install index 9a2ae63..7fa92b0 100755 --- a/scripts/install +++ b/scripts/install @@ -113,14 +113,10 @@ chmod 644 "/etc/cron.d/$app" # SECURE FILES AND DIRECTORIES #================================================= -# # Set permissions to app files -# chown -R $app:$app $final_path -# chmod 600 $final_path/.env - -chown -R $app: $final_path -chown -R $app:www-data $final_path/writable -chown -R $app:www-data $final_path/public/media -chmod 640 $final_path/.env +# Set permissions to app files +chown -R $app:$app $final_path +#chmod o-rwx $final_path +chmod 600 $final_path/.env #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 63dec2e..72bfb17 100755 --- a/scripts/restore +++ b/scripts/restore @@ -71,13 +71,10 @@ ynh_restore_file --origin_path="$final_path" # RESTORE USER RIGHTS #================================================= -# # Set permissions to app files -# chown -R $app:$app $final_path -# chmod 600 $final_path/.env - -chown -R root:root $final_path -chown -R www-data:www-data $final_path/writable -chown -R www-data:www-data $final_path/public/media +# Set permissions to app files +chown -R $app:$app $final_path +#chmod o-rwx $final_path +chmod 600 $final_path/.env #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index add9025..9c9e238 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -107,13 +107,10 @@ ynh_add_fpm_config --package="$extra_php_dependencies" # SECURE FILES AND DIRECTORIES #================================================= -# # Set permissions to app files -# chown -R $app:$app $final_path -# chmod 600 $final_path/.env - +# Set permissions to app files chown -R $app:$app $final_path -chown -R www-data:www-data $final_path/writable -chown -R www-data:www-data $final_path/public/media +#chmod o-rwx $final_path +chmod 600 $final_path/.env #================================================= # RELOAD NGINX From 24eda14250b6b76f4744fccbed8c771324feb77f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Apr 2021 15:12:04 +0200 Subject: [PATCH 17/20] Fix --- conf/cron | 2 +- scripts/install | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/cron b/conf/cron index bc9c1b2..7c7de7c 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1 @@ -* * * * * /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-activities \ No newline at end of file +* * * * * __USER__ /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-activities \ No newline at end of file diff --git a/scripts/install b/scripts/install index 7fa92b0..c1dd1b8 100755 --- a/scripts/install +++ b/scripts/install @@ -104,8 +104,6 @@ ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env ynh_script_progression --message="Setuping a cron..." ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" -chown root: "/etc/cron.d/$app" -chmod 644 "/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION @@ -115,7 +113,6 @@ chmod 644 "/etc/cron.d/$app" # Set permissions to app files chown -R $app:$app $final_path -#chmod o-rwx $final_path chmod 600 $final_path/.env #================================================= From d20599d03b3dd23e9773223972a5e577310c2d5d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Apr 2021 15:21:09 +0200 Subject: [PATCH 18/20] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index b58d080..4e5524c 100755 --- a/check_process +++ b/check_process @@ -6,7 +6,7 @@ ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) - path="/" (PATH) + path="/cp-install" (PATH) is_public=1 (PUBLIC|public=1|private=0) ; Checks pkg_linter=1 From af31014d641ba13d59f4630236b46747115a4ca9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 15 Apr 2021 08:43:43 +0200 Subject: [PATCH 19/20] Upgrade to alpha 50 --- 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 0af899f..da05a8f 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.46 +**Shipped version:** 1.0.0 alpha.50 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 7f08ef7..2341144 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.46 +**Version incluse :** 1.0.0 alpha.50 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index ca2f4ef..d178108 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/57048d507c2bc1647dfc939bbeeb5273/castopod-1.0.0-alpha.46.zip -SOURCE_SUM=ab6552a245b3fb56fa3fde75d5c88c32a9b6a73a2f0e9923b1aacd0193025f30 +SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/2cf63fcb83dce388629b550f081b6829/castopod-1.0.0-alpha.50.zip +SOURCE_SUM=9a37330515fe3efb6c83818c0a027dd6fca5450099ff4d0d5a51b02dc1d12f51 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b81da44..707a8b9 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-46~ynh1", + "version": "1.0.0-50~ynh1", "url": "https://podlibre.org/", "license": "GPL-3.0-only", "maintainer": { From a263c1b8aee5e513b57a198582eb76f66cada4ea Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 15 Apr 2021 15:34:32 +0200 Subject: [PATCH 20/20] Upgrade to version alpha 51 --- 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 da05a8f..88e49ba 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.50 +**Shipped version:** 1.0.0 alpha.51 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 2341144..cdee4c5 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.50 +**Version incluse :** 1.0.0 alpha.51 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index d178108..50996be 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/2cf63fcb83dce388629b550f081b6829/castopod-1.0.0-alpha.50.zip -SOURCE_SUM=9a37330515fe3efb6c83818c0a027dd6fca5450099ff4d0d5a51b02dc1d12f51 +SOURCE_URL=https://code.podlibre.org/podlibre/castopod/uploads/68426f365b5e116737cd06afccb4458f/castopod-1.0.0-alpha.51.zip +SOURCE_SUM=9cbd68a06d6785740a66f24e12d20c616154460ed8ad96b550c18225b38937ca SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 707a8b9..1d08f05 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-50~ynh1", + "version": "1.0.0-51~ynh1", "url": "https://podlibre.org/", "license": "GPL-3.0-only", "maintainer": {