From 35c87c80c18b1970ef65362ce2b59de26880ff3b Mon Sep 17 00:00:00 2001
From: Peter Wood <peter@peterwood.dev>
Date: Thu, 12 Jun 2025 10:10:18 -0400
Subject: [PATCH] saving my changes before the server wipe

---
 karakeep/.env.example                |  2 +-
 n8n/compose.yml                      | 18 ++++++++++--------
 n8n/init-data.sh                     | 13 +++++++++++++
 tailscale-subnet-router/compose.yaml | 19 +++++++++++++++++++
 tailscale-subnet-router/resolv.conf  |  2 ++
 5 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100755 n8n/init-data.sh
 create mode 100644 tailscale-subnet-router/compose.yaml
 create mode 100644 tailscale-subnet-router/resolv.conf

diff --git a/karakeep/.env.example b/karakeep/.env.example
index 242d71b..3f1b0ba 100644
--- a/karakeep/.env.example
+++ b/karakeep/.env.example
@@ -1,5 +1,5 @@
 
-HOARDER_VERSION=release
+KARAKEEP_VERSION=release
 # openssl rand -base64 18
 NEXTAUTH_SECRET=
 OPENAI_API_KEY=
diff --git a/n8n/compose.yml b/n8n/compose.yml
index f0ba4ef..9eb1b66 100644
--- a/n8n/compose.yml
+++ b/n8n/compose.yml
@@ -1,8 +1,6 @@
-version: '3.8'
-
 volumes:
-  db_storage:
-  n8n_storage:
+  db_data:
+  n8n_data:
 
 services:
   postgres:
@@ -15,14 +13,15 @@ services:
       - POSTGRES_NON_ROOT_USER
       - POSTGRES_NON_ROOT_PASSWORD
     volumes:
-      - db_storage:/var/lib/postgresql/data
+      - db_data:/var/lib/postgresql/data
       - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -h localhost -U ${POSTGRES_USER} -d ${POSTGRES_DB}']
+      test:
+        - CMD-SHELL
+        - pg_isready -h localhost -U ${POSTGRES_USER} -d ${POSTGRES_DB}
       interval: 5s
       timeout: 5s
       retries: 10
-
   n8n:
     image: docker.n8n.io/n8nio/n8n
     restart: always
@@ -33,12 +32,15 @@ services:
       - DB_POSTGRESDB_DATABASE=${POSTGRES_DB}
       - DB_POSTGRESDB_USER=${POSTGRES_NON_ROOT_USER}
       - DB_POSTGRESDB_PASSWORD=${POSTGRES_NON_ROOT_PASSWORD}
+      - N8N_ENCRYPTION_KEY=${N8N_ENCRYPTION_KEY}
+      - N8N_RUNNERS_ENABLED=true
     ports:
       - 5678:5678
     links:
       - postgres
     volumes:
-      - n8n_storage:/home/node/.n8n
+      - n8n_data:/home/node/.n8n
     depends_on:
       postgres:
         condition: service_healthy
+
diff --git a/n8n/init-data.sh b/n8n/init-data.sh
new file mode 100755
index 0000000..f98a972
--- /dev/null
+++ b/n8n/init-data.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e;
+
+
+if [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${POSTGRES_NON_ROOT_PASSWORD:-}" ]; then
+	psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+		CREATE USER ${POSTGRES_NON_ROOT_USER} WITH PASSWORD '${POSTGRES_NON_ROOT_PASSWORD}';
+		GRANT ALL PRIVILEGES ON DATABASE ${POSTGRES_DB} TO ${POSTGRES_NON_ROOT_USER};
+		GRANT CREATE ON SCHEMA public TO ${POSTGRES_NON_ROOT_USER};
+	EOSQL
+else
+	echo "SETUP INFO: No Environment variables given!"
+fi
diff --git a/tailscale-subnet-router/compose.yaml b/tailscale-subnet-router/compose.yaml
new file mode 100644
index 0000000..3de7ff7
--- /dev/null
+++ b/tailscale-subnet-router/compose.yaml
@@ -0,0 +1,19 @@
+services:
+  tailscale:
+    image: tailscale/tailscale
+    container_name: tailscale-subnet-router
+    hostname: docker-router
+    environment:
+      - TS_EXTRA_ARGS=--advertise-routes=192.168.68.0/24 --ssh --advertise-exit-node --reset
+      - TS_STATE_DIR=/var/lib/tailscale
+      - TS_USERSPACE=false
+    volumes:
+      - /var/lib/tailscale:/var/lib/tailscale
+      - /dev/net/tun:/dev/net/tun
+    network_mode: host
+    cap_add:
+      - net_admin
+      - net_raw
+    restart: unless-stopped
+volumes:
+  tailscale-data:
diff --git a/tailscale-subnet-router/resolv.conf b/tailscale-subnet-router/resolv.conf
new file mode 100644
index 0000000..8967ec1
--- /dev/null
+++ b/tailscale-subnet-router/resolv.conf
@@ -0,0 +1,2 @@
+nameserver 1.1.1.1
+nameserver 9.9.9.9