diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index aeb769e..e3b1755 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -63,13 +63,13 @@ echo "Handling asset at $asset_url" # Here we base the source file name upon a unique keyword in the assets url (admin vs. update) # Leave $src empty to ignore the asset case $asset_url in - *".zip"*) + "owncast-"*"-linux-64bit.zip"*) src="x86-64" ;; - *".zip"*) + "owncast-"*"-linux-arm7.zip"*) src="arm7" ;; - *".zip"*) + "owncast-"*"-linux-arm64.zip"*) src="arm64" ;; esac @@ -101,7 +101,8 @@ SOURCE_URL=$asset_url SOURCE_SUM=$checksum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=$extension -SOURCE_IN_SUBDIR=true +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=true EOT echo "... conf/$src.src updated" diff --git a/README.md b/README.md index f4f81e3..6b12f14 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 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.0.8~ynh4 +**Shipped version:** 0.0.9~ynh1 **Demo:** https://watch.owncast.online/ @@ -29,7 +29,7 @@ Owncast is an open source, self-hosted, decentralized, single user live streamin ## Configuration -Settings are accessible in admin page: `domain.ltd/admin` with `admin` and `your_stream_key` as credential. +You can configure Owncast in the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. Don't forget to change the stream key. ## Streaming app @@ -49,7 +49,7 @@ OBS can be used as streaming video app: https://obsproject.com/ * Official app website: https://owncast.online/ * Official admin documentation: https://owncast.online/docs/ -* Upstream app code repository: https://github.com/owncast +* Upstream app code repository: https://github.com/owncast/owncast * YunoHost documentation for this app: https://yunohost.org/app_owncast * Report a bug: https://github.com/YunoHost-Apps/owncast_ynh/issues diff --git a/README_fr.md b/README_fr.md index a9e4cbe..3550661 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 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.0.8~ynh4 +**Version incluse :** 0.0.9~ynh1 **Démo :** https://watch.owncast.online/ @@ -25,7 +25,7 @@ Owncast est un serveur de diffusion en direct et de chat open source, auto-hébe ## Configuration -Les paramètres sont accessibles dans la page d'administration : : `domain.ltd/admin` avec `admin` et `votre_stream_key` comme identifiant. +Vous pouvez configurer Owncast dans la page d'administration : `domain.ltd/admin` avec `admin` et `abc123` comme identifiant. N'oubliez pas de changer la clé de flux (Stream Key). ## Application de diffusion en continu @@ -42,7 +42,7 @@ OBS peut être utilisé comme application de streaming vidéo : https://obsproje * Site officiel de l'app : https://owncast.online/ * Documentation officielle de l'admin : https://owncast.online/docs/ -* Dépôt de code officiel de l'app : https://github.com/owncast +* Dépôt de code officiel de l'app : https://github.com/owncast/owncast * Documentation YunoHost pour cette app : https://yunohost.org/app_owncast * Signaler un bug : https://github.com/YunoHost-Apps/owncast_ynh/issues diff --git a/check_process b/check_process index 8e138b6..4691619 100755 --- a/check_process +++ b/check_process @@ -3,7 +3,6 @@ domain="domain.tld" path="/path" is_public=1 - password="1Strong-Password" ; Checks pkg_linter=1 setup_sub_dir=0 diff --git a/conf/arm64.src b/conf/arm64.src index fc1f190..6170db5 100755 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.8/owncast-0.0.8-linux-arm64.zip -SOURCE_SUM=eb818e594f39dfff003d6ec406569f17c5a96aecdcd0fdc955a82342e576e5d4 +SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.9/owncast-0.0.9-linux-arm64.zip +SOURCE_SUM=f1cbdafb8778aeed73a12b6319cdac290e0660b0b4bb7ba739add7d17daba4af SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/arm7.src b/conf/arm7.src index 2a86d53..dceb179 100755 --- a/conf/arm7.src +++ b/conf/arm7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.8/owncast-0.0.8-linux-arm7.zip -SOURCE_SUM=9b5438e954199813055022e50fb3f3765732e70aa27e85c3fe15110f39b470eb +SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.9/owncast-0.0.9-linux-arm7.zip +SOURCE_SUM=5edac4c692e707e5442e0b51efe13d033ba010102bb481635c0cb94d8db55f01 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index 4ab34bd..d45c2b3 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=e40fea62624bd76b2ea14abab10ace1f19a671795f2b0b161244ecd1f6f4c149 +SOURCE_URL=https://github.com/owncast/owncast/releases/download/v0.0.9/owncast-0.0.9-linux-64bit.zip +SOURCE_SUM=b7686cf69cb41130802d8128362f419afff28bc4d5e18fad9568bcecb57c445b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 9b06f03..ba5cc0d 100755 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,6 +1,6 @@ ## Configuration -Settings are accessible in admin page: `domain.ltd/admin` with `admin` and `your_stream_key` as credential. +You can configure Owncast in the admin page: `domain.ltd/admin` with `admin` and `abc123` as credential. Don't forget to change the stream key. ## Streaming app diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 9caa78e..bc7c61b 100755 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,6 +1,6 @@ ## Configuration -Les paramètres sont accessibles dans la page d'administration : : `domain.ltd/admin` avec `admin` et `votre_stream_key` comme identifiant. +Vous pouvez configurer Owncast dans la page d'administration : `domain.ltd/admin` avec `admin` et `abc123` comme identifiant. N'oubliez pas de changer la clé de flux (Stream Key). ## Application de diffusion en continu diff --git a/manifest.json b/manifest.json index 302fe8a..2d076da 100755 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,14 @@ "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.8~ynh4", + "version": "0.0.9~ynh1", "url": "https://owncast.online/", "upstream": { "license": "MIT", "website": "https://owncast.online/", "demo": "https://watch.owncast.online/", "admindoc": "https://owncast.online/docs/", - "code": "https://github.com/owncast" + "code": "https://github.com/owncast/owncast" }, "license": "MIT", "maintainer": { @@ -35,8 +35,7 @@ "help": { "en": "Owncast needs to be installed in a dedicated domain or sub-domain.", "fr": "Owncast doit être installé dans un domaine ou sous-domaine dédié." - }, - "example": "owncast.example.com" + } }, { "name": "is_public", @@ -46,15 +45,6 @@ "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": "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" } ] } diff --git a/scripts/backup b/scripts/backup index fb3c925..4103270 100755 --- a/scripts/backup +++ b/scripts/backup @@ -14,10 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -48,6 +44,12 @@ ynh_backup --src_path="$final_path" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# BACKUP LOGROTATE +#================================================= + +ynh_backup --src_path="/etc/logrotate.d/$app" + #================================================= # BACKUP SYSTEMD #================================================= diff --git a/scripts/install b/scripts/install index 2d5f820..817c86c 100755 --- a/scripts/install +++ b/scripts/install @@ -13,10 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -27,7 +23,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -password=$YNH_APP_ARG_PASSWORD architecture=$(ynh_detect_arch) app=$YNH_APP_INSTANCE_NAME @@ -114,15 +109,6 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=1 # Create a dedicated systemd config 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 -popd - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/remove b/scripts/remove index 23b5fd0..aaf1c2a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -41,6 +41,14 @@ ynh_script_progression --message="Stopping and removing the systemd service..." # Remove the dedicated systemd config ynh_remove_systemd_config +#================================================= +# REMOVE LOGROTATE CONFIGURATION +#================================================= +ynh_script_progression --message="Removing logrotate configuration..." --weight=1 + +# Remove the app-specific logrotate config +ynh_remove_logrotate + #================================================= # REMOVE DEPENDENCIES #================================================= @@ -75,6 +83,14 @@ then ynh_exec_warn_less yunohost firewall disallow TCP $stream_port fi +#================================================= +# REMOVE VARIOUS FILES +#================================================= +ynh_script_progression --message="Removing various files..." --weight=1 + +# Remove the log files +ynh_secure_remove --file="/var/log/$app" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index 12a870d..3674ae2 100755 --- a/scripts/restore +++ b/scripts/restore @@ -14,10 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - #### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -88,6 +84,13 @@ ynh_script_progression --message="Restoring the systemd configuration..." --weig ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet +#================================================= +# RESTORE THE LOGROTATE CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/logrotate.d/$app" + #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c227ff8..b455253 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,6 +99,14 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config +#================================================= +# SETUP LOGROTATE +#================================================= +ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1 + +# Use logrotate to manage app-specific logfile(s) +ynh_use_logrotate --non-append + #================================================= # INTEGRATE SERVICE IN YUNOHOST #=================================================