From e9eaf89551be8ab4ab49060579311a147d8dbd84 Mon Sep 17 00:00:00 2001 From: Nemo <commits@captnemo.in> Date: Mon, 19 Aug 2024 11:53:35 +0530 Subject: [PATCH] switch from openvpn -> tailscale --- variables.tf | 5 ++--- znc.tf | 2 +- cloudflare/main.tf | 17 +---------------- docker/traefik.tf | 8 +++++--- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/variables.tf b/variables.tf index e628539..f111bb3 100644 --- a/variables.tf +++ a/variables.tf @@ -1,12 +1,11 @@ variable "ips" { type = map(string) default = { eth0 = "192.168.1.111" - tun0 = "10.8.0.14" - dovpn = "10.8.0.1" + ts = "100.107.166.2" static = "139.59.48.222" - droplet = "139.59.22.234" + ceylon = "10.139.144.88" } } diff --git a/znc.tf b/znc.tf index 1749a6b..3188568 100644 --- a/znc.tf +++ a/znc.tf @@ -14,7 +14,7 @@ { internal = "6697" external = "6697" - ip = var.ips["tun0"] + ip = var.ips["ts"] }, ] } diff --git a/cloudflare/main.tf b/cloudflare/main.tf index bd6b637..7f2736b 100644 --- a/cloudflare/main.tf +++ a/cloudflare/main.tf @@ -68,7 +68,7 @@ resource "cloudflare_record" "vpn" { zone_id = var.zone_id name = "vpn" - value = var.ips["tun0"] + value = var.ips["ts"] type = "A" } @@ -99,13 +99,6 @@ ttl = 3600 } -resource "cloudflare_record" "etcd" { - zone_id = var.zone_id - name = "etcd" - value = var.ips["dovpn"] - type = "A" -} - ######################## ## Mailgun Mailing Lists ######################## @@ -138,12 +131,4 @@ value = "mxb.mailgun.org" type = "MX" priority = 20 -} - -resource "cloudflare_record" "k8s" { - zone_id = var.zone_id - name = "k8s" - value = "10.8.0.1" - type = "A" - ttl = 3600 } diff --git a/docker/traefik.tf b/docker/traefik.tf index 5958bfd..badc319 100644 --- a/docker/traefik.tf +++ a/docker/traefik.tf @@ -20,13 +20,13 @@ ports { internal = 443 external = 443 - ip = var.ips["tun0"] + ip = var.ips["ts"] } ports { internal = 80 external = 80 - ip = var.ips["tun0"] + ip = var.ips["ts"] } upload { @@ -49,13 +49,13 @@ upload { content = file( - "/home/nemo/projects/personal/certs/lego/certificates/tatooine.club.crt", + "/home/nemo/projects/personal/certs/tatooine.club/fullchain.pem", ) file = "/etc/traefik/tatooine.club.crt" } upload { content = file( - "/home/nemo/projects/personal/certs/lego/certificates/tatooine.club.key", + "/home/nemo/projects/personal/certs/tatooine.club/privkey.pem", ) file = "/etc/traefik/tatooine.club.key" } -- rgit 0.1.5