add APP_URL env var to channels

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +0,0 @@
----
-name: "Loomio pull request template"
-about: "Loomio pull request template"
----
-
-<!-- 
-Thank you for doing recipe maintenance work!
-Please mark all checklist items which are relevant for your changes.
-Please remove the checklist items which are not relevant for your changes.
-Feel free to remove this comment.
--->
-
-* [ ] I have deployed and tested my changes
-* [ ] I have [updated relevant versions in `abra.sh`](https://docs.coopcloud.tech/maintainers/upgrade/#updating-versions-in-the-abrash)
-* [ ] I have made my environment variable changes [backwards compatible](https://docs.coopcloud.tech/maintainers/upgrade/#backwards-compatible-environment-variable-changes)
-* [ ] I have added a [release note entry](https://docs.coopcloud.tech/maintainers/upgrade/#creating-new-release-notes)

MAINTENANCE.md

@@ -1,32 +0,0 @@
-# Loomio Recipe Maintenance
-
-All contributions should be made via a pull request. This is to ensure a
-certain quality and consistency, that others can rely on.
-
-## Maintainer Responsibilities
-
-A recipe maintainer has the following responsibilities:
-
-- Respond to pull requests / issues within a week
-- Make image security updates within a day
-- Make image patch / minor updates within a week
-- Make image major updates within a month
-
-In order to fullfill these responsibilities a recipe maintainer:
-
-- Has to watch the repository (to get notifications)
-- Needs to make sure renovate is configured properly
-
-## Pull Requests
-
-A pull request can be merged if it is approved by at least one maintainer. For
-pull requests opened by a maintainer they need to be approved by another
-maintainer. Even though it is okay to merge a pull request with one approval, it
-is always better if all maintainers looked at the pull request and approved it.
-
-## Become a maintainer
-
-Everyone can apply to be a recipe maintainer:
-1. Watch the repository to always get updates
-2. Simply add your self to the list in the [README.md](./README.md) and open a new pull request with the change.
-3. Once the pull request gets merged you will be added to the [loomio maintainers team](https://git.coopcloud.tech/org/coop-cloud/teams/loomio-maintainers).

README.md

@@ -3,7 +3,6 @@
 "Loomio is a collaborative decision-making tool that makes it easy for anyone to participate in decisions which affect them. To find out more, visit Loomio.org."
 
 <!-- metadata -->
-* **Maintainer**: [@jmakdah2](https://git.coopcloud.tech/jmakdah2)[@moosemower](https://git.coopcloud.tech/moosemower)
 * **Category**: Apps
 * **Status**: 3, work-in-progress
 * **Image**: [`loomio/*`](https://hub.docker.com/r/loomio), 4, upstream

abra.sh

@@ -1,5 +1,4 @@
 export LOOMIO_ENTRYPOINT_VERSION=v8
-export PG_BACKUP_VERSION=v1
 
 # cannot be integrated into entrypoint.sh as it requires the operator to create a user first
 function make_last_user_admin()

compose.yml

@@ -32,7 +32,7 @@ x-environment: &default-env
 
 services:
   app:
-    image: loomio/loomio:v3.0.20
+    image: loomio/loomio:v3.0.0
     configs:
       - source: entrypoint
         target: /entrypoint.sh
@@ -70,7 +70,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=5.2.0+v3.0.20"
+        - "coop-cloud.${STACK_NAME}.version=5.1.2+v3.0.0"
         - "backupbot.backup:=${ENABLE_BACKUPS:-true}"
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}"
         - "traefik.http.middlewares.${STACK_NAME}.headers.accesscontrolallowmethods=GET,OPTIONS,PUT"
@@ -115,14 +115,12 @@ services:
       PGDATA: /pgdata
     deploy:
       labels:
-        backupbot.backup: ${ENABLE_BACKUPS:-true}
-        backupbot.backup.volumes.pgdata.path: "backup.sql"
-        backupbot.backup.pre-hook: "/pg_backup.sh backup"
-        backupbot.restore.post-hook: '/pg_backup.sh restore'
-    configs:
-        - source: pg_backup
-          target: /pg_backup.sh
-          mode: 0555
+        backupbot.backup: "${ENABLE_BACKUPS:-true}"
+        backupbot.backup.pre-hook: sh -c 'pg_dump -U "$$POSTGRES_USER" -Fc "$$POSTGRES_DB" | gzip > "/postgres.dump.gz"'
+        backupbot.backup.path: "/postgres.dump.gz"
+        backupbot.backup.post-hook: "rm -f /postgres.dump.gz"
+        backupbot.restore: "true"
+        backupbot.restore.post-hook: sh -c 'gzip -d /postgres.dump.gz && pg_restore --clean -U "$$POSTGRES_USER" --dbname="$$POSTGRES_DB" < /postgres.dump && rm -f /postgres.dump'
   redis:
     image: redis:8.0
     networks:
@@ -147,7 +145,7 @@ services:
     environment:
       <<: *redis-env
       VIRTUAL_HOST: channels.${DOMAIN}
-      APP_URL: ${DOMAIN}
+      APP_URL: https://${DOMAIN}
     deploy:
       labels:
         - "traefik.enable=true"
@@ -205,9 +203,6 @@ configs:
   entrypoint:
     name: ${STACK_NAME}_entrypoint_${LOOMIO_ENTRYPOINT_VERSION}
     file: entrypoint.sh
-  pg_backup:
-    name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
-    file: pg_backup.sh
 
 secrets:
   devise_secret:

pg_backup.sh

@@ -1,70 +0,0 @@
-#!/bin/bash
-
-set -e
-
-BACKUP_PATH="/pgdata"
-LATEST_BACKUP_FILE="${BACKUP_PATH}/backup.sql"
-
-function backup {
-  FILE_WITH_DATE="${BACKUP_PATH}/backup_$(date +%F).sql"
-  
-  if [ -f "$POSTGRES_PASSWORD_FILE" ]; then
-    export PGPASSWORD=$(cat "$POSTGRES_PASSWORD_FILE")
-  fi
-  
-  echo "Creating backup at ${FILE_WITH_DATE}..."
-  pg_dump -U "${POSTGRES_USER:-postgres}" "${POSTGRES_DB:-postgres}" > "${FILE_WITH_DATE}"
-  
-  echo "Copying to ${LATEST_BACKUP_FILE}..."
-  cp -f "${FILE_WITH_DATE}" "${LATEST_BACKUP_FILE}"
-  
-  echo "Backup done. You will find it at ${LATEST_BACKUP_FILE}"
-}
-
-function restore {
-    echo "Restoring database from ${LATEST_BACKUP_FILE}..."
-
-    cd ${BACKUP_PATH}
-    
-    function restore_config {
-        echo "Restoring original pg_hba.conf configuration..."
-        cat pg_hba.conf.bak > pg_hba.conf
-        su postgres -c 'pg_ctl reload'
-    }
-    
-    # Don't allow any other connections than local
-    echo "Setting up temporary pg_hba.conf to only allow local connections..."
-    cp pg_hba.conf pg_hba.conf.bak
-    echo "local all all trust" > pg_hba.conf
-    su postgres -c 'pg_ctl reload'
-    trap restore_config EXIT INT TERM
-
-    # Recreate Database
-    echo "Dropping existing database ${POSTGRES_DB:-postgres}..."
-    psql -U "${POSTGRES_USER:-postgres}" -d postgres -c "DROP DATABASE \"${POSTGRES_DB:-postgres}\" WITH (FORCE);" 
-    
-    echo "Creating fresh database ${POSTGRES_DB:-postgres}..."
-    createdb -U "${POSTGRES_USER:-postgres}" "${POSTGRES_DB:-postgres}"
-    
-    echo "Restoring data from ${LATEST_BACKUP_FILE}..."
-    psql -U "${POSTGRES_USER:-postgres}" -d "${POSTGRES_DB:-postgres}" -1 -f "${LATEST_BACKUP_FILE}"
-
-    trap - EXIT INT TERM
-    restore_config
-    
-    echo "Database restore completed successfully."
-}
-
-# Execute the function passed as argument
-case "$1" in
-  backup)
-    backup
-    ;;
-  restore)
-    restore
-    ;;
-  *)
-    echo "Usage: $0 {backup|restore}"
-    exit 1
-    ;;
-esac

release/5.2.0+v3.0.20

@@ -1 +0,0 @@
-upgrade loomio from version 3.0.0 to 3.0.20

renovate.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ]
-}