From 6059ca000e68277dfc951bd56b6e46f65e860046 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 23 Sep 2022 07:06:35 +0000 Subject: caddy cloudflare plugin --- .gitignore | 1 + Caddyfile | 62 ++++++++++++++++++++++++++++++++++++++++++++------------------ prod.yml | 34 +++++++++++++++++++++++++++++----- 3 files changed, 74 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 788c079f..3b6aa213 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ docker-compose.mainnet.yml assets.json lm.yml lt.yml +caddy diff --git a/Caddyfile b/Caddyfile index 3dc0100b..16535102 100644 --- a/Caddyfile +++ b/Caddyfile @@ -1,19 +1,45 @@ -:80 { - handle_path /api* { - reverse_proxy app:3119 - } - - handle /lnurl* { - reverse_proxy app:3118 - } - - handle /ws* { - reverse_proxy app:3119 - } - - handle { - root * /coinos - try_files {path}.html {path} /index.html - file_server - } +classic.coinos.io { + handle_path /api* { + reverse_proxy app:3119 + } + + handle /lnurl* { + reverse_proxy app:3118 + } + + handle /ws* { + reverse_proxy app:3119 + } + + handle { + root * /coinos + try_files {path}.html {path} /index.html + file_server + } + + tls { + dns cloudflare {env.CLOUDFLARE_AUTH_TOKEN} + } +} + +coinos.io { + handle_path /api* { + reverse_proxy app:3119 + } + + handle /lnurl* { + reverse_proxy app:3118 + } + + handle /ws* { + reverse_proxy app:3119 + } + + handle { + reverse_proxy ui:3000 + } + + tls { + dns cloudflare {env.CLOUDFLARE_AUTH_TOKEN} + } } diff --git a/prod.yml b/prod.yml index 8080c2be..a2547e29 100644 --- a/prod.yml +++ b/prod.yml @@ -1,21 +1,35 @@ version: '3.6' services: caddy: + depends_on: + - app container_name: caddy - image: caddy:2 + image: gcr.io/coinos-326717/github.com/asoltys/caddy-cloudflare:latest restart: always ports: - "80:80" + - "443:443" volumes: - /var/coinos:/coinos - ./Caddyfile:/etc/caddy/Caddyfile - ./caddy:/data environment: - DOMAIN: "${DOMAIN}" + CLOUDFLARE_AUTH_TOKEN: "${CLOUDFLARE_AUTH_TOKEN}" networks: default: ipv4_address: 172.42.0.21 + ui: + depends_on: + - app + container_name: ui + image: gcr.io/coinos-326717/github.com/coinos/coinos-ui:prod + restart: always app: + depends_on: + - cl + - maria + - bitcoin + - liquid container_name: app image: gcr.io/coinos-326717/github.com/coinos/coinos-server:prod restart: always @@ -25,8 +39,6 @@ services: volumes: - ./:/app - ./logs:/logs - extra_hosts: - - host.docker.internal:host-gateway networks: default: ipv4_address: 172.42.0.22 @@ -36,6 +48,8 @@ services: restart: always environment: MARIADB_ROOT_PASSWORD: password + volumes: + - ./mysql:/var/lib/mysql bitcoin: image: ghcr.io/vulpemventures/bitcoin container_name: bitcoin @@ -55,22 +69,30 @@ services: default: ipv4_address: 172.42.0.24 cl: + depends_on: + - bitcoin image: elementsproject/lightningd:v0.12.0 container_name: cl restart: always volumes: - ./config/lightning:/root/.lightning ports: - - "9735:9735" + - "9736:9735" networks: default: ipv4_address: 172.42.0.25 lnd: + depends_on: + - bitcoin + - tor image: lightninglabs/lnd:v0.15.1-beta container_name: lnd volumes: - ./config/lnd:/root/.lnd - ./config/bitcoin:/root/.bitcoin + - ./config/tor:/etc/tor + ports: + - "9735:9735" restart: always networks: default: @@ -79,6 +101,8 @@ services: container_name: tor image: dperson/torproxy restart: always + volumes: + - ./config/tor:/etc/tor networks: default: ipv4_address: 172.42.0.27 -- cgit v1.2.3