From d71e885d6549555c22b51ffc3f0aacf3d16347d4 Mon Sep 17 00:00:00 2001 From: Thomas Hintz Date: Mon, 15 Sep 2025 16:38:05 -0700 Subject: [PATCH] Cleaning up. --- flatcar/app/Makefile | 2 - flatcar/app/app.service | 13 ------ flatcar/app/docker-compose.yaml | 25 ------------ flatcar/app/lb/Caddyfile | 17 -------- flatcar/app/nextcloud/docker-compose.yaml | 50 ----------------------- flatcar/app/wg-easy/docker-compose.yaml | 37 ----------------- 6 files changed, 144 deletions(-) delete mode 100644 flatcar/app/Makefile delete mode 100644 flatcar/app/app.service delete mode 100644 flatcar/app/docker-compose.yaml delete mode 100644 flatcar/app/lb/Caddyfile delete mode 100644 flatcar/app/nextcloud/docker-compose.yaml delete mode 100644 flatcar/app/wg-easy/docker-compose.yaml diff --git a/flatcar/app/Makefile b/flatcar/app/Makefile deleted file mode 100644 index 85ca201..0000000 --- a/flatcar/app/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -run: - sudo docker-compose -f docker-compose.yaml $(find . -mindepth 2 -maxdepth 2 -type f -name docker-compose.yaml -exec echo -f {} \;) up diff --git a/flatcar/app/app.service b/flatcar/app/app.service deleted file mode 100644 index bbba8b2..0000000 --- a/flatcar/app/app.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Main App -After=docker.service -Requires=docker.service -[Service] -TimeoutStartSec=0 -ExecStart=/bin/bash -c '/usr/bin/docker compose -f /app/docker-compose.yaml $(find /app -mindepth 2 -maxdepth 2 -type f -name docker-compose.yaml -exec echo -f {} \;) up' -ExecStop=/bin/bash -c '/usr/bin/docker compose -f /app/docker-compose.yaml $(find /app -mindepth 2 -maxdepth 2 -type f -name docker-compose.yaml -exec echo -f {} \;) stop' - -Restart=always -RestartSec=5s -[Install] -WantedBy=multi-user.target diff --git a/flatcar/app/docker-compose.yaml b/flatcar/app/docker-compose.yaml deleted file mode 100644 index 028fcdc..0000000 --- a/flatcar/app/docker-compose.yaml +++ /dev/null @@ -1,25 +0,0 @@ -version: '3' -services: - lb: - image: docker.io/caddy:2 - volumes: -# - /app/lb:/etc/caddy - - ./lb/:/etc/caddy - - config:/config - - data:/data - networks: - - lb - restart: unless-stopped - ports: - - "443:443" - - "80:80" - nginx: - image: nginx - restart: unless-stopped - networks: - - lb -networks: - lb: -volumes: - config: - data: diff --git a/flatcar/app/lb/Caddyfile b/flatcar/app/lb/Caddyfile deleted file mode 100644 index 60f2e03..0000000 --- a/flatcar/app/lb/Caddyfile +++ /dev/null @@ -1,17 +0,0 @@ -wg-easy1.nassella.cc { - reverse_proxy http://wg-easy:80 - - # tls internal - # x - # log -} - -nextcloud1.nassella.cc { - reverse_proxy http://nextcloud:80 - # tls internal -} - -root.nassella.cc { - reverse_proxy http://nginx:80 - # tls internal -} \ No newline at end of file diff --git a/flatcar/app/nextcloud/docker-compose.yaml b/flatcar/app/nextcloud/docker-compose.yaml deleted file mode 100644 index 1e7ab7a..0000000 --- a/flatcar/app/nextcloud/docker-compose.yaml +++ /dev/null @@ -1,50 +0,0 @@ -version: '3' - -services: - db: - image: postgres - shm_size: 128mb - restart: always - volumes: - - db:/var/lib/postgresql/data - environment: - - POSTGRES_DB=nextcloud - - POSTGRES_USER=nextcloud - - POSTGRES_PASSWORD=password - networks: - - internal - redis: - image: redis:alpine - restart: always - networks: - - internal - nextcloud: - image: nextcloud - environment: - - POSTGRES_HOST=db - - POSTGRES_DB=nextcloud - - POSTGRES_USER=nextcloud - - POSTGRES_PASSWORD=password - - NEXTCLOUD_ADMIN_PASSWORD=password - - NEXTCLOUD_ADMIN_USER=admin - - REDIS_HOST=redis - - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud1.nassella.cc - ports: - - "8080:80" - depends_on: - - redis - - db - networks: - - lb - - internal - volumes: - - nextcloud:/var/www - restart: unless-stopped -networks: - lb: - internal: - driver: bridge - internal: true -volumes: - db: - nextcloud: diff --git a/flatcar/app/wg-easy/docker-compose.yaml b/flatcar/app/wg-easy/docker-compose.yaml deleted file mode 100644 index aa00d2b..0000000 --- a/flatcar/app/wg-easy/docker-compose.yaml +++ /dev/null @@ -1,37 +0,0 @@ -version: '3' -services: - wg-easy: - image: ghcr.io/wg-easy/wg-easy:15 - environment: - - PORT=80 - ports: - - "51820:51820/udp" - networks: - lb: - wg: - ipv4_address: 10.42.42.42 -# ipv6_address: fdcc:ad94:bacf:61a3::2a - volumes: - - etc_wireguard:/etc/wireguard - - /lib/modules:/lib/modules:ro - restart: unless-stopped - cap_add: - - NET_ADMIN - - SYS_MODULE - sysctls: - - net.ipv4.ip_forward=1 - - net.ipv4.conf.all.src_valid_mark=1 - - net.ipv6.conf.all.disable_ipv6=0 - - net.ipv6.conf.all.forwarding=1 - - net.ipv6.conf.default.forwarding=1 -networks: - lb: - wg: - driver: bridge - ipam: - driver: default - config: - - subnet: 10.42.42.0/24 - - subnet: fdcc:ad94:bacf:61a3::/64 -volumes: - etc_wireguard: