From 2599e6e346d4694d7bb53eb43aa0e35b8a3eecb3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 7 Aug 2021 18:49:27 +0200 Subject: [PATCH 01/34] Create DISCLAIMER_fr.md --- doc/DISCLAIMER_fr.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 doc/DISCLAIMER_fr.md diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100755 index 0000000..a150cf3 --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,15 @@ +## Configuration + +You can configure Owncast by editing the configuration file `/var/www/owncast/config.yaml` using the [documentation](https://owncast.online/docs/), or with the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. + +## Streaming app + +OBS can be used as streaming video app: https://obsproject.com/ + +1. Install OBS or Streamlabs OBS and get it working with your local setup. +1. Open OBS Settings and go to “Stream”. +1. Select “Custom…” as the service. +1. Enter the URL of the server running your streaming service in the format of `rtmp://myserver.net/live`. +1. Enter your “Stream Key” that matches your key file. +1. Start the server. +1. Press “Start Streaming” (OBS) or “Go Live” (Streamlabs) on OBS. \ No newline at end of file From 68638f00ee418d5117cea7bdd89dea0ebbd84edb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 7 Aug 2021 18:54:01 +0200 Subject: [PATCH 02/34] Fix --- doc/DISCLAIMER.md | 2 +- doc/DISCLAIMER_fr.md | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index a150cf3..009e759 100755 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,6 +1,6 @@ ## Configuration -You can configure Owncast by editing the configuration file `/var/www/owncast/config.yaml` using the [documentation](https://owncast.online/docs/), or with the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Change the default streaming key with your own `streamingKey: abc123` by editing the configuration file `/var/www/owncast/config.yaml` using the [documentation](https://owncast.online/docs/), or with the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. ## Streaming app diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index a150cf3..83086ea 100755 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,15 +1,15 @@ ## Configuration -You can configure Owncast by editing the configuration file `/var/www/owncast/config.yaml` using the [documentation](https://owncast.online/docs/), or with the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Modifiez la clé de streaming par défaut `streamingKey: abc123` en éditant le fichier de configuration `/var/www/owncast/config.yaml` en utilisant la [documentation](https://owncast.online/docs/), ou avec la page d'administration : `domain.ltd/admin` avec `admin` et `abc123` comme identifiant. -## Streaming app +## Application de diffusion en continu -OBS can be used as streaming video app: https://obsproject.com/ +OBS peut être utilisé comme application de streaming vidéo : https://obsproject.com/ -1. Install OBS or Streamlabs OBS and get it working with your local setup. -1. Open OBS Settings and go to “Stream”. -1. Select “Custom…” as the service. -1. Enter the URL of the server running your streaming service in the format of `rtmp://myserver.net/live`. -1. Enter your “Stream Key” that matches your key file. -1. Start the server. -1. Press “Start Streaming” (OBS) or “Go Live” (Streamlabs) on OBS. \ No newline at end of file +1. Installez OBS ou Streamlabs OBS et faites-le fonctionner avec votre configuration locale. +1. Ouvrez les paramètres OBS et allez dans "Stream". +1. Sélectionnez « Personnalisé… » comme service. +1. Entrez l'URL du serveur exécutant votre service de streaming au format `rtmp://myserver.net/live`. +1. Saisissez votre « Clé de diffusion » qui correspond à votre clé de streaming. +1. Démarrez le serveur. +1. Appuyez sur « Démarrer le streaming » (OBS) ou « Go Live » (Streamlabs) sur OBS. \ No newline at end of file From 0058e5bae174eeba41671a8020079f43bd7ae96c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 7 Aug 2021 16:54:09 +0000 Subject: [PATCH 03/34] Auto-update README --- README.md | 2 +- README_fr.md | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 4e71d52..f8210ff 100755 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Self-hosted live video and web chat server for use with existing broadcasting so ## Configuration -You can configure Owncast by editing the configuration file `/var/www/owncast/config.yaml` using the [documentation](https://owncast.online/docs/), or with the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Change the default streaming key with your own `streamingKey: abc123` by editing the configuration file `/var/www/owncast/config.yaml` using the [documentation](https://owncast.online/docs/), or with the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. ## Streaming app diff --git a/README_fr.md b/README_fr.md index fe691c9..57c5eed 100755 --- a/README_fr.md +++ b/README_fr.md @@ -25,19 +25,19 @@ Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un lo ## Configuration -You can configure Owncast by editing the configuration file `/var/www/owncast/config.yaml` using the [documentation](https://owncast.online/docs/), or with the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Modifiez la clé de streaming par défaut `streamingKey: abc123` en éditant le fichier de configuration `/var/www/owncast/config.yaml` en utilisant la [documentation](https://owncast.online/docs/), ou avec la page d'administration : `domain.ltd/admin` avec `admin` et `abc123` comme identifiant. -## Streaming app +## Application de diffusion en continu -OBS can be used as streaming video app: https://obsproject.com/ +OBS peut être utilisé comme application de streaming vidéo : https://obsproject.com/ -1. Install OBS or Streamlabs OBS and get it working with your local setup. -1. Open OBS Settings and go to “Stream”. -1. Select “Custom…” as the service. -1. Enter the URL of the server running your streaming service in the format of `rtmp://myserver.net/live`. -1. Enter your “Stream Key” that matches your key file. -1. Start the server. -1. Press “Start Streaming” (OBS) or “Go Live” (Streamlabs) on OBS. +1. Installez OBS ou Streamlabs OBS et faites-le fonctionner avec votre configuration locale. +1. Ouvrez les paramètres OBS et allez dans "Stream". +1. Sélectionnez « Personnalisé… » comme service. +1. Entrez l'URL du serveur exécutant votre service de streaming au format `rtmp://myserver.net/live`. +1. Saisissez votre « Clé de diffusion » qui correspond à votre clé de streaming. +1. Démarrez le serveur. +1. Appuyez sur « Démarrer le streaming » (OBS) ou « Go Live » (Streamlabs) sur OBS. ## Documentations et ressources * Site officiel de l'app : https://owncast.online/ From 2cc7f3582381a00b727629a191abf437ba93f3b5 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sun, 8 Aug 2021 22:44:05 +0200 Subject: [PATCH 04/34] Set the password during install --- check_process | 3 ++- manifest.json | 9 +++++++++ scripts/install | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 4043ed0..7a7f0f2 100755 --- a/check_process +++ b/check_process @@ -4,6 +4,7 @@ path="/path" admin="john" is_public=1 + password="1Strong-Password" ; Checks pkg_linter=1 setup_sub_dir=0 @@ -22,4 +23,4 @@ Notification=none ;;; Upgrade options ; commit=CommitHash name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=1Strong-Password diff --git a/manifest.json b/manifest.json index d9254fc..e85140e 100755 --- a/manifest.json +++ b/manifest.json @@ -52,6 +52,15 @@ "fr": "Si cette case est cochée, Owncast sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." }, "default": true + }, + { + "name": "password", + "type": "password", + "help": { + "en": "Admin password and the steamkey.", + "fr": "Mot de passe admin et streamkey." + }, + "example": "Choose a password" } ] } diff --git a/scripts/install b/scripts/install index 663c398..e7feee0 100755 --- a/scripts/install +++ b/scripts/install @@ -125,6 +125,14 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config +#================================================= +# SETUP APPLICATION PASSWORD +#================================================= + +pushd $final_path + ynh_exec_as $app $final_path/owncast -streamkey $password +popd + #================================================= # GENERIC FINALIZATION #================================================= From edc9f70db9be39209d83a83678cde87424ce8394 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Mon, 9 Aug 2021 02:06:48 +0200 Subject: [PATCH 05/34] fix --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index e7feee0..eb6f200 100755 --- a/scripts/install +++ b/scripts/install @@ -28,6 +28,7 @@ domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN +password=$YNH_APP_ARG_PASSWORD architecture=$(ynh_detect_arch) app=$YNH_APP_INSTANCE_NAME From a33ae230a76860eaa5020eecc4970871c7aa7d12 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 14:47:34 +0200 Subject: [PATCH 06/34] Remove out of date config file --- conf/config-default.yaml | 37 ------------------------------------- manifest.json | 2 +- scripts/install | 10 ---------- scripts/upgrade | 2 +- 4 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 conf/config-default.yaml diff --git a/conf/config-default.yaml b/conf/config-default.yaml deleted file mode 100644 index 854905e..0000000 --- a/conf/config-default.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# See https://owncast.online/docs/configuration/ for more details - -instanceDetails: - name: Owncast - title: Owncast - summary: "This is brief summary of whom you are or what your stream is. You can edit this description in your config file." - - logo: /img/logo.svg - - tags: - - music - - software - - streaming - - # https://owncast.online/docs/configuration/#external-links - # for full list of supported social links. All optional. - socialHandles: - - platform: github - url: http://github.com/owncast/owncast - -videoSettings: - # Change this value and keep it secure. Treat it like a password to your live stream. - streamingKey: abc123 - - streamQualities: - - medium: - videoBitrate: 1200 - encoderPreset: veryfast - -# Set to true if you don't want the service checking for future releases. -disableUpgradeChecks: false - -# Off by default. You can optionally list yourself in the Owncast directory. -# Make sure your instanceURL is the public URL to your Owncast instance. -yp: - enabled: false - instanceURL: https://__DOMAIN__ diff --git a/manifest.json b/manifest.json index d9254fc..84033d7 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted live video and web chat server for use with existing broadcasting software", "fr": "Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un logiciel de diffusion" }, - "version": "0.0.7~ynh1", + "version": "0.0.7~ynh2", "url": "https://owncast.online/", "upstream": { "license": "MIT", diff --git a/scripts/install b/scripts/install index 663c398..a6ba2f8 100755 --- a/scripts/install +++ b/scripts/install @@ -99,16 +99,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# ADD A CONFIGURATION -#================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 - -ynh_add_config --template="../conf/config-default.yaml" --destination="$final_path/config.yaml" - -chmod 400 "$final_path/config.yaml" -chown $app:$app "$final_path/config.yaml" - #================================================= # NGINX CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b7141d0..19133f9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -69,7 +69,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" --keep="$final_path/config.yaml" + ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" fi chmod 750 "$final_path" From 87c2d4498afedecc30c4d21a5fd7b2e5f1d845a3 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 10 Aug 2021 12:47:40 +0000 Subject: [PATCH 07/34] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f8210ff..9fe292c 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Self-hosted live video and web chat server for use with existing broadcasting software -**Shipped version:** 0.0.7~ynh1 +**Shipped version:** 0.0.7~ynh2 **Demo:** https://watch.owncast.online/ diff --git a/README_fr.md b/README_fr.md index 57c5eed..c46fd91 100755 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un logiciel de diffusion -**Version incluse :** 0.0.7~ynh1 +**Version incluse :** 0.0.7~ynh2 **Démo :** https://watch.owncast.online/ From 7a1817c18ba80ced4f60a14ee4587fc6814cb822 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 14:49:35 +0200 Subject: [PATCH 08/34] Fix --- doc/DISCLAIMER.md | 2 +- doc/DISCLAIMER_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 009e759..0cf802d 100755 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,6 +1,6 @@ ## Configuration -Change the default streaming key with your own `streamingKey: abc123` by editing the configuration file `/var/www/owncast/config.yaml` using the [documentation](https://owncast.online/docs/), or with the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Change the default streaming key with your own `abc123` by editing the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. ## Streaming app diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 83086ea..3ef20ee 100755 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,6 +1,6 @@ ## Configuration -Modifiez la clé de streaming par défaut `streamingKey: abc123` en éditant le fichier de configuration `/var/www/owncast/config.yaml` en utilisant la [documentation](https://owncast.online/docs/), ou avec la page d'administration : `domain.ltd/admin` avec `admin` et `abc123` comme identifiant. +Modifiez la clé de streaming par défaut `abc123` en éditant la page d'administration : `domain.ltd/admin` avec `admin` et `abc123` comme identifiant. ## Application de diffusion en continu From 5d713dcfd0f755c730d146e3e59e610a9ac3a222 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 10 Aug 2021 12:49:50 +0000 Subject: [PATCH 09/34] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9fe292c..fa4feaf 100755 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Self-hosted live video and web chat server for use with existing broadcasting so ## Configuration -Change the default streaming key with your own `streamingKey: abc123` by editing the configuration file `/var/www/owncast/config.yaml` using the [documentation](https://owncast.online/docs/), or with the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Change the default streaming key with your own `abc123` by editing the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. ## Streaming app diff --git a/README_fr.md b/README_fr.md index c46fd91..e9defa0 100755 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un lo ## Configuration -Modifiez la clé de streaming par défaut `streamingKey: abc123` en éditant le fichier de configuration `/var/www/owncast/config.yaml` en utilisant la [documentation](https://owncast.online/docs/), ou avec la page d'administration : `domain.ltd/admin` avec `admin` et `abc123` comme identifiant. +Modifiez la clé de streaming par défaut `abc123` en éditant la page d'administration : `domain.ltd/admin` avec `admin` et `abc123` comme identifiant. ## Application de diffusion en continu From a6998da5f8eea98a5dc5c74ae0901cf737924124 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 18:43:06 +0200 Subject: [PATCH 10/34] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index c2726e6..5664722 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ -ExecStart=__FINALPATH__/owncast --enableVerboseLogging -webserverport __PORT__ -configFile __FINALPATH__/config.yaml +ExecStart=__FINALPATH__/owncast --enableVerboseLogging -webserverport __PORT__ Restart=on-failure RestartSec=5 From 942dcd97176b9bf55738d98e4999f5d604ba6d77 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 18:46:03 +0200 Subject: [PATCH 11/34] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 5664722..f1ca772 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ -ExecStart=__FINALPATH__/owncast --enableVerboseLogging -webserverport __PORT__ +ExecStart=__FINALPATH__/owncast --enableVerboseLogging -webserverport __PORT__ -streamkey __PASSWORD__ Restart=on-failure RestartSec=5 From 41ca03bf3d956f6f03eed1b25ab5e03b24dc351f Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 10 Aug 2021 16:46:27 +0000 Subject: [PATCH 12/34] Auto-update README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fa4feaf..b0e2adb 100755 --- a/README.md +++ b/README.md @@ -29,7 +29,8 @@ Self-hosted live video and web chat server for use with existing broadcasting so ## Configuration -Change the default streaming key with your own `abc123` by editing the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. + +Change the default streaming key with your own in the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. ## Streaming app From 16ed50e8f2eda4b73c0996d5ddee6562a07ec0ef Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:20:47 +0200 Subject: [PATCH 13/34] Update install --- scripts/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 0436ae0..e33e3af 100755 --- a/scripts/install +++ b/scripts/install @@ -120,9 +120,7 @@ ynh_add_systemd_config # SETUP APPLICATION PASSWORD #================================================= -pushd $final_path - ynh_exec_as $app $final_path/owncast -streamkey $password -popd +ynh_exec_as $app $final_path/owncast -streamkey $password #================================================= # GENERIC FINALIZATION From 5437a8cbd7e3d04a93ab2faafe7bdefd775ff99f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:21:07 +0200 Subject: [PATCH 14/34] Update install --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index e33e3af..7e0cdcc 100755 --- a/scripts/install +++ b/scripts/install @@ -146,7 +146,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" - sleep 30 #================================================= From 14addd23ec76cdff0066d2806c0a219e677a462f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:23:13 +0200 Subject: [PATCH 15/34] Update install --- scripts/install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 7e0cdcc..0436ae0 100755 --- a/scripts/install +++ b/scripts/install @@ -120,7 +120,9 @@ ynh_add_systemd_config # SETUP APPLICATION PASSWORD #================================================= -ynh_exec_as $app $final_path/owncast -streamkey $password +pushd $final_path + ynh_exec_as $app $final_path/owncast -streamkey $password +popd #================================================= # GENERIC FINALIZATION @@ -146,6 +148,7 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" + sleep 30 #================================================= From 6ed2d84ab5239ddcfa71d4473cc6dfb1c5b97716 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:26:25 +0200 Subject: [PATCH 16/34] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index f1ca772..5664722 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ -ExecStart=__FINALPATH__/owncast --enableVerboseLogging -webserverport __PORT__ -streamkey __PASSWORD__ +ExecStart=__FINALPATH__/owncast --enableVerboseLogging -webserverport __PORT__ Restart=on-failure RestartSec=5 From 0645f713609ce9ba500bfece167e651eeaed7507 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:27:08 +0200 Subject: [PATCH 17/34] Fix --- manifest.json | 5 ----- scripts/install | 3 --- 2 files changed, 8 deletions(-) diff --git a/manifest.json b/manifest.json index a75d67c..4984a09 100755 --- a/manifest.json +++ b/manifest.json @@ -39,11 +39,6 @@ }, "example": "owncast.example.com" }, - { - "name": "admin", - "type": "user", - "example": "johndoe" - }, { "name": "is_public", "type": "boolean", diff --git a/scripts/install b/scripts/install index 0436ae0..db738d1 100755 --- a/scripts/install +++ b/scripts/install @@ -27,7 +27,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -admin=$YNH_APP_ARG_ADMIN password=$YNH_APP_ARG_PASSWORD architecture=$(ynh_detect_arch) @@ -51,7 +50,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=admin --value=$admin #================================================= # STANDARD MODIFICATIONS @@ -148,7 +146,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" - sleep 30 #================================================= From b6a4e8d10f7a54b284d53b6daed837b983ea8e20 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:27:34 +0200 Subject: [PATCH 18/34] Update check_process --- check_process | 1 - 1 file changed, 1 deletion(-) diff --git a/check_process b/check_process index 7a7f0f2..84f7878 100755 --- a/check_process +++ b/check_process @@ -2,7 +2,6 @@ ; Manifest domain="domain.tld" path="/path" - admin="john" is_public=1 password="1Strong-Password" ; Checks From 5d7b0bee27dd3ff36acceab3c4d8f610cafcd28f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:28:17 +0200 Subject: [PATCH 19/34] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 4984a09..74b9759 100755 --- a/manifest.json +++ b/manifest.json @@ -52,8 +52,8 @@ "name": "password", "type": "password", "help": { - "en": "Admin password and the steamkey.", - "fr": "Mot de passe admin et streamkey." + "en": "This is the password for connecting to the admin page as well as the Stream Key.", + "fr": "Ceci est le mot de passe pour se connecter à la page d'administration ainsi que la Stream Key." }, "example": "Choose a password" } From 93c8c57be14d7b99b293103c398b902e78b51d3e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:28:57 +0200 Subject: [PATCH 20/34] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index db738d1..4a967a4 100755 --- a/scripts/install +++ b/scripts/install @@ -117,6 +117,7 @@ ynh_add_systemd_config #================================================= # SETUP APPLICATION PASSWORD #================================================= +ynh_script_progression --message="Configuring a Stream Key..." --weight=1 pushd $final_path ynh_exec_as $app $final_path/owncast -streamkey $password From 52ca7c9a0e2b44749220eb963c30478634cc3a58 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:29:33 +0200 Subject: [PATCH 21/34] Fix --- scripts/install | 2 +- scripts/restore | 3 +-- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 4a967a4..2d5f820 100755 --- a/scripts/install +++ b/scripts/install @@ -147,7 +147,7 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -sleep 30 +sleep 20 #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index b3ac6d3..a2894a7 100755 --- a/scripts/restore +++ b/scripts/restore @@ -103,8 +103,7 @@ yunohost service add $app --description="Self-hosted live video and web chat ser ynh_script_progression --message="Starting a systemd service..." --weight=3 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" - -sleep 30 +sleep 20 #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 19133f9..c227ff8 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,7 +112,7 @@ yunohost service add $app --description="Self-hosted live video and web chat ser ynh_script_progression --message="Starting a systemd service..." --weight=3 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -sleep 30 +sleep 20 #================================================= # RELOAD NGINX From e0d72176fd5258eb1599317d6960115e2ea2953a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:33:18 +0200 Subject: [PATCH 22/34] Update DISCLAIMER.md --- doc/DISCLAIMER.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 235c097..d145823 100755 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,16 +1,14 @@ ## Configuration - -Change the default streaming key with your own in the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Settings are accessible in admin page: `domain.ltd/admin` with `admin` and `your_stream_key` as credential. ## Streaming app OBS can be used as streaming video app: https://obsproject.com/ 1. Install OBS or Streamlabs OBS and get it working with your local setup. -1. Open OBS Settings and go to “Stream”. -1. Select “Custom…” as the service. +1. Open OBS Settings and go to **Stream**. +1. Select **Custom…** as the service. 1. Enter the URL of the server running your streaming service in the format of `rtmp://myserver.net/live`. -1. Enter your “Stream Key” that matches your key file. -1. Start the server. -1. Press “Start Streaming” (OBS) or “Go Live” (Streamlabs) on OBS. \ No newline at end of file +1. Enter your **Stream Key** that matches your key file. +1. Press **Start Streaming** (OBS) or **Go Live** (Streamlabs) on OBS. \ No newline at end of file From 9e613efec7cb4a04d94ec48f8e205fb0692c4540 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 10 Aug 2021 17:33:29 +0000 Subject: [PATCH 23/34] Auto-update README --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b0e2adb..458d155 100755 --- a/README.md +++ b/README.md @@ -29,20 +29,18 @@ Self-hosted live video and web chat server for use with existing broadcasting so ## Configuration - -Change the default streaming key with your own in the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. +Settings are accessible in admin page: `domain.ltd/admin` with `admin` and `your_stream_key` as credential. ## Streaming app OBS can be used as streaming video app: https://obsproject.com/ 1. Install OBS or Streamlabs OBS and get it working with your local setup. -1. Open OBS Settings and go to “Stream”. -1. Select “Custom…” as the service. +1. Open OBS Settings and go to **Stream**. +1. Select **Custom…** as the service. 1. Enter the URL of the server running your streaming service in the format of `rtmp://myserver.net/live`. -1. Enter your “Stream Key” that matches your key file. -1. Start the server. -1. Press “Start Streaming” (OBS) or “Go Live” (Streamlabs) on OBS. +1. Enter your **Stream Key** that matches your key file. +1. Press **Start Streaming** (OBS) or **Go Live** (Streamlabs) on OBS. ## Documentation and resources * Official app website: https://owncast.online/ From 036641400f0278782edcc076243e81b74c68a6e3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:34:07 +0200 Subject: [PATCH 24/34] Fix --- doc/DISCLAIMER.md | 2 +- doc/DISCLAIMER_fr.md | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index d145823..7fd8f65 100755 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -11,4 +11,4 @@ OBS can be used as streaming video app: https://obsproject.com/ 1. Select **Custom…** as the service. 1. Enter the URL of the server running your streaming service in the format of `rtmp://myserver.net/live`. 1. Enter your **Stream Key** that matches your key file. -1. Press **Start Streaming** (OBS) or **Go Live** (Streamlabs) on OBS. \ No newline at end of file +1. Press **Start Streaming** (OBS) or **Go Live** (Streamlabs) on OBS. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 3ef20ee..9caa78e 100755 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,15 +1,14 @@ ## Configuration -Modifiez la clé de streaming par défaut `abc123` en éditant la page d'administration : `domain.ltd/admin` avec `admin` et `abc123` comme identifiant. +Les paramètres sont accessibles dans la page d'administration : : `domain.ltd/admin` avec `admin` et `votre_stream_key` comme identifiant. ## Application de diffusion en continu OBS peut être utilisé comme application de streaming vidéo : https://obsproject.com/ -1. Installez OBS ou Streamlabs OBS et faites-le fonctionner avec votre configuration locale. -1. Ouvrez les paramètres OBS et allez dans "Stream". -1. Sélectionnez « Personnalisé… » comme service. +1. Installez **OBS** ou **Streamlabs OBS** et faites-le fonctionner avec votre configuration locale. +1. Ouvrez les **paramètres** OBS et allez dans **Stream**. +1. Sélectionnez **Personnalisé…** comme service. 1. Entrez l'URL du serveur exécutant votre service de streaming au format `rtmp://myserver.net/live`. -1. Saisissez votre « Clé de diffusion » qui correspond à votre clé de streaming. -1. Démarrez le serveur. -1. Appuyez sur « Démarrer le streaming » (OBS) ou « Go Live » (Streamlabs) sur OBS. \ No newline at end of file +1. Saisissez votre « Stream key » qui correspond à votre clé de streaming choisie lors de l'installation. +1. Appuyez sur **Démarrer le streaming** (OBS) ou **Go Live** (Streamlabs) sur OBS. From 05084ec9b67d8ee6bae2207d09523e760e0bba96 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 10 Aug 2021 17:34:22 +0000 Subject: [PATCH 25/34] Auto-update README --- README.md | 1 + README_fr.md | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 458d155..9a7c1f3 100755 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ OBS can be used as streaming video app: https://obsproject.com/ 1. Enter the URL of the server running your streaming service in the format of `rtmp://myserver.net/live`. 1. Enter your **Stream Key** that matches your key file. 1. Press **Start Streaming** (OBS) or **Go Live** (Streamlabs) on OBS. + ## Documentation and resources * Official app website: https://owncast.online/ diff --git a/README_fr.md b/README_fr.md index e9defa0..1053192 100755 --- a/README_fr.md +++ b/README_fr.md @@ -25,19 +25,19 @@ Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un lo ## Configuration -Modifiez la clé de streaming par défaut `abc123` en éditant la page d'administration : `domain.ltd/admin` avec `admin` et `abc123` comme identifiant. +Les paramètres sont accessibles dans la page d'administration : : `domain.ltd/admin` avec `admin` et `votre_stream_key` comme identifiant. ## Application de diffusion en continu OBS peut être utilisé comme application de streaming vidéo : https://obsproject.com/ -1. Installez OBS ou Streamlabs OBS et faites-le fonctionner avec votre configuration locale. -1. Ouvrez les paramètres OBS et allez dans "Stream". -1. Sélectionnez « Personnalisé… » comme service. +1. Installez **OBS** ou **Streamlabs OBS** et faites-le fonctionner avec votre configuration locale. +1. Ouvrez les **paramètres** OBS et allez dans **Stream**. +1. Sélectionnez **Personnalisé…** comme service. 1. Entrez l'URL du serveur exécutant votre service de streaming au format `rtmp://myserver.net/live`. -1. Saisissez votre « Clé de diffusion » qui correspond à votre clé de streaming. -1. Démarrez le serveur. -1. Appuyez sur « Démarrer le streaming » (OBS) ou « Go Live » (Streamlabs) sur OBS. +1. Saisissez votre « Stream key » qui correspond à votre clé de streaming choisie lors de l'installation. +1. Appuyez sur **Démarrer le streaming** (OBS) ou **Go Live** (Streamlabs) sur OBS. + ## Documentations et ressources * Site officiel de l'app : https://owncast.online/ From dd1ab1a97425a47d82034301ee9d3c42863fb271 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 19:34:48 +0200 Subject: [PATCH 26/34] Update manifest.json --- manifest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.json b/manifest.json index 74b9759..de27adc 100755 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,6 @@ "website": "https://owncast.online/", "demo": "https://watch.owncast.online/", "admindoc": "https://owncast.online/docs/", - "userdoc": "https://yunohost.org/apps", "code": "https://github.com/owncast" }, "license": "MIT", From 128acfcd363491a5173d575dc217e1cd1b608fbc Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 10 Aug 2021 17:35:08 +0000 Subject: [PATCH 27/34] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 9a7c1f3..8dc52cd 100755 --- a/README.md +++ b/README.md @@ -45,7 +45,6 @@ OBS can be used as streaming video app: https://obsproject.com/ ## Documentation and resources * Official app website: https://owncast.online/ -* Official user documentation: https://yunohost.org/apps * Official admin documentation: https://owncast.online/docs/ * Upstream app code repository: https://github.com/owncast * YunoHost documentation for this app: https://yunohost.org/app_owncast diff --git a/README_fr.md b/README_fr.md index 1053192..526be7f 100755 --- a/README_fr.md +++ b/README_fr.md @@ -41,7 +41,6 @@ OBS peut être utilisé comme application de streaming vidéo : https://obsproje ## Documentations et ressources * Site officiel de l'app : https://owncast.online/ -* Documentation officielle utilisateur : https://yunohost.org/apps * Documentation officielle de l'admin : https://owncast.online/docs/ * Dépôt de code officiel de l'app : https://github.com/owncast * Documentation YunoHost pour cette app : https://yunohost.org/app_owncast From ebbc4b0c2b637f610a4d09c4f550716c0b02c084 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Aug 2021 20:48:06 +0200 Subject: [PATCH 28/34] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index de27adc..1bed058 100755 --- a/manifest.json +++ b/manifest.json @@ -51,8 +51,8 @@ "name": "password", "type": "password", "help": { - "en": "This is the password for connecting to the admin page as well as the Stream Key.", - "fr": "Ceci est le mot de passe pour se connecter à la page d'administration ainsi que la Stream Key." + "en": "This is the password for connecting to the admin page as well as the Stream Key. (Only alphanumeric characters are accepted)", + "fr": "Ceci est le mot de passe pour se connecter à la page d'administration ainsi que la Stream Key. (Seuls les caractères alphanumériques sont acceptés)" }, "example": "Choose a password" } From 1b141014a6a0c6d1186311e34c0117b600a7670e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 11 Aug 2021 18:33:01 +0200 Subject: [PATCH 29/34] 0.8 --- conf/arm64.src | 7 +++++++ conf/arm7.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 4 +++- 5 files changed, 15 insertions(+), 6 deletions(-) create mode 100755 conf/arm64.src diff --git a/conf/arm64.src b/conf/arm64.src new file mode 100755 index 0000000..01343e6 --- /dev/null +++ b/conf/arm64.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.8/owncast-0.0.8-linux-arm64.zip +SOURCE_SUM=f05498313a00490b60cc5df4e02d7914d8150838741577fa19b4623b2cbccbad +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=zip +SOURCE_IN_SUBDIR=false +SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/conf/arm7.src b/conf/arm7.src index 84fab35..936d2f9 100755 --- a/conf/arm7.src +++ b/conf/arm7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.7/owncast-0.0.7-linux-arm7.zip -SOURCE_SUM=b309205b75135ac06feff1591a24e911879f371609593dbfc510ba33d8f01c00 +SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.8/owncast-0.0.8-linux-arm7.zip +SOURCE_SUM=1e9d83d362873b0159a00c4fb38e162ffd3865ead59eedce78a5b9e7be5cfabd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index a526276..a3437ca 100755 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.7/owncast-0.0.7-linux-64bit.zip -SOURCE_SUM=fee4adf4990dabefcc7486e1d6a8f474b7a477b404c5a58406936516437fbb92 +SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.8/owncast-0.0.8-linux-64bit.zip +SOURCE_SUM=6e15620f70063ba62c2b9deeb82fc974eaac49f68cf2806b99ab19515390c6ea SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 1bed058..3e6d016 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted live video and web chat server for use with existing broadcasting software", "fr": "Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un logiciel de diffusion" }, - "version": "0.0.7~ynh2", + "version": "0.0.8~ynh1", "url": "https://owncast.online/", "upstream": { "license": "MIT", diff --git a/scripts/_common.sh b/scripts/_common.sh index d7ea150..12eccb8 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -28,7 +28,9 @@ pkg_dependencies="ffmpeg" # Requires YunoHost version 2.2.4 or higher. ynh_detect_arch(){ local architecture - if [ -n "$(uname -m | grep 64)" ]; then + if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then + architecture="arm64" + elif [ -n "$(uname -m | grep 64)" ]; then architecture="x86-64" elif [ -n "$(uname -m | grep armv7)" ]; then architecture="arm7" From c289e23380524512c0a30c4d371d9351af43edd6 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 11 Aug 2021 16:33:07 +0000 Subject: [PATCH 30/34] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8dc52cd..2fab17d 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Self-hosted live video and web chat server for use with existing broadcasting software -**Shipped version:** 0.0.7~ynh2 +**Shipped version:** 0.0.8~ynh1 **Demo:** https://watch.owncast.online/ diff --git a/README_fr.md b/README_fr.md index 526be7f..9f9cd97 100755 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un logiciel de diffusion -**Version incluse :** 0.0.7~ynh2 +**Version incluse :** 0.0.8~ynh1 **Démo :** https://watch.owncast.online/ From f635fca7a5ac2ba1f305bd3a4734003da982deb2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 11 Aug 2021 19:46:07 +0200 Subject: [PATCH 31/34] Update x86-64.src --- conf/x86-64.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/x86-64.src b/conf/x86-64.src index a3437ca..e57c3f9 100755 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.8/owncast-0.0.8-linux-64bit.zip -SOURCE_SUM=6e15620f70063ba62c2b9deeb82fc974eaac49f68cf2806b99ab19515390c6ea +SOURCE_SUM=e40fea62624bd76b2ea14abab10ace1f19a671795f2b0b161244ecd1f6f4c149 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false From a9dcf1f6ac7cf47b0f0fee278f3f8d77cb663021 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 11 Aug 2021 19:47:14 +0200 Subject: [PATCH 32/34] Update check_process --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 84f7878..e628c2c 100755 --- a/check_process +++ b/check_process @@ -12,7 +12,7 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=CommitHash + upgrade=1 from_commit=4eab5026853627bed955945968753378ea41f5ad backup_restore=1 multi_instance=0 change_url=1 @@ -20,6 +20,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. + ; commit=4eab5026853627bed955945968753378ea41f5ad + name= Merge pull request #1 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=1Strong-Password From 76a0e510dbcd3c149d6b36fc5660c0abb88f6c7d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 11 Aug 2021 21:27:24 +0200 Subject: [PATCH 33/34] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index e628c2c..8e138b6 100755 --- a/check_process +++ b/check_process @@ -12,7 +12,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=4eab5026853627bed955945968753378ea41f5ad + #upgrade=1 from_commit=4eab5026853627bed955945968753378ea41f5ad backup_restore=1 multi_instance=0 change_url=1 From 230c7295a8befc5ef382300489b8f74ce14b66e4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 11 Aug 2021 22:58:20 +0200 Subject: [PATCH 34/34] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 8e138b6..e628c2c 100755 --- a/check_process +++ b/check_process @@ -12,7 +12,7 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=4eab5026853627bed955945968753378ea41f5ad + upgrade=1 from_commit=4eab5026853627bed955945968753378ea41f5ad backup_restore=1 multi_instance=0 change_url=1