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/ 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/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/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 diff --git a/scripts/upgrade b/scripts/upgrade index f14ad09..fd34767 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 @@ -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" 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"