v7.0.3

dendrite/Dockerfile

@@ -1,6 +1,6 @@
-FROM matrixdotorg/dendrite-monolith:v0.13.3
+FROM matrixdotorg/dendrite-monolith:v0.13.4
 
-RUN apk --update --no-cache add envsubst tini
+RUN apk --update --no-cache add envsubst tini postgresql-client
 
 COPY dendrite.in.yaml /etc/dendrite/
 COPY docker-entrypoint.sh /

dendrite/TODO

@@ -1,3 +1,5 @@
+* file upload/download
+* 3pid/email/requestToken untrusted server '' thirdpid config of phone and email failing
 * video/voice calls
   https://landchad.net/coturn/
   https://landchad.net/dendrite/

dendrite/dendrite.in.yaml

@@ -68,7 +68,7 @@ global:
   # sections. For monolith deployments using SQLite databases,
   # you must configure the "database" block for each component instead.
   database:
-    connection_string: ${DATABASE_URL}
+    connection_string: ${DATABASE_URL}?sslmode=disable
     max_open_conns: 90
     max_idle_conns: 5
     conn_max_lifetime: -1
@@ -108,6 +108,7 @@ global:
   trusted_third_party_id_servers:
     - matrix.org
     - vector.im
+    - matrix.burd.me
 
   # Disables federation. Dendrite will not be able to communicate with other servers
   # in the Matrix federation and the federation API will not be exposed.
@@ -339,7 +340,7 @@ sync_api:
   # This option controls which HTTP header to inspect to find the real remote IP
   # address of the client. This is likely required if Dendrite is running behind
   # a reverse proxy server.
-  # real_ip_header: X-Real-IP
+  real_ip_header: X-Client-IP
 
   # Configuration for the full-text search engine.
   search:

dendrite/fly.toml

@@ -3,6 +3,9 @@
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
+[env]
+  FLY_SCALE_TO_ZERO = "1h"
+
 app = "burd-infra-dendrite"
 primary_region = "bos"
 kill_signal = "SIGINT"

docker/README.md

@@ -5,9 +5,8 @@ This deploys a Docker Daemon running on Fly.io which you can used to offload bui
 ## Installation
 
 1. Clone this repository
-1. `fly launch`, follow the prompts
+1. `fly launch --no-deploy`, follow the prompts
-1. Select `n` when it asks if you want to deploy
+1. Create a volume in a region of your choice: `fly volumes create data --size 50 --region bos`
-1. Create a volume in a region of your choice: `fly volumes create data --size 50 --region ord`
 1. Deploy
 
 ## Get Connected
@@ -17,7 +16,7 @@ This deploys a Docker Daemon running on Fly.io which you can used to offload bui
 1. `fly ips private` to get the IP of your Daemon
 1. Set the `DOCKER_HOST` env variable using that IP:
     ```
-    export DOCKER_HOST=tcp://[fdaa:0:5d2:a7b:81:0:26d4:2]:2375
+    export DOCKER_HOST=tcp://[fdaa:1:c1ea:a7b:1ed:2ce6:bb1e:2]:2375
     ```
 
 # Final Step

docker/fly.toml

@@ -1,13 +1,22 @@
-app = "burd-infra-docker-machine"
+# fly.toml app configuration file generated for burd-infra-docker-machine on 2023-11-22T14:28:06-05:00
-kill_signal = "SIGINT"
+#
-kill_timeout = 5
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
 
-[mounts]
+app = "burd-infra-docker-machine"
-  destination = "/data"
+primary_region = "bos"
+kill_signal = "SIGINT"
+kill_timeout = "5s"
+
+[build]
+
+[[mounts]]
   source = "docker_data"
+  destination = "/data"
 
 [[services]]
   protocol = "tcp"
   internal_port = 2375
+
   [[services.ports]]
     port = 2375

drone/README.md

@@ -33,6 +33,20 @@ This deploys Drone.io, CI builder for Forgejo (was Gitea).
 1. Delete the Docker Engine from your local system.
 1. You probably want to scale your remote Daemon: `fly scale vm dedicated-cpu-2x` and `fly scale memory 2048`
 
+```shell
+docker run --detach \
+  --volume=/var/run/docker.sock:/var/run/docker.sock \
+  --env=DRONE_RPC_PROTO=https \
+  --env=DRONE_RPC_HOST=build.burd.me \
+  --env=DRONE_RPC_SECRET=70619c6241d757e8935c9a7d \
+  --env=DRONE_RUNNER_CAPACITY=2 \
+  --env=DRONE_RUNNER_NAME=my-laptop-runner \
+  --publish=3000:3000 \
+  --name=runner \
+  drone/drone-runner-docker:1
+```
+  --restart=always \
+
 # NOTES:
 
 * https://docs.drone.io/server/provider/gitea/

drone/fly.toml

@@ -9,6 +9,7 @@ kill_signal = "SIGINT"
 kill_timeout = "5s"
 
 [experimental]
+  allowed_public_ports = []
   auto_rollback = true
 
 [build]
@@ -18,7 +19,7 @@ kill_timeout = "5s"
   DRONE_JSONNET_ENABLED = "true"
   DRONE_REGISTRATION_CLOSED = "true"
   DRONE_RPC_HOST = "build.burd.me"
-  DRONE_RPC_PROTO = "https"
+  DRONE_RPC_PROTO = "http"
   DRONE_RUNNER_CAPACITY = "1"
   DRONE_SERVER_HOST = "build.burd.me"
   DRONE_SERVER_PROTO = "https"
@@ -34,8 +35,10 @@ kill_timeout = "5s"
   processes = ["server"]
 
 [[services]]
+  http_checks = []
   protocol = "tcp"
   internal_port = 80
+  script_checks = []
   processes = ["server"]
 
   [[services.ports]]
@@ -54,4 +57,5 @@ kill_timeout = "5s"
   [[services.tcp_checks]]
     interval = "15s"
     timeout = "2s"
+    restart_limit = 0
     grace_period = "1s"

forgejo/fly.toml

@@ -13,7 +13,7 @@ swap_size_mb = 512
   auto_rollback = true
 
 [build]
-  image = "codeberg.org/forgejo/forgejo:1.20.5-0"
+  image = "codeberg.org/forgejo/forgejo:7.0.3"
 
 [env]
   GITEA____APP_NAME = "git.burd.me: Git for us"
@@ -51,6 +51,7 @@ swap_size_mb = 512
   # GITEA__storage__MINIO_SECRET_ACCESS_KEY = [use fly secrets set ..., see README.md]
   GITEA__storage__MINIO_BUCKET = "burd-infra-forgejo-4276-a538"
   GITEA__storage__MINIO_LOCATION = "us-west-000"
+  GITEA__storage__MINIO_CHECKSUM_ALGORITHM = "md5"
 
 [[mounts]]
   source = "forgejo_data"

shell.nix

@@ -5,6 +5,8 @@ pkgs.mkShell {
   nativeBuildInputs = with pkgs.buildPackages; [
     ripgrep
     envsubst
+    postgresql
+    netlify-cli
   ];
   DOCKER_BUILDKIT = 1;
 }