chore: publish 2.4.2+0.77.3 release

README.md

@@ -22,13 +22,12 @@ Wiki and knowledge base for growing teams
 3. `abra app new ${REPO_NAME}`
    - **WARNING**: Choose "n" when `abra` asks if you'd like to generate secrets
 4. `abra app config YOURAPPNAME` - be sure to change `$DOMAIN` to something that resolves to
-   your Docker swarm box. For Minio, you'll want:
-   - `AWS_ACCESS_KEY_ID=<minio username>`
-   - `AWS_REGION="us-east-1"`
-   - `AWS_S3_UPLOAD_BUCKET_URL=https://minio.example.com`
-   - `AWS_S3_UPLOAD_BUCKET_NAME=
-5. `abra app deploy YOURAPPNAME`
-7. Open the configured domain in your browser to finish set-up
+   your Docker swarm box
+5. Insert secrets:
+    - `abra app secret insert YOURAPPNAME secret_key v1 $(openssl rand -hex 32)` #12
+    - `abra app secret generate -a YOURAPPNAME`
+6. `abra app deploy YOURAPPNAME`
+8. Open the configured domain in your browser to finish set-up
 
 [`abra`]: https://git.coopcloud.tech/coop-cloud/abra
 [`coop-cloud/traefik`]: https://git.coopcloud.tech/coop-cloud/traefik
@@ -41,14 +40,6 @@ Wiki and knowledge base for growing teams
 abra app cmd YOURAPPNAME app create_email_user test@example.com
 ```
 
-### Post-deploy migration
-
-```
-abra app cmd YOURAPPNAME app migrate
-```
-
-_As of 2022-03-30, this requires `abra` RC version, run `abra upgrade --rc`._
-
 ### Setting up your `.env` config
 
 Avoid the use of quotes (`"..."`) as much as possible, the NodeJS scripts flip out for some reason on some vars.
@@ -61,7 +52,24 @@ Where `<username-to-delete>` is the username of the user to be removed, and
 `<username-to-replace>` is the username of another user, to assign documents and
 revisions to (instead of deleting them).
 
-_As of 2022-03-30, this requires `abra` RC version, run `abra upgrade --rc`._
+### Migrate from S3 to local storage
+
+- `abra app config <domain>`, add
+  - `COMPOSE_FILE="$COMPOSE_FILE:compose.local.yml"`
+  - `FILE_STORAGE_UPLOAD_MAX_SIZE=26214400`
+- `abra app deploy <domain> -f`
+  - compose.aws.yml should still be deployed!
+- `abra app undeploy <domain>`
+- on the docker host, find mountpoint of newly created volume via `docker volume ls` and `docker volume inspect`
+  - volume name is smth like `<domain>_storage-data`
+- take note which linux user owns `<storage_mountpoint>` (likely `1001`)
+- use s3cmd/rclone/... to sync your bucket to `<storage_mountpoint>`
+- `chown -R <storage_user>:<storage_user> <storage_mountpoint>`
+- `abra app config <domain>`, switch storage backend
+  - remove `AWS_*` vars, `SECRET_AWS_SECRET_KEY_VERSION` and `COMPOSE_FILE="$COMPOSE_FILE:compose.aws.yml"`
+  - set `FILE_STORAGE=local`
+- `abra app deploy <domain> -f`
+- enjoy getting rid of S3 🥳
 
 ## Single Sign On with Keycloak
 

abra.sh

@@ -1,4 +1,4 @@
-export APP_ENTRYPOINT_VERSION=v8
+export APP_ENTRYPOINT_VERSION=v9
 export DB_ENTRYPOINT_VERSION=v2
 
 create_email_user() {

alaconnect.yml

@@ -0,0 +1,15 @@
+authentik:
+    env: 
+        OIDC_CLIENT_ID: outline
+        OIDC_AUTH_URI: https://authentik.example.com/application/o/authorize/
+        OIDC_TOKEN_URI: https://authentik.example.com/application/o/token/
+        OIDC_USERINFO_URI: https://authentik.example.com/application/o/userinfo/
+        OIDC_DISPLAY_NAME: "Authentik"
+    uncomment:
+        - compose.oidc.yml
+        - OIDC_ENABLED
+        - OIDC_USERNAME_CLAIM
+        - OIDC_SCOPES
+        - SECRET_OIDC_CLIENT_SECRET_VERSION
+    shared_secrets:
+        outline_secret: oidc_client_secret

compose.local.yml

@@ -8,6 +8,10 @@ services:
     environment:
       - FILE_STORAGE
       - FILE_STORAGE_UPLOAD_MAX_SIZE
+    deploy:
+      labels:
+        backupbot.backup: "true"
+        backupbot.backup.path: "/var/lib/outline/data/"
 
 volumes:
   storage-data:

compose.yml

@@ -6,7 +6,7 @@ services:
     networks:
       - backend
       - proxy
-    image: outlinewiki/outline:0.73.1
+    image: outlinewiki/outline:0.77.3
     secrets:
       - db_password
       - secret_key
@@ -34,19 +34,19 @@ 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=1.1.0+0.73.1"
+        - "coop-cloud.${STACK_NAME}.version=2.4.2+0.77.3"
         ## Redirect from EXTRA_DOMAINS to DOMAIN
         #- "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}"
 
   cache:
-    image: redis:7.2.3
+    image: redis:7.2.5
     networks:
       - backend
 
   db:
-    image: postgres:15.5
+    image: postgres:16.3
     networks:
       - backend
     secrets:
@@ -65,9 +65,9 @@ services:
     deploy:
       labels:
         backupbot.backup: "true"
-        backupbot.backup.path: "/tmp/dump.sql.gz"
-        backupbot.backup.post-hook: "rm -f /tmp/dump.sql.gz"
-        backupbot.backup.pre-hook: "sh -c 'PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U outline outline | gzip > /tmp/dump.sql.gz'"
+        backupbot.backup.path: "/var/lib/postgresql/data/dump.sql.gz"
+        backupbot.backup.post-hook: "rm -f /var/lib/postgresql/data/dump.sql.gz"
+        backupbot.backup.pre-hook: "sh -c 'PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U outline outline | gzip > /var/lib/postgresql/data/dump.sql.gz'"
 
 secrets:
   secret_key:

release/2.0.0+0.74.0

@@ -0,0 +1,4 @@
+Due to the introduction of local storage, you need to adapt your config to continue using S3 storage. Just add the following lines to your config:
+
+FILE_STORAGE=s3
+COMPOSE_FILE="$COMPOSE_FILE:compose.aws.yml"