From e7a38290692a9a3ac9b24919a230e59fafec4887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 25 Oct 2023 19:48:26 +0200 Subject: [PATCH] cleaning --- check_process | 27 --------------------------- conf/.env.example | 12 ++++++++++++ conf/app.src | 6 ------ conf/cron | 5 +---- manifest.toml | 18 +++++++++++------- scripts/install | 9 +++++++++ scripts/remove | 7 ------- scripts/upgrade | 2 +- 8 files changed, 34 insertions(+), 52 deletions(-) delete mode 100755 check_process delete mode 100755 conf/app.src diff --git a/check_process b/check_process deleted file mode 100755 index cd87891..0000000 --- a/check_process +++ /dev/null @@ -1,27 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - admin="john" - password="strongpassword" - ; Checks - pkg_linter=1 - setup_sub_dir=0 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - #1.0.0 alpha.80 - #upgrade=1 from_commit=074aac0f8caa4597bdc34c0e9355cf898546f0df - backup_restore=1 - multi_instance=1 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=074aac0f8caa4597bdc34c0e9355cf898546f0df - name=1.0.0 alpha.80 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass& diff --git a/conf/.env.example b/conf/.env.example index e7f4191..e83b397 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -54,7 +54,19 @@ cache.redis.password=null cache.redis.port=6379 cache.redis.database=__REDIS_DB__ +#-------------------------------------------------------------------- +# S3 configuration +#-------------------------------------------------------------------- +# media.fileManager="s3" +# media.s3.endpoint="your_s3_host" +# media.s3.key="your_s3_key" +# media.s3.secret="your_s3_secret" +# media.s3.region="your_s3_region" + #-------------------------------------------------------------------- # REST API configuration #-------------------------------------------------------------------- # restapi.enabled=true +# restapi.basicAuthUsername=castopod +# restapi.basicAuthPassword=password +# restapi.basicAuth=true \ No newline at end of file diff --git a/conf/app.src b/conf/app.src deleted file mode 100755 index b55216a..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://code.castopod.org/adaures/castopod/uploads/ab09b21e1e0f3ef02518fc0794d6a3be/castopod-1.1.2.zip -SOURCE_SUM=1412a4d272826355c039ac045055ce33a0c00d238ac860c7761d8f2555b4241a -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=true -SOURCE_EXTRACT=true diff --git a/conf/cron b/conf/cron index cd2baf3..8996e3c 100644 --- a/conf/cron +++ b/conf/cron @@ -1,4 +1 @@ -* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/public/index.php scheduled-activities -* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/public/index.php scheduled-video-clips -* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/public/index.php scheduled-websub-publish - +* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/spark tasks:run >> /dev/null 2>&1 diff --git a/manifest.toml b/manifest.toml index d1923af..e881682 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Castopod" description.en = "Hosting platform made for podcasters" description.fr = "Plateforme d'hébergement conçue pour les podcasteurs" -version = "1.1.2~ynh2" +version = "1.6.5~ynh1" maintainers = ["eric_G"] @@ -23,24 +23,28 @@ multi_instance = true ldap = false sso = false disk = "50M" -ram.build = "100M" +ram.build = "150M" ram.runtime = "50M" [install] [install.domain] - help.en = "Castopod needs to be installed in a dedicated domain or sub-domain." - help.fr = "Castopod doit être installé dans un domaine ou sous-domaine dédié." type = "domain" - full_domain = true [install.init_main_permission] - help.en = "If enabled, Castopod will be accessible by people who do not have an account. This can be changed later via the webadmin." - help.fr = "Si cette case est cochée, Castopod sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." type = "group" default = "visitors" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://code.castopod.org/adaures/castopod/uploads/fe7be588c53a9e1ed63af47e6e624ad1/castopod-1.6.5.zip" + sha256 = "3618afa82605dda4f791efe5bb312d1fab3c4b0d702086f9cb75e57d627b6306" + in_subdir = true + [resources.system_user] + allow_email = true [resources.install_dir] diff --git a/scripts/install b/scripts/install index 844bcc4..5441e89 100755 --- a/scripts/install +++ b/scripts/install @@ -69,6 +69,15 @@ ynh_add_config --template=".env.example" --destination="$install_dir/.env" chmod 600 $install_dir/.env chown $app:www-data "$install_dir/.env" +#================================================= +# RUN MIGRATIONS +#================================================= +ynh_script_progression --message="Configuring $app database..." --weight=1 + +pushd $install_dir + ynh_exec_warn_less ynh_exec_as $app php${phpversion} spark migrate --all +popd + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index e101710..dbb90bb 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,13 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -# ynh_script_progression --message="Loading installation settings..." --weight=1 - -# redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) - #================================================= # REMOVE THE REDIS DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9e21933..e58c2ce 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,7 +61,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Updating a configuration file..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config