From 697923d11e4cdc926f319dcc1cc4b843713b86b4 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 13 Jan 2022 14:29:23 +0100
Subject: [PATCH 1/5] Added extra woodpecker agent

---
 stacks/woodpecker.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/stacks/woodpecker.yml b/stacks/woodpecker.yml
index 4f4d527..4ada1b8 100644
--- a/stacks/woodpecker.yml
+++ b/stacks/woodpecker.yml
@@ -56,7 +56,7 @@ services:
     volumes:
       - 'db-data:/var/lib/postgresql/data'
 
-  agent:
+  agent-1:
     image: 'woodpeckerci/woodpecker-agent:latest'
     command: agent
 
@@ -64,7 +64,23 @@ services:
       mode: 'global'
       placement:
         constraints:
-          - 'node.labels.class.ci==true'
+          - 'node.hostname==gamma'
+
+    environment:
+      - 'WOODPECKER_SERVER=app:9000'
+      - 'WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET}'
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+
+  agent-2:
+    image: 'woodpeckerci/woodpecker-agent:latest'
+    command: agent
+
+    deploy:
+      mode: 'global'
+      placement:
+        constraints:
+          - 'node.hostname==alpha'
 
     environment:
       - 'WOODPECKER_SERVER=app:9000'

From 04192c1ba8331dfb27e38af4a607053fd67f0950 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 14 Jan 2022 09:07:46 +0100
Subject: [PATCH 2/5] Pinned signald version; disabled IPv6

---
 ansible/roles/docker/files/daemon.json | 4 +---
 stacks/matrix.yml                      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/docker/files/daemon.json b/ansible/roles/docker/files/daemon.json
index 39cfead..123edbc 100644
--- a/ansible/roles/docker/files/daemon.json
+++ b/ansible/roles/docker/files/daemon.json
@@ -2,7 +2,5 @@
     "metrics-addr" : "0.0.0.0:9323",
     "experimental" : true,
     "mtu": 1450,
-    "network-control-plane-mtu": 1450,
-    "ipv6": true,
-    "fixed-cidr-v6": "fd00::/80"
+    "network-control-plane-mtu": 1450
 }
diff --git a/stacks/matrix.yml b/stacks/matrix.yml
index 1a1454d..59987b1 100644
--- a/stacks/matrix.yml
+++ b/stacks/matrix.yml
@@ -94,7 +94,7 @@ services:
       - 'signald:/signald'
 
   signald:
-    image: 'signald/signald:latest'
+    image: 'signald/signald:0.16.1'
 
     deploy:
       mode: 'replicated'

From 92110888dc608ec8fb61916fb5f96a38267a763f Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 14 Jan 2022 19:45:52 +0100
Subject: [PATCH 3/5] Exposed woodpecker agent port

---
 stacks/woodpecker.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/stacks/woodpecker.yml b/stacks/woodpecker.yml
index 4ada1b8..12add25 100644
--- a/stacks/woodpecker.yml
+++ b/stacks/woodpecker.yml
@@ -31,6 +31,9 @@ services:
     networks:
       - default
       - public
+    ports:
+      # Used for external agents to connect
+      - 9000:9000
 
   db:
     image: 'postgres:14.1-alpine'

From 444a0b8bd8fcd12a7040840cb1a35314184604f0 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 15 Jan 2022 22:03:41 +0100
Subject: [PATCH 4/5] Updated matrix config version

---
 stacks/matrix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stacks/matrix.yml b/stacks/matrix.yml
index 59987b1..32781b9 100644
--- a/stacks/matrix.yml
+++ b/stacks/matrix.yml
@@ -24,7 +24,7 @@ services:
         - 'traefik.http.middlewares.cors-headers.headers.accessControlAllowMethods=GET, POST, PUT, DELETE, OPTIONS'
 
     configs:
-      - source: conduit_v4
+      - source: conduit_v5
         target: '/srv/conduit/conduit.toml'
     networks:
       - 'default'

From 9260fd7efb22169fa7c655d7081ac8a3083b1814 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 15 Jan 2022 22:04:21 +0100
Subject: [PATCH 5/5] Oops

---
 stacks/matrix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stacks/matrix.yml b/stacks/matrix.yml
index 32781b9..0e172e8 100644
--- a/stacks/matrix.yml
+++ b/stacks/matrix.yml
@@ -148,7 +148,7 @@ services:
       - 'irc:/data'
 
 configs:
-  conduit_v4:
+  conduit_v5:
     external: true
 
 networks: