From 56592df437e5a75cd19d4657981a826b10dacc75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 May 2023 16:54:23 +0200 Subject: [PATCH] v2 --- .github/workflows/updater.sh | 66 ----------------------------------- .github/workflows/updater.yml | 49 -------------------------- conf/lemmy-ui.service | 2 +- conf/lemmy.hjson | 2 +- conf/nginx.conf | 6 ++-- doc/DESCRIPTION.md | 2 +- doc/DISCLAIMER.md | 2 -- manifest.toml | 7 ++-- 8 files changed, 9 insertions(+), 127 deletions(-) delete mode 100644 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml delete mode 100644 doc/DISCLAIMER.md diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100644 index 1aeb2f1..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,66 +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. - -#================================================= -# 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) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .tag_name | contains("v") | not ) | .tag_name' | sort -V | tail -1) - -# Later down the script, we assume the version has only digits and dots -# Sometimes the release name starts with a "v", so let's filter it out. -# You may need more tweaks here if the upstream repository has different naming conventions. -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 -echo "REPO=$repo" >> $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 - -#================================================= -# 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 fb72ba0..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@v2 - 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@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - base: testing - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false diff --git a/conf/lemmy-ui.service b/conf/lemmy-ui.service index 3fdf846..2d176a3 100644 --- a/conf/lemmy-ui.service +++ b/conf/lemmy-ui.service @@ -6,7 +6,7 @@ After=network.target Type=simple User=__APP__ Group=__APP__ -Environment="LEMMY_INTERNAL_HOST=127.0.0.1:__PORT_LEMMY__" +Environment="LEMMY_INTERNAL_HOST=127.0.0.1:__PORT__" Environment="LEMMY_EXTERNAL_HOST=__DOMAIN__" Environment="LEMMY_HTTPS=true" Environment="LEMMY_UI_HOST=0.0.0.0:__PORT_UI__" diff --git a/conf/lemmy.hjson b/conf/lemmy.hjson index 6e2ddcf..6923310 100644 --- a/conf/lemmy.hjson +++ b/conf/lemmy.hjson @@ -84,7 +84,7 @@ # Address where lemmy should listen for incoming requests bind: "0.0.0.0" # Port where lemmy should listen for incoming requests - port: __PORT_LEMMY__ + port: __PORT__ # Whether the site is available over TLS. Needs to be true for federation to work. tls_enabled: true # Address where pictrs is available (for image hosting) diff --git a/conf/nginx.conf b/conf/nginx.conf index 219df32..1ec7d21 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -20,10 +20,10 @@ location / { set $proxpass "http://127.0.0.1:__PORT_UI__"; if ($http_accept ~ "^application/.*$") { - set $proxpass "http://127.0.0.1:__PORT_LEMMY__"; + set $proxpass "http://127.0.0.1:__PORT__"; } if ($request_method = POST) { - set $proxpass "http://127.0.0.1:__PORT_LEMMY__"; + set $proxpass "http://127.0.0.1:__PORT__"; } proxy_pass $proxpass; @@ -37,7 +37,7 @@ location / { # backend location ~ ^/(api|pictrs|feeds|nodeinfo|.well-known) { - proxy_pass http://127.0.0.1:__PORT_LEMMY__; + proxy_pass http://127.0.0.1:__PORT__; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 0fe3cc8..0c98e9b 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -[Lemmy](https://github.com/LemmyNet/lemmy) is similar to sites like [Reddit](https://reddit.com), [Lobste.rs](https://lobste.rs), or [Hacker News](https://news.ycombinator.com/): you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the [Fediverse](https://en.wikipedia.org/wiki/Fediverse). +Lemmy is similar to sites like Reddit, Lobste.rs, or Hacker News: you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the Fediverse. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md deleted file mode 100644 index ff56e98..0000000 --- a/doc/DISCLAIMER.md +++ /dev/null @@ -1,2 +0,0 @@ -* Lemmy require full domain path to be installed. Eg. lemmy.domain.tld -* pict-rs image hosting service has been removed, it caused too much issue during compilation diff --git a/manifest.toml b/manifest.toml index 1fe9f5f..f8c8b7f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,10 +40,9 @@ ram.runtime = "50M" url = "https://codeload.github.com/LemmyNet/lemmy-translations/tar.gz/00e4efbef6c3ac34cd2f5f444a95eddce9ec12d7" sha256 = "0587c1867c785e6d229d1519a37fc9a280e78f356d919f868f21a896abddff71" -#REMOVEME? port_lemmy=$(ynh_find_port --port=8536) -#REMOVEME? ynh_app_setting_set --app=$app --key=port_lemmy --value=$port_lemmy -#REMOVEME? port_ui=$(ynh_find_port --port=1235) -#REMOVEME? ynh_app_setting_set --app=$app --key=port_ui --value=$port_ui + [resources.ports] + main.default = 8536 + ui.default = 8537 [resources.system_user]