From d88b28acddb1d4ee41149be10872bec196eeb1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 12 May 2023 09:00:08 +0200 Subject: [PATCH 1/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index fcc6f62..b3dfc83 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://owncast.online/docs/" code = "https://github.com/owncast/owncast" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.1.19" architectures = ["amd64", "armhf", "arm64"] multi_instance = false ldap = false From 4d04d4240717253b42d693bd0b44c709769548f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 May 2023 19:15:33 +0200 Subject: [PATCH 2/9] 0.1.0 --- .github/workflows/updater.sh | 133 ---------------------------------- .github/workflows/updater.yml | 49 ------------- manifest.toml | 20 ++--- 3 files changed, 10 insertions(+), 192 deletions(-) delete mode 100644 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100644 index 68e77f5..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash - -#================================================= -# PACKAGE UPDATING HELPER -#================================================= - -# This script is meant to be run by GitHub Actions -# The YunoHost-Apps organisation offers a template Action to run this script periodically -# Since each app is different, maintainers can adapt its contents so as to perform -# automatic actions when a new upstream release is detected. - -# Remove this exit command when you are ready to run this Action -#exit 1 - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') -# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) -assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) - -if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} -fi - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV -# For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV - -# Proceed only if the retrieved version is greater than the current one -if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 -# Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 -fi - -# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) -echo "${#assets[@]} available asset(s)" - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -# Here we use the $assets variable to get the resources published in the upstream release. -# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. - -# Let's loop over the array of assets URLs -for asset_url in ${assets[@]}; do - -echo "Handling asset at $asset_url" - -# Assign the asset to a source file in conf/ directory -# 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 - "owncast-"*"-linux-64bit.zip"*) - src="amd64" - ;; - "owncast-"*"-linux-arm7.zip"*) - src="armhf" - ;; - "owncast-"*"-linux-arm64.zip"*) - src="arm64" - ;; -esac - -# If $src is not empty, let's process the asset -if [ ! -z "$src" ]; then - -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - -# Delete temporary directory -rm -rf $tempdir - -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi - -# Rewrite source file -cat < conf/$src.src -SOURCE_URL=$asset_url -SOURCE_SUM=$checksum -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=$extension -SOURCE_IN_SUBDIR=false -SOURCE_EXTRACT=true -EOT -echo "... conf/$src.src updated" - -else -echo "... asset ignored" -fi - -done - -#================================================= -# SPECIFIC UPDATE STEPS -#================================================= - -# Any action on the app's source code can be done. -# The GitHub Action workflow takes care of committing all changes after this script ends. - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json - -# No need to update the README, yunohost-bot takes care of it - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index 609c284..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,49 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash .github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - branch: ci-auto-update-v${{ env.VERSION }} - base: testing - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false diff --git a/manifest.toml b/manifest.toml index b3dfc83..bc6e6b0 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.0.13~ynh4" +version = "0.1.0~ynh1" maintainers = ["eric_G"] @@ -44,15 +44,12 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://github.com/owncast/owncast/releases/download/v0.0.13/owncast-0.0.13-linux-64bit.zip" - amd64.sha256 = "6a9e012bebdd724592fe966a86902d93d8c74a70b2512a5025002d478b7448b7" - - arm64.url = "https://github.com/owncast/owncast/releases/download/v0.0.13/owncast-0.0.13-linux-arm64.zip" - arm64.sha256 = "b2dba64cb815e32c9c2a242f9d870ad6be407b48cb0416a7e2c089f8965b14b5" - - armhf.url = "https://github.com/owncast/owncast/releases/download/v0.0.13/owncast-0.0.13-linux-arm7.zip" - armhf.sha256 = "8f1e4a482f22baaaab20714fd3931b71115cddb8881a9d6e4c8d7b68c8a3724d" - + amd64.url = "https://github.com/owncast/owncast/releases/download/v0.1.0/owncast-0.1.0-linux-64bit.zip" + amd64.sha256 = "98e4c19911a77955cb1dbfc01b99dd6a3ad79d3c0fea13eb0a28ac7d0d415a5a" + arm64.url = "https://github.com/owncast/owncast/releases/download/v0.1.0/owncast-0.1.0-linux-arm64.zip" + arm64.sha256 = "ea2eb65f1d4c6e78318c93981b4708d11c77d768c23dd31f2abd3e8462dc2dda" + armhf.url = "https://github.com/owncast/owncast/releases/download/v0.1.0/owncast-0.1.0-linux-32bit.zip" + armhf.sha256 = "662419e3a9a4a6be75d42828c7208e5af6c729b0315a210412e8f2b2a5b56a50" in_subdir = false [resources.ports] @@ -65,6 +62,9 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + admin.url = "/admin" + admin.allowed = "admins" + admin.show_tile = false [resources.apt] packages = "ffmpeg" From 50e70c0d8b01c2e9f134a086ef1dbc5b8531b2d0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 30 May 2023 17:15:39 +0000 Subject: [PATCH 3/9] 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 f77b095..015ce4f 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.0.13~ynh4 +**Shipped version:** 0.1.0~ynh1 **Demo:** https://watch.owncast.online/ diff --git a/README_fr.md b/README_fr.md index 71bdeb1..802cf5b 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.0.13~ynh4 +**Version incluse :** 0.1.0~ynh1 **Démo :** https://watch.owncast.online/ From 0bc39acd3760cbec896a016b70d29ee7f07d44d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 May 2023 19:26:32 +0200 Subject: [PATCH 4/9] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index bc6e6b0..938cb51 100644 --- a/manifest.toml +++ b/manifest.toml @@ -65,6 +65,7 @@ ram.runtime = "50M" admin.url = "/admin" admin.allowed = "admins" admin.show_tile = false + admin.protected = true [resources.apt] packages = "ffmpeg" From 8d0037995b63dac894c0875137fea9eb9db3f118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 May 2023 19:31:17 +0200 Subject: [PATCH 5/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 938cb51..a33fbbf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -65,7 +65,7 @@ ram.runtime = "50M" admin.url = "/admin" admin.allowed = "admins" admin.show_tile = false - admin.protected = true + admin.auth_header = false [resources.apt] packages = "ffmpeg" From dfc8efb01e5536db879af4193eb62195e5d41fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 May 2023 19:34:37 +0200 Subject: [PATCH 6/9] Update manifest.toml --- manifest.toml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index a33fbbf..ff702d5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,10 +62,11 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - admin.url = "/admin" - admin.allowed = "admins" - admin.show_tile = false - admin.auth_header = false + #admin.url = "/admin" + #admin.allowed = "admins" + #admin.show_tile = false + #admin.auth_header = false + main.auth_header = false [resources.apt] packages = "ffmpeg" From 423d62e9b364d8484a394991443ba39f5b0dc98f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 May 2023 19:36:08 +0200 Subject: [PATCH 7/9] fix --- scripts/change_url | 4 ++-- scripts/install | 2 +- scripts/restore | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 7b9d74e..840ae2b 100755 --- a/scripts/change_url +++ b/scripts/change_url @@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers #================================================= 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" #================================================= # MODIFY URL IN NGINX CONF @@ -32,7 +32,7 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 1e0fbf1..7210b16 100755 --- a/scripts/install +++ b/scripts/install @@ -42,7 +42,7 @@ yunohost service add $app --description="Self-hosted live video and web chat ser 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" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" sleep 20 #================================================= diff --git a/scripts/restore b/scripts/restore index 6bbc6ac..5e0b3c3 100755 --- a/scripts/restore +++ b/scripts/restore @@ -43,7 +43,7 @@ yunohost service add $app --description="Self-hosted live video and web chat ser #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=10 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" sleep 20 ynh_systemd_action --service_name=nginx --action=reload From 7925d1f3c6954606508f0717b20e08391362def1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 May 2023 19:38:13 +0200 Subject: [PATCH 8/9] fix --- manifest.toml | 8 ++++---- scripts/upgrade | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index ff702d5..34c8f1f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,11 +62,11 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - #admin.url = "/admin" - #admin.allowed = "admins" + admin.url = "/admin" + admin.allowed = "admins" #admin.show_tile = false - #admin.auth_header = false - main.auth_header = false + admin.auth_header = false + #main.auth_header = false [resources.apt] packages = "ffmpeg" diff --git a/scripts/upgrade b/scripts/upgrade index a205707..f14ad09 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -60,7 +60,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" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" sleep 20 #================================================= From 5bde920b2b5066d8e1e99aa913559dfbe37598d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 May 2023 19:40:27 +0200 Subject: [PATCH 9/9] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 34c8f1f..ff702d5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,11 +62,11 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - admin.url = "/admin" - admin.allowed = "admins" + #admin.url = "/admin" + #admin.allowed = "admins" #admin.show_tile = false - admin.auth_header = false - #main.auth_header = false + #admin.auth_header = false + main.auth_header = false [resources.apt] packages = "ffmpeg"