.drone.yml

@@ -3,7 +3,7 @@ kind: pipeline
 name: deploy to swarm-test.autonomic.zone
 steps:
   - name: deployment
-    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
+    image: decentral1se/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
       stack: discourse
@@ -11,30 +11,11 @@ steps:
       purge: true
       deploy_key:
         from_secret: drone_ssh_swarm_test
-      networks:
-        - proxy
     environment:
       DOMAIN: discourse.swarm-test.autonomic.zone
       STACK_NAME: discourse
       LETS_ENCRYPT_ENV: production
       SECRET_DB_PASSWORD_VERSION: v1
-      DB_ENTRYPOINT_VERSION: v1
 trigger:
   branch:
     - main
----
-kind: pipeline
-name: generate recipe catalogue
-steps:
-  - name: release a new version
-    image: plugins/downstream
-    settings:
-      server: https://build.coopcloud.tech
-      token:
-        from_secret: drone_abra-bot_token
-      fork: true
-      repositories:
-        - toolshed/auto-recipes-catalogue-json
-
-trigger:
-  event: tag

.env.sample

@@ -11,8 +11,6 @@ LETS_ENCRYPT_ENV=production
 #DISCOURSE_SMTP_USER=
 #DISCOURSE_SMTP_PROTOCOL=
 #DISCOURSE_SMTP_AUTH=
-# Set this if you send e-mails from a different domain than noreply@$DOMAIN
-#DISCOURSE_NOTIFICATION_EMAIL=$SMTP_USER
 
 # SMTP authentication
 #COMPOSE_FILE="compose.yml:compose.smtpauth.yml"

README.md

@@ -21,15 +21,15 @@ A platform for community discussion
 2. Deploy [`coop-cloud/traefik`]
 3. `abra app new discourse --secrets` (optionally with `--pass` if you'd like
    to save secrets in `pass`)
