diff --git a/check_process b/check_process index 15a7c9b..0215caa 100644 --- a/check_process +++ b/check_process @@ -13,24 +13,52 @@ upgrade=1 # 3.2.1~ynh1 # upgrade=1 from_commit=f4b43fd85ad3a169d27c53865a13548e44f17ebf + # 3.2.1~ynh3 + upgrade=1 from_commit=7a621c48f6bdd10334f2d0c06f787fe468788f62 # 3.2.1~ynh4 - # upgrade=1 from_commit=08bf3fce3ad99e27e7f7d251838a9f9c63243e44 + upgrade=1 from_commit=08bf3fce3ad99e27e7f7d251838a9f9c63243e44 + # 3.3.0~ynh1 + upgrade=1 from_commit=c43548f6e0a0e5d172360945f6941255537ec18c # 3.3.0~ynh2 - # upgrade=1 from_commit=f3bb02002c8fa28748744302475139b6fcf7c651 + upgrade=1 from_commit=6010986d58ef0caa8428e3d6e3ff3fd512401a53 + # 3.3.0~ynh2 + upgrade=1 from_commit=f3bb02002c8fa28748744302475139b6fcf7c651 # 3.3.0~ynh3 - # upgrade=1 from_commit=ed59a268e93910f8b35b0f87399f91b8cad9ede0 + upgrade=1 from_commit=ed59a268e93910f8b35b0f87399f91b8cad9ede0 + # 3.3.0~ynh4 + upgrade=1 from_commit=509ba9051facf65329dde20919a3254dcaf3f910 # 3.4.0~ynh1 upgrade=1 from_commit=83a06ca4c96ccd941b49647b3698db2c6b771b79 + # 3.4.1~ynh1 + upgrade=1 from_commit=96f010a9f72fed48660b3f962124b553397b283b + # 3.4.1~ynh2 + upgrade=1 from_commit=0b6823def8230b3af7f9b484c526a49c3a640c4d + # 3.4.1~ynh3 + upgrade=1 from_commit=0f77bb6e7441698b762bde38698c510dc0a4438e + # 4.0.0~ynh1 + upgrade=1 from_commit=602bf56af8582a38c7ee055f60e782e2da0efddc # 4.0.0~ynh1 upgrade=1 from_commit=7c2bb0bb6a91b6b957b734f684aa3d64da892f4c + # 4.0.0~ynh1 + upgrade=1 from_commit=9bdfda10d83519064adeb275f6aed1660bf24b88 + # 4.0.0~ynh2 + upgrade=1 from_commit=16bc11e945c2b1a962a5deace7c0f27b8d5a5112 # 4.0.0~ynh2 upgrade=1 from_commit=6995b27972e27c6cf8ee3e1f23a2de5cc8c8e8ee + # 4.1.0~ynh1 + upgrade=1 from_commit=d5aa8c2194297b332d26e68b5e9e8ada17377742 # 4.1.1~ynh1 upgrade=1 from_commit=24c8333d70312e9dcf8d278e64787ca561a10b2e + # 4.2.0~ynh1 + upgrade=1 from_commit=ddb937ecab9454e8dd0b07627a02bad27c9f6556 + # 4.2.1~ynh1 + upgrade=1 from_commit=5a488aebc53dafa5c431580ca4437eed0ad7da1e + # 4.2.2~ynh1 + upgrade=1 from_commit=9bf92ff65db0dcb188834738f180dbfa34ebef09 backup_restore=1 multi_instance=0 port_already_use=0 change_url=0 ;;; Options -Email=anmol@datamol.org;yalh@yahoo.com -Notification=yes +Email= +Notification=none diff --git a/manifest.json b/manifest.json index 5443413..c2b6a3c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Video streaming platform using P2P directly in the web browser, connected to a federated network", "fr": "Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé" }, - "version": "4.2.2~ynh1", + "version": "4.2.2~ynh2", "url": "https://github.com/Chocobozzz/PeerTube", "upstream": { "license": "AGPL-3.0-only", @@ -16,15 +16,9 @@ "code": "https://github.com/Chocobozzz/PeerTube" }, "license": "AGPL-3.0-only", - "maintainer": [ - { - "name": "Anmol Sharma", - "email": "anmol@datamol.org" - }, - { - "name": "yalh76" - } - ], + "maintainer": { + "name": "yalh76" + }, "requirements": { "yunohost": ">= 4.3.0" }, diff --git a/scripts/_common.sh b/scripts/_common.sh index 55f6125..0c9d5a4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ # dependencies used by the app pkg_dependencies="ffmpeg postgresql postgresql-contrib openssl g++ mailutils apt-transport-https" -ynh_app_dependencies="prosody" +app_dependencies="prosody" nodejs_version=16 diff --git a/scripts/install b/scripts/install index e06a16b..91ffa96 100644 --- a/scripts/install +++ b/scripts/install @@ -30,11 +30,12 @@ domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN -admin_mail=$(ynh_user_get_info --username=$admin --key="mail") -admin_pass=$(ynh_string_random --length=24) app=$YNH_APP_INSTANCE_NAME +admin_mail=$(ynh_user_get_info --username=$admin --key="mail") +admin_pass=$(ynh_string_random --length=24) + # Define app's data directory datadir="/home/yunohost.app/${app}/storage" @@ -82,10 +83,10 @@ ynh_exec_warn_less yunohost firewall allow TCP $rtmp_port #================================================= ynh_script_progression --message="Installing dependencies..." -ynh_install_apps --apps="$ynh_app_dependencies" -ynh_install_app_dependencies $pkg_dependencies -ynh_install_nodejs --nodejs_version=$nodejs_version -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +ynh_exec_warn_less ynh_install_apps --apps="$app_dependencies" +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= # CREATE DEDICATED USER @@ -196,7 +197,7 @@ ynh_script_progression --message="Starting a systemd service..." mkdir -p "/var/log/$app" chown -R $app:$app "/var/log/$app" # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on localhost" +ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="HTTP server listening on localhost" --timeout=300 --length=200 #================================================= # INSTALL LDAP PLUGIN @@ -231,7 +232,7 @@ popd ynh_script_progression --message="Stopping a systemd service..." # Stop a systemd service -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION @@ -256,7 +257,7 @@ yunohost service add $app --description="$app daemon for Peertube" --log="/var/l ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on localhost" +ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="HTTP server listening on localhost" #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index aba1e6d..55d6cd9 100644 --- a/scripts/remove +++ b/scripts/remove @@ -26,11 +26,12 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$(ynh_app_setting_get --app=$app --key=db_user) final_path=$(ynh_app_setting_get --app=$app --key=final_path) admin=$(ynh_app_setting_get --app=$app --key=admin) -admin_mail=$(ynh_user_get_info --username=$admin --key="mail") datadir=$(ynh_app_setting_get --app=$app --key=datadir) path_url=$(ynh_app_setting_get --app=$app --key=path) redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) +admin_mail=$(ynh_user_get_info --username=$admin --key="mail") + #================================================= # STANDARD REMOVE #================================================= diff --git a/scripts/restore b/scripts/restore index 428a7f1..1cbd162 100644 --- a/scripts/restore +++ b/scripts/restore @@ -86,10 +86,10 @@ chown -R $app:www-data "$datadir" #================================================= ynh_script_progression --message="Reinstalling dependencies..." -ynh_install_apps --apps="$ynh_app_dependencies" -ynh_install_app_dependencies $pkg_dependencies -ynh_install_nodejs --nodejs_version=$nodejs_version -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +ynh_exec_warn_less ynh_install_apps --apps="$app_dependencies" +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= # RESTORE THE NGINX CONFIGURATION @@ -145,7 +145,7 @@ yunohost service add $app --description="$app daemon for Peertube" --log="/var/l #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on localhost" +ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="HTTP server listening on localhost" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 07bd954..839f836 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -60,7 +60,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -204,10 +204,10 @@ chown -R $app:www-data "$final_path" #================================================= ynh_script_progression --message="Upgrading dependencies..." -ynh_install_apps --apps="$ynh_app_dependencies" -ynh_install_app_dependencies $pkg_dependencies -ynh_install_nodejs --nodejs_version=$nodejs_version -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +ynh_exec_warn_less ynh_install_apps --apps="$app_dependencies" +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= # NGINX CONFIGURATION @@ -230,19 +230,6 @@ chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" -#================================================= -# UPDATE A CONFIG FILE -#================================================= -ynh_script_progression --message="Updating a config file..." - -ynh_add_config --template="../conf/production.yaml" --destination="$final_path/config/production.yaml" - -chmod 400 "$final_path/config/production.yaml" -chown $app:$app "$final_path/config/production.yaml" - -chmod 600 "$final_path/config/local-production.json" -chown $app:$app "$final_path/config/local-production.json" - #================================================= # BUILD YARN DEPENDENCIES #================================================= @@ -254,6 +241,21 @@ pushd "$final_path" ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean popd +#================================================= +# UPDATE A CONFIG FILE +#================================================= +ynh_script_progression --message="Updating a config file..." + +ynh_add_config --template="../conf/production.yaml" --destination="$final_path/config/production.yaml" + +chmod 400 "$final_path/config/production.yaml" +chown $app:$app "$final_path/config/production.yaml" + +ynh_backup_if_checksum_is_different --file="$final_path/config/local-production.json" + +chmod 600 "$final_path/config/local-production.json" +chown $app:$app "$final_path/config/local-production.json" + #================================================= # SETUP SYSTEMD #================================================= @@ -267,8 +269,10 @@ ynh_add_systemd_config #================================================= ynh_script_progression --message="Starting a systemd service..." +mkdir -p "/var/log/$app" +chown -R $app:$app "/var/log/$app" # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on localhost" +ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="HTTP server listening on localhost" --timeout=300 --length=200 #================================================= # INSTALL LDAP PLUGIN @@ -312,7 +316,7 @@ fi ynh_script_progression --message="Stopping a systemd service..." # Stop a systemd service -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION @@ -336,7 +340,7 @@ yunohost service add $app --description="$app daemon for Peertube" --log="/var/l #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on localhost" +ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="HTTP server listening on localhost" #================================================= # RELOAD NGINX