From e956b509a6cba7396b0dba8070e6c89af48e5c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 31 May 2023 18:21:31 +0200 Subject: [PATCH 1/7] cleaning --- doc/ADMIN.md | 4 ---- doc/ADMIN_fr.md | 4 ---- doc/POST_INSTALL.md | 3 ++- doc/POST_INSTALL_fr.md | 3 ++- scripts/upgrade | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index e3bcbf1..dddf8c6 100755 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,7 +1,3 @@ -## Configuration - -You can configure Owncast in the admin page: `https://__DOMAIN__/admin` with `admin` and `abc123` as credential. Don't forget to change the stream key. - ## Streaming app OBS can be used as streaming video app: https://obsproject.com/ diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index b7e0870..c8e187b 100755 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,7 +1,3 @@ -## Configuration - -Vous pouvez configurer Owncast dans la page d'administration : `https://__DOMAIN__/admin` avec `admin` et `abc123` comme identifiant. N'oubliez pas de changer la clé de flux (Stream Key). - ## Application de diffusion en continu OBS peut être utilisé comme application de streaming vidéo : https://obsproject.com/ diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index e8a7601..4567f63 100755 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1 +1,2 @@ -You can configure Owncast in the admin page: `https://__DOMAIN__/admin` with `admin` and `abc123` as credential. Don't forget to change the stream key. \ No newline at end of file +You can configure Owncast in the admin page: `https://__DOMAIN__/admin` with `admin` and `abc123` as credential. +Don't forget to change the stream key. \ No newline at end of file diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 5a2b4f6..082d8bf 100755 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1 +1,2 @@ -Vous pouvez configurer Owncast dans la page d'administration : `https://__DOMAIN__/admin` avec `admin` et `abc123` comme identifiant. N'oubliez pas de changer la clé de flux (Stream Key). +Vous pouvez configurer Owncast dans la page d'administration : `https://__DOMAIN__/admin` avec `admin` et `abc123` comme identifiant. +N'oubliez pas de changer la clé de flux (Stream Key). diff --git a/scripts/upgrade b/scripts/upgrade index f14ad09..c97d180 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE From 9d93de1063cf9c22e720bc36c32730f40fdeb2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 5 Jun 2023 21:58:01 +0200 Subject: [PATCH 2/7] fix --- conf/nginx.conf | 2 +- scripts/upgrade | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 7ad64ad..ab4c3c6 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,7 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { + proxy_pass http://127.0.0.1:__PORT__; proxy_set_header Host $host; proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Server $host; @@ -10,7 +11,6 @@ location __PATH__/ { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; - proxy_pass http://127.0.0.1:__PORT__; # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/scripts/upgrade b/scripts/upgrade index c97d180..a6ee37d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,6 +32,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=5 + ynh_secure_remove --file="$install_dir" # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" fi From c8204ea16f64aa9d39a37527e4f9bbef5c3d6857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 5 Jun 2023 22:28:45 +0200 Subject: [PATCH 3/7] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index a6ee37d..c97d180 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,7 +32,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=5 - ynh_secure_remove --file="$install_dir" # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" fi From fcf8140ec8a738da8662fa2587e49842383850d3 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Wed, 12 Jul 2023 22:17:46 +0200 Subject: [PATCH 4/7] Replace all files Fix #39 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c97d180..fd34767 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,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="$install_dir" + ynh_setup_source --dest_dir="$install_dir" --keep="data" --full_replace=1 fi chmod -R o-rwx "$install_dir" From 054fadbcab679313ea273034979ec8568f76e7ee Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Wed, 12 Jul 2023 22:19:14 +0200 Subject: [PATCH 5/7] Update tests.toml --- tests.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 91daf17..fe46938 100644 --- a/tests.toml +++ b/tests.toml @@ -4,4 +4,6 @@ test_format = 1.0 # ------------ # Tests to run - # ------------ \ No newline at end of file + # ------------ + + test_upgrade_from.5233d1027c.name = "Upgrade from 0.0.13" From 84ab260425bf23831e44daf63f009902dc20ba74 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 13 Jul 2023 06:33:54 +0200 Subject: [PATCH 6/7] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index dd99cff..929c2c2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Owncast" description.en = "Self-hosted live video and web chat server for use with existing broadcasting software" description.fr = "Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un logiciel de diffusion" -version = "0.1.0~ynh1" +version = "0.1.0~ynh2" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ admindoc = "https://owncast.online/docs/" code = "https://github.com/owncast/owncast" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.1.21" architectures = ["amd64", "armhf", "arm64"] multi_instance = false ldap = false From 3892e13609ba564e98829f90e82431035cd27197 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Jul 2023 04:33:59 +0000 Subject: [PATCH 7/7] 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 015ce4f..19cd799 100755 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Owncast is an open source, self-hosted, decentralized, single user live streaming and chat server for running your own live streams similar in style to the large mainstream options. It offers complete ownership over your content, interface, moderation and audience. -**Shipped version:** 0.1.0~ynh1 +**Shipped version:** 0.1.0~ynh2 **Demo:** https://watch.owncast.online/ diff --git a/README_fr.md b/README_fr.md index 802cf5b..f842e23 100755 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Owncast est un serveur de diffusion en direct et de chat open source, auto-hébergé, décentralisé et à utilisateur unique pour exécuter vos propres diffusions en direct dans un style similaire aux grandes options grand public. Il offre une propriété complète sur votre contenu, votre interface, votre modération et votre audience. -**Version incluse :** 0.1.0~ynh1 +**Version incluse :** 0.1.0~ynh2 **Démo :** https://watch.owncast.online/