-4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
+4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
-5. `abra app deploy YOURAPPDOMAIN`
+5. `abra app YOURAPPDOMAIN deploy`
 6. Open the configured domain in your browser to finish set-up
 
 [`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
 [`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik
 
-## To add a new admin user
+## To add a new Admin user
 
 1. Login to the instance `abra app run APPNAME app sh`
 2. `cd /opt/bitnami/discourse`
@@ -39,34 +39,9 @@ A platform for community discussion
 
 1. Login to instance `abra app run APPNAME app sh`
 2. `cd /bitnami/discourse/plugins/`
-3. `git clone plugin.git` for example `https://github.com/discourse/discourse-openid-connect.git`
-4. `abra app restart YOURAPPDOMAIN app`
-
-### Events / calendar plugin
-
-We've had some luck running [discourse-events](https://github.com/paviliondev/discourse-events).
+3. `git clone plugingit` for example `https://github.com/discourse/discourse-openid-connect.git`
+4. `abra app restart APPNAME app`
 
 ## Setup Notes
 
 Until issue #1 is fixed, the default user is `user` and the default password is `bitnami123`
-
-## Postgres major version upgrades
-
-Welcome to hell.
-
-1. `abra app run YOURAPPDOMAIN db pg_dumpall -U discourse | gzip > YOURAPPDOMAIN_db_DATE.sql.gz`
-2. `abra app volume ls YOURAPPDOMAIN`, find the name of the Postgres data volume
-3. `scp` the backup to your VPS
-4. `abra app undeploy YOURAPPDOMAIN`
-5. `abra app volume rm YOURAPPDOMAIN`, choose the Postgres data volume
-6. `abra app deploy YOURAPPDOMAIN`, then `abra app undeploy YOURAPPDOMAIN`
-7. `ssh` to the VPS, run (replacing `13-alpine` with the new Postgres version)
-   `docker run -v YOURDATAVOLUME:/var/lib/postgresql/data -e POSTGRES_HOST_AUTH_METHOD=trust -it postgres:13-alpine`
-8. In another SSH session on the server, run `docker ps` to find the ID of the
-   new Postgres container, then `docker exec -it CONTAINERID bash`
-9. In the shell you just launched, run `dropdb -U discourse discourse`, then
-   `createdb -U discourse discourse`, then Ctrl+D or run `exit`
-10. In the second SSH session, run `zcat YOURAPPDOMAIN_db_DATE.sql.gz | docker exec -it CONTAINERID psql -U discourse`
-11. Exit the second SSH session
-12. Back in the first SSH session, Ctrl+C to shut down the database
-13. `abra app deploy YOURAPPDOMAIN`

abra.sh

@@ -1 +0,0 @@
-export DB_ENTRYPOINT_VERSION=v1

compose.yml

@@ -3,25 +3,23 @@ version: "3.8"
 
 services:
   app:
-    image: bitnami/discourse:3.3.1
+    image: bitnami/discourse:2.7.7
     networks:
       - proxy
       - internal
     # entrypoint: ['tail', '-f', '/dev/null']
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
-      - DISCOURSE_DATABASE_HOST=${STACK_NAME}_db
+      - DISCOURSE_HOST=${DOMAIN}
+      - DISCOURSE_DATABASE_HOST=db
+      - DISCOURSE_DATABASE_USER=discourse
       - DISCOURSE_DATABASE_NAME=discourse
       - DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
-      - DISCOURSE_DATABASE_USER=discourse
-      - DISCOURSE_HOST=${DOMAIN}
-      - DISCOURSE_NOTIFICATION_EMAIL
-      - DISCOURSE_SMTP_AUTH
       - DISCOURSE_SMTP_HOST
       - DISCOURSE_SMTP_PORT
-      - DISCOURSE_SMTP_PROTOCOL
       - DISCOURSE_SMTP_USER
-      - PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0
+      - DISCOURSE_SMTP_PROTOCOL
+      - DISCOURSE_SMTP_AUTH
     volumes:
       - 'discourse_data:/bitnami/discourse'
     secrets:
@@ -43,73 +41,59 @@ services:
         #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-        - "coop-cloud.${STACK_NAME}.version=0.7.0+3.3.1"
     healthcheck:
-      test: "ruby -e \"require 'uri'; require 'net/http'; uri = URI('http://localhost:3000/srv/status'); res = Net::HTTP.get_response(uri); if res.is_a?(Net::HTTPSuccess) then exit (0) else exit (1) end\""
+      test: ["CMD", "curl", "-f", "http://localhost:3000"]
       interval: 30s
       timeout: 10s
-      retries: 6
-      start_period: 5m
+      retries: 10
+      start_period: 1m
 
   db:
-    image: postgres:13
+    image: postgres:11-alpine
     networks:
       - internal
     secrets:
       - db_password
     volumes:
       - 'postgresql_data:/var/lib/postgresql/data'
-    configs:
-      - source: db_entrypoint
-        target: /docker-entrypoint.sh
-        mode: 0555
-    entrypoint: /docker-entrypoint.sh
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
       - POSTGRES_USER=discourse
       - POSTGRES_DB=discourse
       - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
-    deploy:
-      labels:
-        backupbot.backup: "true"
-        backupbot.backup.pre-hook: "bash -c 'PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup.sql'"
-        backupbot.backup.post-hook: "rm -rf /tmp/backup.sql"
-        backupbot.backup.path: "/tmp/backup.sql"
 
   redis:
-    image: redis:7.4-alpine
+    image: redis:6.0-alpine
     networks:
       - internal
     volumes:
       - 'redis_data:/data'
 
   sidekiq:
-    image: bitnami/discourse:3.3.1
+    image: bitnami/discourse:2.7.7
     networks:
-      - proxy
       - internal
     depends_on:
       - discourse
     volumes:
-      - 'discourse_data:/bitnami/discourse'
+      - 'sidekiq_data:/bitnami/discourse'
     command: /opt/bitnami/scripts/discourse-sidekiq/run.sh
     secrets:
       - db_password
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
+      - DISCOURSE_HOST=${DOMAIN}
       - DISCOURSE_DATABASE_HOST=db
-      - DISCOURSE_DATABASE_NAME=discourse
-      - DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
       - DISCOURSE_DATABASE_PORT_NUMBER=5432
       - DISCOURSE_DATABASE_USER=discourse
-      - DISCOURSE_HOST=${DOMAIN}
+      - DISCOURSE_DATABASE_NAME=discourse
       - DISCOURSE_REDIS_HOST=redis
       - DISCOURSE_REDIS_PORT_NUMBER=6379
+      - DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
       - DISCOURSE_SMTP_HOST
       - DISCOURSE_SMTP_PORT
-      - DISCOURSE_SMTP_PROTOCOL
       - DISCOURSE_SMTP_USER
-      - PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0
+      - DISCOURSE_SMTP_PROTOCOL
       - DISCOURSE_SMTP_AUTH
 
 secrets:
@@ -121,14 +105,9 @@ volumes:
   postgresql_data:
   redis_data:
   discourse_data:
+  sidekiq_data:
 
 networks:
   proxy:
     external: true
   internal:
-
-configs:
-  db_entrypoint:
-    name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
-    file: entrypoint.postgres.sh.tmpl
-    template_driver: golang

entrypoint.postgres.sh.tmpl

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-set -e
-
-MIGRATION_MARKER=$PGDATA/migration_in_progress
-OLDDATA=$PGDATA/old_data
-NEWDATA=$PGDATA/new_data
-
-echo "Running as $(id)"
-
-if [ -e $MIGRATION_MARKER ]; then
-  echo "FATAL: migration was started but did not complete in a previous run. manual recovery necessary"
-  exit 1
-fi
-
-if [ -f $PGDATA/PG_VERSION ]; then
-  DATA_VERSION=$(cat $PGDATA/PG_VERSION)
-
-  if [ -n "$DATA_VERSION" -a "$PG_MAJOR" != "$DATA_VERSION" ]; then
-    echo "postgres data version $DATA_VERSION found, but need $PG_MAJOR. Starting migration"
-    echo "Installing postgres $DATA_VERSION"
-    sed -i "s/$/ $DATA_VERSION/" /etc/apt/sources.list.d/pgdg.list
-    apt-get update && apt-get install -y --no-install-recommends \
-      postgresql-$DATA_VERSION \
-      && rm -rf /var/lib/apt/lists/*
-    echo "shuffling around"
-    gosu postgres mkdir $OLDDATA $NEWDATA
-    chmod 700 $OLDDATA $NEWDATA
-    mv $PGDATA/* $OLDDATA/ || true
-    touch $MIGRATION_MARKER
-    echo "running initdb"
-    # abuse entrypoint script for initdb by making server error out
-    gosu postgres bash -c "export PGDATA=$NEWDATA ; /usr/local/bin/docker-entrypoint.sh --invalid-arg || true"
-    echo "running pg_upgrade"
-    cd /tmp
-    gosu postgres pg_upgrade --link -b /usr/lib/postgresql/$DATA_VERSION/bin -d $OLDDATA -D $NEWDATA -U $POSTGRES_USER
-    cp $OLDDATA/pg_hba.conf $NEWDATA/
-    mv $NEWDATA/* $PGDATA
-    rm -rf $OLDDATA
-    rmdir $NEWDATA
-    rm $MIGRATION_MARKER
-    echo "migration complete"
-  fi
-fi
-
-/usr/local/bin/docker-entrypoint.sh postgres