From 7e797e4a4dc196b98d1248e5659574e5a13e70f9 Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 9 Aug 2021 10:23:59 +0300 Subject: [PATCH] Version updates (#24) * Version updates * Cleanup * Rewrite adguard as docker_container * Adjustments --- k8s/httpbin/deployment.yaml | 22 +++ k8s/httpbin/ingress.yaml | 18 ++ k8s/httpbin/manifest.yaml | 38 +++++ k8s/httpbin/service.yaml | 12 ++ .../storage-appdata/.terraform.lock.hcl | 1 + .../_local/storage-appdata/terragrunt.hcl | 2 +- .../storage-compose/.terraform.lock.hcl | 22 +++ .../_local/storage-compose/terragrunt.hcl | 17 ++ .../_local/storage-downloads/terragrunt.hcl | 2 +- src/live/_local/storage-root/terragrunt.hcl | 2 +- .../storage-torrents-blackhole/terragrunt.hcl | 2 +- src/live/adguard-exporter/.terraform.lock.hcl | 21 +++ src/live/adguard-exporter/terragrunt.hcl | 19 +++ src/live/adguard/.terraform.lock.hcl | 1 + src/live/adguard/terragrunt.hcl | 2 +- src/live/code-server/.terraform.lock.hcl | 1 + src/live/code-server/terragrunt.hcl | 14 +- src/live/dozzle/.terraform.lock.hcl | 1 + src/live/dozzle/terragrunt.hcl | 2 +- src/live/env.hcl | 6 +- src/live/grafana/.terraform.lock.hcl | 1 + src/live/grafana/terragrunt.hcl | 14 +- src/live/httpbin/.terraform.lock.hcl | 1 + src/live/httpbin/terragrunt.hcl | 2 +- src/live/jackett/.terraform.lock.hcl | 1 + src/live/jackett/terragrunt.hcl | 2 +- src/live/mounts.hcl | 1 + src/live/network-torrents/terragrunt.hcl | 2 +- src/live/node-exporter/.terraform.lock.hcl | 1 + src/live/node-exporter/terragrunt.hcl | 2 +- src/live/plex/.terraform.lock.hcl | 1 + src/live/plex/terragrunt.hcl | 2 +- src/live/prometheus/.terraform.lock.hcl | 1 + src/live/prometheus/terragrunt.hcl | 2 +- src/live/qbittorrent/terragrunt.hcl | 2 +- src/live/radarr/terragrunt.hcl | 2 +- src/live/sonarr/.terraform.lock.hcl | 3 +- src/live/sonarr/terragrunt.hcl | 2 +- src/live/tautulli/.terraform.lock.hcl | 3 +- src/live/tautulli/terragrunt.hcl | 2 +- src/modules/adguard-exporter/main.tf | 66 ++++++++ src/modules/adguard-exporter/outputs.tf | 3 + src/modules/adguard-exporter/vars.tf | 53 ++++++ src/modules/adguard/main.tf | 76 +++------ src/modules/adguard/vars.tf | 22 --- src/modules/code-server/main.tf | 7 +- src/modules/grafana/main.tf | 5 +- src/modules/grafana/vars.tf | 19 +++ src/modules/node-exporter/main.tf | 5 - src/modules/plex/outputs.tf | 4 - src/modules/prometheus/main.tf | 2 +- src/modules/prometheus/vars.tf | 6 + src/modules/tautulli/main.tf | 2 +- src/modules/tautulli/vars.tf | 7 + stacks/faas/docker-stack.yml | 155 ------------------ stacks/swarmpit/docker-stack.yml | 87 ---------- terraform/.gitignore | 4 - terraform/.terraform.lock.hcl | 57 ------- terraform/lib/constants/outputs.tf | 26 --- terraform/lib/image/main.tf | 8 - terraform/lib/image/outputs.tf | 3 - terraform/lib/image/providers.tf | 7 - terraform/lib/image/vars.tf | 10 -- terraform/lib/traefik-labels/outputs.tf | 12 -- terraform/lib/traefik-labels/vars.tf | 20 --- terraform/lib/volume/main.tf | 12 -- terraform/lib/volume/outputs.tf | 7 - terraform/lib/volume/providers.tf | 7 - terraform/lib/volume/vars.tf | 15 -- terraform/main.tf | 16 -- terraform/modules/media/main.tf | 25 --- terraform/modules/media/ombi/main.tf | 61 ------- terraform/modules/media/ombi/outputs.tf | 7 - terraform/modules/media/ombi/providers.tf | 7 - terraform/modules/media/ombi/vars.tf | 27 --- terraform/modules/media/outputs.tf | 33 ---- terraform/modules/media/providers.tf | 7 - terraform/modules/media/vars.tf | 11 -- terraform/modules/media/xteve/main.tf | 58 ------- terraform/modules/media/xteve/outputs.tf | 7 - terraform/modules/media/xteve/providers.tf | 7 - terraform/modules/media/xteve/vars.tf | 21 --- terraform/modules/proxy/main.tf | 18 -- terraform/modules/proxy/outputs.tf | 14 -- terraform/modules/proxy/providers.tf | 7 - terraform/modules/proxy/traefik/config.tf | 18 -- .../proxy/traefik/config/traefik.yaml.tpl | 13 -- terraform/modules/proxy/traefik/main.tf | 73 --------- terraform/modules/proxy/traefik/outputs.tf | 7 - terraform/modules/proxy/traefik/providers.tf | 7 - terraform/modules/proxy/traefik/vars.tf | 26 --- terraform/modules/proxy/vars.tf | 15 -- terraform/outputs.tf | 9 - terraform/providers.tf | 22 --- terraform/vars.tf | 22 --- 95 files changed, 418 insertions(+), 1079 deletions(-) create mode 100644 k8s/httpbin/deployment.yaml create mode 100644 k8s/httpbin/ingress.yaml create mode 100644 k8s/httpbin/manifest.yaml create mode 100644 k8s/httpbin/service.yaml create mode 100644 src/live/_local/storage-compose/.terraform.lock.hcl create mode 100644 src/live/_local/storage-compose/terragrunt.hcl create mode 100644 src/live/adguard-exporter/.terraform.lock.hcl create mode 100644 src/live/adguard-exporter/terragrunt.hcl create mode 100644 src/modules/adguard-exporter/main.tf create mode 100644 src/modules/adguard-exporter/outputs.tf create mode 100644 src/modules/adguard-exporter/vars.tf delete mode 100644 stacks/faas/docker-stack.yml delete mode 100644 stacks/swarmpit/docker-stack.yml delete mode 100644 terraform/.gitignore delete mode 100644 terraform/.terraform.lock.hcl delete mode 100644 terraform/lib/constants/outputs.tf delete mode 100644 terraform/lib/image/main.tf delete mode 100644 terraform/lib/image/outputs.tf delete mode 100644 terraform/lib/image/providers.tf delete mode 100644 terraform/lib/image/vars.tf delete mode 100644 terraform/lib/traefik-labels/outputs.tf delete mode 100644 terraform/lib/traefik-labels/vars.tf delete mode 100644 terraform/lib/volume/main.tf delete mode 100644 terraform/lib/volume/outputs.tf delete mode 100644 terraform/lib/volume/providers.tf delete mode 100644 terraform/lib/volume/vars.tf delete mode 100644 terraform/main.tf delete mode 100644 terraform/modules/media/main.tf delete mode 100644 terraform/modules/media/ombi/main.tf delete mode 100644 terraform/modules/media/ombi/outputs.tf delete mode 100644 terraform/modules/media/ombi/providers.tf delete mode 100644 terraform/modules/media/ombi/vars.tf delete mode 100644 terraform/modules/media/outputs.tf delete mode 100644 terraform/modules/media/providers.tf delete mode 100644 terraform/modules/media/vars.tf delete mode 100644 terraform/modules/media/xteve/main.tf delete mode 100644 terraform/modules/media/xteve/outputs.tf delete mode 100644 terraform/modules/media/xteve/providers.tf delete mode 100644 terraform/modules/media/xteve/vars.tf delete mode 100644 terraform/modules/proxy/main.tf delete mode 100644 terraform/modules/proxy/outputs.tf delete mode 100644 terraform/modules/proxy/providers.tf delete mode 100644 terraform/modules/proxy/traefik/config.tf delete mode 100644 terraform/modules/proxy/traefik/config/traefik.yaml.tpl delete mode 100644 terraform/modules/proxy/traefik/main.tf delete mode 100644 terraform/modules/proxy/traefik/outputs.tf delete mode 100644 terraform/modules/proxy/traefik/providers.tf delete mode 100644 terraform/modules/proxy/traefik/vars.tf delete mode 100644 terraform/modules/proxy/vars.tf delete mode 100644 terraform/outputs.tf delete mode 100644 terraform/providers.tf delete mode 100644 terraform/vars.tf diff --git a/k8s/httpbin/deployment.yaml b/k8s/httpbin/deployment.yaml new file mode 100644 index 00000000..2f8528f9 --- /dev/null +++ b/k8s/httpbin/deployment.yaml @@ -0,0 +1,22 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: httpbin +spec: + replicas: 1 + selector: + matchLabels: + app: httpbin + version: v1 + template: + metadata: + labels: + app: httpbin + version: v1 + spec: + containers: + - image: docker.io/kennethreitz/httpbin + imagePullPolicy: IfNotPresent + name: httpbin + ports: + - containerPort: 80 diff --git a/k8s/httpbin/ingress.yaml b/k8s/httpbin/ingress.yaml new file mode 100644 index 00000000..e5d1f803 --- /dev/null +++ b/k8s/httpbin/ingress.yaml @@ -0,0 +1,18 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: httpbin + annotations: + kubernetes.io/ingress.class: public +spec: + rules: + - host: home.io + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: httpbin + port: + number: 80 diff --git a/k8s/httpbin/manifest.yaml b/k8s/httpbin/manifest.yaml new file mode 100644 index 00000000..177b3fb6 --- /dev/null +++ b/k8s/httpbin/manifest.yaml @@ -0,0 +1,38 @@ +--- +kind: Service +apiVersion: v1 +metadata: + name: doks-example +spec: + type: LoadBalancer +# externalIPs: +# - 192.168.29.242 + selector: + app: doks-example + ports: + - name: http + protocol: TCP + port: 80 + targetPort: 80 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: doks-example +spec: + replicas: 2 + selector: + matchLabels: + app: doks-example + template: + metadata: + labels: + app: doks-example + spec: + containers: + - name: nginx + image: digitalocean/doks-example + imagePullPolicy: "Always" + ports: + - containerPort: 80 + protocol: TCP diff --git a/k8s/httpbin/service.yaml b/k8s/httpbin/service.yaml new file mode 100644 index 00000000..f052ec83 --- /dev/null +++ b/k8s/httpbin/service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: httpbin +spec: + type: LoadBalancer + selector: + app: httpbin + ports: + - protocol: TCP + port: 80 + targetPort: 8900 diff --git a/src/live/_local/storage-appdata/.terraform.lock.hcl b/src/live/_local/storage-appdata/.terraform.lock.hcl index 4350477f..ceaab274 100644 --- a/src/live/_local/storage-appdata/.terraform.lock.hcl +++ b/src/live/_local/storage-appdata/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/_local/storage-appdata/terragrunt.hcl b/src/live/_local/storage-appdata/terragrunt.hcl index 0055dcaf..d117c3ad 100644 --- a/src/live/_local/storage-appdata/terragrunt.hcl +++ b/src/live/_local/storage-appdata/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../../modules/local-mount" + source = "../../..//modules/local-mount" } include { diff --git a/src/live/_local/storage-compose/.terraform.lock.hcl b/src/live/_local/storage-compose/.terraform.lock.hcl new file mode 100644 index 00000000..a0a0ad9f --- /dev/null +++ b/src/live/_local/storage-compose/.terraform.lock.hcl @@ -0,0 +1,22 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/kreuzwerker/docker" { + version = "2.14.0" + hashes = [ + "h1:3XKyNQqQ2P4iL/1bqa6KuhasquQ4ioWvyoNktjrKEq4=", + "zh:2c79f6e150c6f638310f4d52dcc789a112ac76fb3c6173fb1db9fae95d32a7f0", + "zh:35564e66530b7a638a56dd885b9a5063c366d1e25f81a5e27da8ae6660065109", + "zh:3e7e17c3966473761d463a21839e9d1d2b9cedfc7ac473e84fdb544c4e6aecc6", + "zh:4f1392a6c87980b72610a021c6af68dbbc0ab244165bd5406b8389906b9f6534", + "zh:5a7dd578e340b022d14447ff675178448c38ac7cc322a214538d50ae79c29755", + "zh:6765087dee91cfd9f65d2898bb241b8f52fbbb2a38bf5d1a6352c14b3b018aa0", + "zh:6de36a1f3caae9142649aa6bc22f026dc5c9a80cca0e209c7f1e0609611dac63", + "zh:8cd67d4994c19ec8bf4c7a4dff7d6874e7731b00a0c7409418e311867da03680", + "zh:b7c96138d822c021dc939ff7e2fde1e3038b21d6517179717161f5d4298b5907", + "zh:baed83fed67972fdce68b82713ab50714fc0086cd0e2bf979e3805cc3e9dcaf9", + "zh:bee1bb1c4b7c33237a0aa90b5eb9dd63c99848e561b999293c8ab5694eedc80a", + "zh:def0856b1df1b74b947b57c2af4b51c3941fe5c840aa80818c9a57ea12408f26", + "zh:e6c6eafca3da3aab71e58535f547607fa40e6be06463332e4e42c4917a3ee6d9", + ] +} diff --git a/src/live/_local/storage-compose/terragrunt.hcl b/src/live/_local/storage-compose/terragrunt.hcl new file mode 100644 index 00000000..5cc4f93c --- /dev/null +++ b/src/live/_local/storage-compose/terragrunt.hcl @@ -0,0 +1,17 @@ +locals { + environment_vars = read_terragrunt_config(find_in_parent_folders("mounts.hcl")) + env = local.environment_vars.locals +} + +terraform { + source = "../../..//modules/local-mount" +} + +include { + path = find_in_parent_folders() +} + +inputs = { + name = "mount-compose" + mountpoint = local.env.compose_path +} diff --git a/src/live/_local/storage-downloads/terragrunt.hcl b/src/live/_local/storage-downloads/terragrunt.hcl index 8347f6a7..34965488 100644 --- a/src/live/_local/storage-downloads/terragrunt.hcl +++ b/src/live/_local/storage-downloads/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../../modules/local-mount" + source = "../../..//modules/local-mount" } include { diff --git a/src/live/_local/storage-root/terragrunt.hcl b/src/live/_local/storage-root/terragrunt.hcl index 9bc0b430..302a2096 100644 --- a/src/live/_local/storage-root/terragrunt.hcl +++ b/src/live/_local/storage-root/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../../modules/local-mount" + source = "../../..//modules/local-mount" } include { diff --git a/src/live/_local/storage-torrents-blackhole/terragrunt.hcl b/src/live/_local/storage-torrents-blackhole/terragrunt.hcl index 54f44d71..3e48c5e1 100644 --- a/src/live/_local/storage-torrents-blackhole/terragrunt.hcl +++ b/src/live/_local/storage-torrents-blackhole/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../../modules/local-mount" + source = "../../..//modules/local-mount" } include { diff --git a/src/live/adguard-exporter/.terraform.lock.hcl b/src/live/adguard-exporter/.terraform.lock.hcl new file mode 100644 index 00000000..ceaab274 --- /dev/null +++ b/src/live/adguard-exporter/.terraform.lock.hcl @@ -0,0 +1,21 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/kreuzwerker/docker" { + version = "2.11.0" + hashes = [ + "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", + "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", + "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", + "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", + "zh:4302d65b5cbedbe42cf35094748058aea44f75dd7ec2b257330b5f60a2521def", + "zh:43f53e3e29070dfec0621915d0a5266c386f7416f6a719531b7c55924cefd280", + "zh:4bf7704bf46868edd834991f350aa6204c72397be1e1a784278391bb911e29f5", + "zh:503434ddf9c801aa9a9e47e76b6b5758dd4583a49f7ac373066430b37b3efcaf", + "zh:67410f9ed6503692121519b81e13cf5274ceadb5566bf2ec2dc0a6e43c700621", + "zh:c0fd724ed8da52375976c3595a2a6748bf28c07ec881ad7154e657ab5c38f25b", + "zh:cbe762d96c4ae61c42d8c02c047954b52a6567b214a0263345135baf249accd7", + "zh:d3a23b086199d4a2a63707f28c0da8b392d8d11281c6881d85a959e76626fb7e", + ] +} diff --git a/src/live/adguard-exporter/terragrunt.hcl b/src/live/adguard-exporter/terragrunt.hcl new file mode 100644 index 00000000..57386c15 --- /dev/null +++ b/src/live/adguard-exporter/terragrunt.hcl @@ -0,0 +1,19 @@ +locals { + environment_vars = read_terragrunt_config(find_in_parent_folders("env.hcl")) + env = local.environment_vars.locals.adguard-exporter +} + +terraform { + source = "../..//modules/adguard-exporter" +} + +include { + path = find_in_parent_folders() +} + +inputs = merge(local.env, { + adguard_hostname = "172.17.0.1" + adguard_username = "admin" +// adguard_password = "" + adguard_port = local.environment_vars.locals.adguard.port +}) diff --git a/src/live/adguard/.terraform.lock.hcl b/src/live/adguard/.terraform.lock.hcl index 4350477f..ceaab274 100644 --- a/src/live/adguard/.terraform.lock.hcl +++ b/src/live/adguard/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/adguard/terragrunt.hcl b/src/live/adguard/terragrunt.hcl index 6bae2eb9..39483064 100644 --- a/src/live/adguard/terragrunt.hcl +++ b/src/live/adguard/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/adguard" + source = "../..//modules/adguard" } include { diff --git a/src/live/code-server/.terraform.lock.hcl b/src/live/code-server/.terraform.lock.hcl index 4350477f..ceaab274 100644 --- a/src/live/code-server/.terraform.lock.hcl +++ b/src/live/code-server/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/code-server/terragrunt.hcl b/src/live/code-server/terragrunt.hcl index a6f5940c..0817915f 100644 --- a/src/live/code-server/terragrunt.hcl +++ b/src/live/code-server/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/code-server" + source = "../..//modules/code-server" } dependency "appdata_storage" { @@ -16,12 +16,22 @@ dependency "appdata_storage" { } } +dependency "compose_storage" { + config_path = "../_local/storage-compose" + + mock_outputs_allowed_terraform_commands = ["validate", "plan"] + mock_outputs = { + volume = "mock-compose-storage" + } +} + include { path = find_in_parent_folders() } inputs = merge(local.env, { mounts = { - (dependency.appdata_storage.outputs.volume) = "/appdata" + (dependency.appdata_storage.outputs.volume) = "/appdata", + (dependency.compose_storage.outputs.volume) = "/compose" } }) diff --git a/src/live/dozzle/.terraform.lock.hcl b/src/live/dozzle/.terraform.lock.hcl index 4350477f..ceaab274 100644 --- a/src/live/dozzle/.terraform.lock.hcl +++ b/src/live/dozzle/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/dozzle/terragrunt.hcl b/src/live/dozzle/terragrunt.hcl index e211d41f..b2c88c72 100644 --- a/src/live/dozzle/terragrunt.hcl +++ b/src/live/dozzle/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/dozzle" + source = "../..//modules/dozzle" } include { diff --git a/src/live/env.hcl b/src/live/env.hcl index 9ce2d83f..ddd8f5a8 100644 --- a/src/live/env.hcl +++ b/src/live/env.hcl @@ -7,7 +7,7 @@ locals { } httpbin = { - port = 9009 + port = 8185 } dozzle = { @@ -46,6 +46,10 @@ locals { data_path = "/appdata/adguard/work" } + adguard-exporter = { + port = 9617 + } + sonarr = { port = 8989 config_path = "/appdata/sonarr" diff --git a/src/live/grafana/.terraform.lock.hcl b/src/live/grafana/.terraform.lock.hcl index a1dfbd7a..f7418f35 100644 --- a/src/live/grafana/.terraform.lock.hcl +++ b/src/live/grafana/.terraform.lock.hcl @@ -23,6 +23,7 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/grafana/terragrunt.hcl b/src/live/grafana/terragrunt.hcl index dd7ab7fc..e386e76b 100644 --- a/src/live/grafana/terragrunt.hcl +++ b/src/live/grafana/terragrunt.hcl @@ -4,11 +4,21 @@ locals { } terraform { - source = "../../modules/grafana" + source = "../..//modules/grafana" } include { path = find_in_parent_folders() } -inputs = local.env +inputs = merge(local.env, { + plugins = join(",", [ + "grafana-strava-datasource", + "grafana-worldmap-panel", + "grafana-piechart-panel", + "grafana-googlesheets-datasource" + ]) + env = { + GF_STRAVA_DS_DATA_PATH = "/var/lib/grafana/strava" + } +}) diff --git a/src/live/httpbin/.terraform.lock.hcl b/src/live/httpbin/.terraform.lock.hcl index 4350477f..ceaab274 100644 --- a/src/live/httpbin/.terraform.lock.hcl +++ b/src/live/httpbin/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/httpbin/terragrunt.hcl b/src/live/httpbin/terragrunt.hcl index 87485a31..092e8469 100644 --- a/src/live/httpbin/terragrunt.hcl +++ b/src/live/httpbin/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/httpbin" + source = "../..//modules/httpbin" } include { diff --git a/src/live/jackett/.terraform.lock.hcl b/src/live/jackett/.terraform.lock.hcl index 4350477f..ceaab274 100644 --- a/src/live/jackett/.terraform.lock.hcl +++ b/src/live/jackett/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/jackett/terragrunt.hcl b/src/live/jackett/terragrunt.hcl index cf59ec0e..f72a2642 100644 --- a/src/live/jackett/terragrunt.hcl +++ b/src/live/jackett/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/jackett" + source = "../..//modules/jackett" } dependency "torrents_storage" { diff --git a/src/live/mounts.hcl b/src/live/mounts.hcl index cad7d760..977282d3 100644 --- a/src/live/mounts.hcl +++ b/src/live/mounts.hcl @@ -2,5 +2,6 @@ locals { torrents_path = "/storage/downloads/torrents" downloads_path = "/storage/downloads" appdata_path = "/appdata" + compose_path = "/home/kira/compose" storage_path = "/storage" } diff --git a/src/live/network-torrents/terragrunt.hcl b/src/live/network-torrents/terragrunt.hcl index 5db0354b..7d352ae7 100644 --- a/src/live/network-torrents/terragrunt.hcl +++ b/src/live/network-torrents/terragrunt.hcl @@ -1,5 +1,5 @@ terraform { - source = "../../modules/network" + source = "../..//modules/network" } include { diff --git a/src/live/node-exporter/.terraform.lock.hcl b/src/live/node-exporter/.terraform.lock.hcl index 4350477f..ceaab274 100644 --- a/src/live/node-exporter/.terraform.lock.hcl +++ b/src/live/node-exporter/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/node-exporter/terragrunt.hcl b/src/live/node-exporter/terragrunt.hcl index 65984a24..7b27c823 100644 --- a/src/live/node-exporter/terragrunt.hcl +++ b/src/live/node-exporter/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/node-exporter" + source = "../..//modules/node-exporter" } include { diff --git a/src/live/plex/.terraform.lock.hcl b/src/live/plex/.terraform.lock.hcl index 4350477f..ceaab274 100644 --- a/src/live/plex/.terraform.lock.hcl +++ b/src/live/plex/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/plex/terragrunt.hcl b/src/live/plex/terragrunt.hcl index a22e7274..6238842a 100644 --- a/src/live/plex/terragrunt.hcl +++ b/src/live/plex/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/plex" + source = "../..//modules/plex" } dependency "storage_root" { diff --git a/src/live/prometheus/.terraform.lock.hcl b/src/live/prometheus/.terraform.lock.hcl index 4350477f..ceaab274 100644 --- a/src/live/prometheus/.terraform.lock.hcl +++ b/src/live/prometheus/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/prometheus/terragrunt.hcl b/src/live/prometheus/terragrunt.hcl index 2e62260a..bcd33020 100644 --- a/src/live/prometheus/terragrunt.hcl +++ b/src/live/prometheus/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/prometheus" + source = "../..//modules/prometheus" } include { diff --git a/src/live/qbittorrent/terragrunt.hcl b/src/live/qbittorrent/terragrunt.hcl index 07351aeb..bae9d315 100644 --- a/src/live/qbittorrent/terragrunt.hcl +++ b/src/live/qbittorrent/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/qbittorrent" + source = "../..//modules/qbittorrent" } dependency "downloads_storage" { diff --git a/src/live/radarr/terragrunt.hcl b/src/live/radarr/terragrunt.hcl index f49fa421..0e2dfaf6 100644 --- a/src/live/radarr/terragrunt.hcl +++ b/src/live/radarr/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/radarr" + source = "../..//modules/radarr" } dependency "downloads_storage" { diff --git a/src/live/sonarr/.terraform.lock.hcl b/src/live/sonarr/.terraform.lock.hcl index 2ae04823..ceaab274 100644 --- a/src/live/sonarr/.terraform.lock.hcl +++ b/src/live/sonarr/.terraform.lock.hcl @@ -3,8 +3,9 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" - hashes = [ + hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/sonarr/terragrunt.hcl b/src/live/sonarr/terragrunt.hcl index 8d1b36f5..a8e09df2 100644 --- a/src/live/sonarr/terragrunt.hcl +++ b/src/live/sonarr/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/sonarr" + source = "../..//modules/sonarr" } dependency "downloads_storage" { diff --git a/src/live/tautulli/.terraform.lock.hcl b/src/live/tautulli/.terraform.lock.hcl index 2ae04823..ceaab274 100644 --- a/src/live/tautulli/.terraform.lock.hcl +++ b/src/live/tautulli/.terraform.lock.hcl @@ -3,8 +3,9 @@ provider "registry.terraform.io/kreuzwerker/docker" { version = "2.11.0" - hashes = [ + hashes = [ "h1:2BuPcSQY9DSRhPufzrbiGyMW2NX1qqXkH1KfzrMUQmU=", + "h1:Qzz/xfsrolaSd7Qnxk330hjmCiHqy/n0C2T3k58EDDg=", "zh:1b9d93385cc0329467725ce90affc76a361bc23384a7358431e6ee281ae323de", "zh:21a327746cdad2abfc22df3d72eb9b36134bb7daeb72b2a52112adfd3a39555a", "zh:31ed477f429686015271188b03e89bfc400b74eea9e83956ea4cc16018b561f3", diff --git a/src/live/tautulli/terragrunt.hcl b/src/live/tautulli/terragrunt.hcl index ef69b28f..9ae05ada 100644 --- a/src/live/tautulli/terragrunt.hcl +++ b/src/live/tautulli/terragrunt.hcl @@ -4,7 +4,7 @@ locals { } terraform { - source = "../../modules/tautulli" + source = "../..//modules/tautulli" } include { diff --git a/src/modules/adguard-exporter/main.tf b/src/modules/adguard-exporter/main.tf new file mode 100644 index 00000000..c70cb226 --- /dev/null +++ b/src/modules/adguard-exporter/main.tf @@ -0,0 +1,66 @@ +locals { + port = 9617 + + ports = { + (var.port) = local.port + } +} + +data "docker_registry_image" "image" { + name = "ebrianne/adguard-exporter:latest" +} + +resource "docker_image" "image" { + name = data.docker_registry_image.image.name + pull_triggers = [data.docker_registry_image.image.sha256_digest] +} + +resource "docker_service" "app" { + name = var.name + + task_spec { + restart_policy = var.restart_policy + + networks = var.network_ids + + container_spec { + image = docker_image.image.name + env = { + adguard_protocol = "http" + adguard_hostname = var.adguard_hostname + adguard_username = var.adguard_username + adguard_password = var.adguard_password + adguard_port = var.adguard_port + interval = "10s" + log_limit = 10000 + } + } + + placement { + platforms { + architecture = "amd64" + os = "linux" + } + + constraints = [ + "node.role==manager" + ] + } + + log_driver { + name = "json-file" + } + } + + endpoint_spec { + dynamic "ports" { + for_each = local.ports + + content { + target_port = ports.value + published_port = ports.key + protocol = "tcp" + } + } + } +} diff --git a/src/modules/adguard-exporter/outputs.tf b/src/modules/adguard-exporter/outputs.tf new file mode 100644 index 00000000..1bfc4719 --- /dev/null +++ b/src/modules/adguard-exporter/outputs.tf @@ -0,0 +1,3 @@ +output "port" { + value = var.port +} diff --git a/src/modules/adguard-exporter/vars.tf b/src/modules/adguard-exporter/vars.tf new file mode 100644 index 00000000..416ec8ca --- /dev/null +++ b/src/modules/adguard-exporter/vars.tf @@ -0,0 +1,53 @@ +variable "name" { + type = string + default = "adguard-exporter" + description = "Service name" +} + +variable "port" { + type = number + description = "API Port" +} + +variable "adguard_hostname" { + type = string + description = "Adguard hostname" +} + +variable "adguard_username" { + type = string + description = "Adguard username" +} + +variable "adguard_password" { + type = string + sensitive = true + description = "Adguard password" +} + +variable "adguard_port" { + type = string + description = "Adguard port" +} + +variable "network_ids" { + type = list(string) + default = [] + description = "Service networks" +} + +variable "restart_policy" { + type = object({ + condition = string + delay = string + window = string + max_attempts = number + }) + default = { + condition = "on-failure" + delay = "3s" + window = "10s" + max_attempts = 3 + } + description = "Restart policy" +} diff --git a/src/modules/adguard/main.tf b/src/modules/adguard/main.tf index fe8eab54..69c3d00b 100644 --- a/src/modules/adguard/main.tf +++ b/src/modules/adguard/main.tf @@ -41,64 +41,38 @@ resource "docker_volume" "data_volume" { } } -resource "docker_service" "app" { - name = var.name - - task_spec { - restart_policy = var.restart_policy - - networks = var.network_ids - - container_spec { - image = docker_image.image.name - env = var.env - - dynamic "mounts" { - for_each = local.mounts - - content { - source = mounts.key - target = mounts.value - type = "volume" - } - } - } - - placement { - platforms { - architecture = "amd64" - os = "linux" - } - - constraints = [ - "node.role==manager" - ] - } - - log_driver { - name = "json-file" +resource "docker_container" "app" { + name = var.name + image = docker_image.image.name + restart = "unless-stopped" + + dynamic "mounts" { + for_each = local.mounts + + content { + source = mounts.key + target = mounts.value + type = "volume" } } - endpoint_spec { - dynamic "ports" { - for_each = local.ports + dynamic "ports" { + for_each = local.ports - content { - target_port = ports.value - published_port = ports.key - protocol = "tcp" - } + content { + internal = ports.value + external = ports.key + protocol = "tcp" } + } - dynamic "ports" { - for_each = local.udp_ports + dynamic "ports" { + for_each = local.udp_ports - content { - target_port = ports.value - published_port = ports.key - protocol = "udp" - } + content { + internal = ports.value + external = ports.key + protocol = "udp" } } } diff --git a/src/modules/adguard/vars.tf b/src/modules/adguard/vars.tf index 99e6584b..fdf3a4a0 100644 --- a/src/modules/adguard/vars.tf +++ b/src/modules/adguard/vars.tf @@ -9,28 +9,6 @@ variable "port" { description = "WEBUI Port" } -variable "network_ids" { - type = list(string) - default = [] - description = "Service networks" -} - -variable "restart_policy" { - type = object({ - condition = string - delay = string - window = string - max_attempts = number - }) - default = { - condition = "on-failure" - delay = "3s" - window = "10s" - max_attempts = 3 - } - description = "Restart policy" -} - variable "env" { type = map(string) default = { diff --git a/src/modules/code-server/main.tf b/src/modules/code-server/main.tf index b11d5fe0..8c487aef 100644 --- a/src/modules/code-server/main.tf +++ b/src/modules/code-server/main.tf @@ -35,9 +35,10 @@ resource "docker_service" "app" { for_each = var.mounts content { - target = mounts.value - source = mounts.key - type = "volume" + read_only = false + target = mounts.value + source = mounts.key + type = "volume" } } } diff --git a/src/modules/grafana/main.tf b/src/modules/grafana/main.tf index 26e9915e..476cdbc3 100644 --- a/src/modules/grafana/main.tf +++ b/src/modules/grafana/main.tf @@ -11,7 +11,7 @@ locals { } data "docker_registry_image" "image" { - name = "grafana/grafana:7.4.5" + name = "grafana/grafana:${var.tag}" } resource "docker_image" "image" { @@ -45,6 +45,9 @@ resource "docker_service" "app" { container_spec { image = docker_image.image.name + env = merge(var.env, { + GF_INSTALL_PLUGINS = var.plugins + }) dynamic "mounts" { for_each = local.mounts diff --git a/src/modules/grafana/vars.tf b/src/modules/grafana/vars.tf index 57ac75f9..d2386166 100644 --- a/src/modules/grafana/vars.tf +++ b/src/modules/grafana/vars.tf @@ -4,11 +4,30 @@ variable "name" { description = "Service name" } +variable "tag" { + type = string + default = "7.5.0" + description = "Image version tag" +} + variable "port" { type = number description = "WEBUI Port" } +variable "plugins" { + type = string + default = "" + description = "Plugins" +} + + +variable "env" { + type = map(string) + default = {} + description = "Environment variables" +} + variable "network_ids" { type = list(string) default = [] diff --git a/src/modules/node-exporter/main.tf b/src/modules/node-exporter/main.tf index 5af0d3c8..f44e266b 100644 --- a/src/modules/node-exporter/main.tf +++ b/src/modules/node-exporter/main.tf @@ -20,11 +20,6 @@ resource "docker_container" "app" { pid_mode = "host" restart = "unless-stopped" network_mode = "host" - // volumes { - // host_path = "/" - // container_path = "/host" - // read_only = true - // } mounts { source = "/" diff --git a/src/modules/plex/outputs.tf b/src/modules/plex/outputs.tf index c2b4ea32..1bfc4719 100644 --- a/src/modules/plex/outputs.tf +++ b/src/modules/plex/outputs.tf @@ -1,7 +1,3 @@ output "port" { value = var.port } - -output "name" { - value = local.name -} diff --git a/src/modules/prometheus/main.tf b/src/modules/prometheus/main.tf index 1302a350..34ce0cd2 100644 --- a/src/modules/prometheus/main.tf +++ b/src/modules/prometheus/main.tf @@ -11,7 +11,7 @@ locals { } data "docker_registry_image" "image" { - name = "prom/prometheus:v2.25.2" + name = "prom/prometheus:${var.tag}" } resource "docker_image" "image" { diff --git a/src/modules/prometheus/vars.tf b/src/modules/prometheus/vars.tf index 962da726..bbc2b6f9 100644 --- a/src/modules/prometheus/vars.tf +++ b/src/modules/prometheus/vars.tf @@ -4,6 +4,12 @@ variable "name" { description = "Service name" } +variable "tag" { + type = string + default = "v2.28.1" + description = "Image version tag" +} + variable "port" { type = number description = "WEBUI Port" diff --git a/src/modules/tautulli/main.tf b/src/modules/tautulli/main.tf index 39dd356d..ff80d9e6 100644 --- a/src/modules/tautulli/main.tf +++ b/src/modules/tautulli/main.tf @@ -10,7 +10,7 @@ locals { } data "docker_registry_image" "image" { - name = "tautulli/tautulli" + name = "tautulli/tautulli:${var.tag}" } resource "docker_image" "image" { diff --git a/src/modules/tautulli/vars.tf b/src/modules/tautulli/vars.tf index 99a82930..fed56f86 100644 --- a/src/modules/tautulli/vars.tf +++ b/src/modules/tautulli/vars.tf @@ -10,6 +10,13 @@ variable "port" { description = "WEBUI Port" } +variable "tag" { + type = string + default = "v2.7.4" + description = "Image version tag" +} + + variable "network_ids" { type = list(string) default = [] diff --git a/stacks/faas/docker-stack.yml b/stacks/faas/docker-stack.yml deleted file mode 100644 index a2bc5183..00000000 --- a/stacks/faas/docker-stack.yml +++ /dev/null @@ -1,155 +0,0 @@ -version: '3.3' -services: - basic-auth-plugin: - image: openfaas/basic-auth-plugin:0.18.18 - environment: - pass_filename: basic-auth-password - secret_mount_path: /run/secrets/ - user_filename: basic-auth-user - networks: - - functions - secrets: - - basic-auth-password - - basic-auth-user - logging: - driver: json-file - deploy: - restart_policy: - condition: on-failure - window: 380s - max_attempts: 20 - placement: - constraints: - - node.role == manager - - node.platform.os == linux - resources: - reservations: - memory: 50M - faas-swarm: - image: openfaas/faas-swarm:0.9.0 - environment: - DOCKER_API_VERSION: '1.30' - basic_auth: 'false' - read_timeout: 5m5s - secret_mount_path: /run/secrets/ - write_timeout: 5m5s - volumes: - - /var/run/docker.sock:/var/run/docker.sock - networks: - - functions - secrets: - - basic-auth-password - - basic-auth-user - logging: - driver: json-file - deploy: - restart_policy: - condition: on-failure - window: 380s - max_attempts: 20 - placement: - constraints: - - node.role == manager - - node.platform.os == linux - resources: - reservations: - memory: 100M - gateway: - image: openfaas/gateway:0.18.18 - extra_hosts: - - prometheus:172.17.0.1 - environment: - auth_proxy_pass_body: 'false' - auth_proxy_url: '' - basic_auth: 'false' - direct_functions: 'true' - direct_functions_suffix: '' - dnsrr: 'true' - faas_nats_address: nats - faas_nats_port: '4222' - functions_provider_url: http://faas-swarm:8080/ - max_idle_conns: '1024' - max_idle_conns_per_host: '1024' - read_timeout: 5m5s - scale_from_zero: 'true' - secret_mount_path: /run/secrets/ - upstream_timeout: 5m - write_timeout: 5m5s - ports: - - 8080:8080 - - 8082:8082 - networks: - - functions - secrets: - - basic-auth-password - - basic-auth-user - logging: - driver: json-file - deploy: - restart_policy: - condition: on-failure - window: 380s - max_attempts: 20 - placement: - constraints: - - node.platform.os == linux - resources: - reservations: - memory: 100M - nats: - image: nats-streaming:0.17.0 - command: - - --store - - memory - - --cluster_id - - faas-cluster - networks: - - functions - logging: - driver: json-file - deploy: - placement: - constraints: - - node.platform.os == linux - resources: - reservations: - memory: 50M - limits: - memory: 125M - queue-worker: - image: openfaas/queue-worker:0.11.2 - environment: - ack_wait: 5m5s - basic_auth: 'false' - faas_gateway_address: gateway - gateway_invoke: 'true' - max_inflight: '1' - secret_mount_path: /run/secrets/ - networks: - - functions - secrets: - - basic-auth-password - - basic-auth-user - logging: - driver: json-file - deploy: - restart_policy: - condition: on-failure - window: 380s - max_attempts: 20 - placement: - constraints: - - node.platform.os == linux - resources: - reservations: - memory: 20M - limits: - memory: 50M -networks: - functions: - driver: overlay -secrets: - basic-auth-password: - external: true - basic-auth-user: - external: true diff --git a/stacks/swarmpit/docker-stack.yml b/stacks/swarmpit/docker-stack.yml deleted file mode 100644 index 17dc1693..00000000 --- a/stacks/swarmpit/docker-stack.yml +++ /dev/null @@ -1,87 +0,0 @@ -version: '3.3' -services: - agent: - image: swarmpit/agent:2.2 - environment: - DOCKER_API_VERSION: '1.35' - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - networks: - - net - logging: - driver: json-file - deploy: - mode: global - labels: - swarmpit.agent: 'true' - resources: - reservations: - cpus: '0.05' - memory: 32M - limits: - cpus: '0.1' - memory: 64M - app: - image: swarmpit/swarmpit:1.9 - environment: - SWARMPIT_DB: http://db:5984 - SWARMPIT_INFLUXDB: http://influxdb:8086 - ports: - - 888:8080 - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - networks: - - net - logging: - driver: json-file - deploy: - placement: - constraints: - - node.role == manager - resources: - reservations: - cpus: '0.25' - memory: 512M - limits: - cpus: '0.5' - memory: 1024M - db: - image: couchdb:2.3.0 - volumes: - - db-data:/opt/couchdb/data - networks: - - net - logging: - driver: json-file - deploy: - resources: - reservations: - cpus: '0.15' - memory: 128M - limits: - cpus: '0.3' - memory: 256M - influxdb: - image: influxdb:1.7 - volumes: - - influx-data:/var/lib/influxdb - networks: - - net - logging: - driver: json-file - deploy: - resources: - reservations: - cpus: '0.3' - memory: 128M - limits: - cpus: '0.6' - memory: 512M -networks: - net: - driver: overlay -volumes: - db-data: - driver: local - influx-data: - driver: local diff --git a/terraform/.gitignore b/terraform/.gitignore deleted file mode 100644 index 7fd954d5..00000000 --- a/terraform/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -terraform.tfstate* -.terraform -env.fish -.auto.tfvars diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl deleted file mode 100644 index a9f6980d..00000000 --- a/terraform/.terraform.lock.hcl +++ /dev/null @@ -1,57 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - hashes = [ - "h1:0wlehNaxBX7GJQnPfQwTNvvAf38Jm0Nv7ssKGMaG6Og=", - "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=", - "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386", - "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53", - "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603", - "zh:0e3a6c8e16f17f19010accd0844187d524580d9fdb0731f675ffcf4afba03d16", - "zh:45f2c594b6f2f34ea663704cc72048b212fe7d16fb4cfd959365fa997228a776", - "zh:77ea3e5a0446784d77114b5e851c970a3dde1e08fa6de38210b8385d7605d451", - "zh:8a154388f3708e3df5a69122a23bdfaf760a523788a5081976b3d5616f7d30ae", - "zh:992843002f2db5a11e626b3fc23dc0c87ad3729b3b3cff08e32ffb3df97edbde", - "zh:ad906f4cebd3ec5e43d5cd6dc8f4c5c9cc3b33d2243c89c5fc18f97f7277b51d", - "zh:c979425ddb256511137ecd093e23283234da0154b7fa8b21c2687182d9aea8b2", - ] -} - -provider "registry.terraform.io/hashicorp/vault" { - version = "2.16.0" - hashes = [ - "h1:h27r8aZ5nwRfEelTQnJoA8s3TndJYPI7+3Df1DXIhXk=", - "h1:iANv4ZIPM1EM9M8JqIowNwSrrDLGd/1Qvg4JOvA/DsI=", - "zh:13dde74fac618ee0281bad60a60966a85d4a59c8420b15fd6499996fa1bc99b3", - "zh:1daad9da6c82f43cbd07bf1cfedf3c6960fb2f96bc59f94fd75d361065b8c51a", - "zh:68075d8e1824b745267ce9e4ef693b202b9282561811de6ccf7298935f482128", - "zh:86df4a4405413d575cd72985483163e62539afbd659fddef59fc637875b707e2", - "zh:8f8306ada4c1c44945ce5205e4f1cfbf5e3d46a9da2f3a1d0be17d32e4935845", - "zh:9eb75febcd6fcca9885a6f5e93293a200b2effbe31f47d265cc4d1346d42d29e", - "zh:a658b55b239bc7ad59a2bf55e7abbfe5f0111d37dd68b5d4bb947eee93969092", - "zh:af10679c241bd0e0168f57c24e839fd24c747f3e84b7bb6de3cd791471709249", - "zh:ee3030f36846de45450be088aa4c2b1f69246b2ecf40d7ea6a15a7f09ac5e5d0", - "zh:efe6cc23f77336604358e627b0b565c1421a97376e510a9cdaaf849524944713", - ] -} - -provider "registry.terraform.io/kreuzwerker/docker" { - version = "2.8.0" - hashes = [ - "h1:Ohef27HwwoGwO8YXLk4qZvlqV+l/z1LF7WQSlHhShBY=", - "h1:T7griB0/qBDLxCWAmqXJaMFMC9QDPJArecoNnSkNxmA=", - "zh:001846931fa93e874d65512ac72e36f79464b86dd9769753acfff871d6acb1fd", - "zh:093f017ad043e0035c1ed62ebb4daf5f4e978e49534a24fba88f9f3fe206a0e0", - "zh:7ad122a675216450ade497acebd411277a875cfeac8ebb4bb21aaee16dbcc22a", - "zh:821c154735007592e3b656e359c1590ede80fae7bb3e55305e1b511973926bb1", - "zh:a58f8357a21f4243990f5b006eef5ea0ddf8beb91eae402f7af7a0da899f9feb", - "zh:b4e97b3923b3f115a040a7a84f7681bfb774e801162ec2fc834135444be50f93", - "zh:b4f6e3fa9314ea8c254ee001b272c0fd58372942e3177c318faa1a000d06fd67", - "zh:b7ec7c4fb28efbcdab62cbe11860d32915b1e5b19a75f4725aa3f64cc8e01a83", - "zh:c86b0ae710ee9747df3d37a365eed7dd7a2f7e240d414bd8c5c7ce3a84f808d2", - "zh:dff347b82a1fa7c492c1d546c09cb94e797cee33c759de2be17fb999f173238a", - "zh:f338c82c1e7ed8c2fffee5a15dac174d365ea2f22a976049aaba046237ad2aab", - ] -} diff --git a/terraform/lib/constants/outputs.tf b/terraform/lib/constants/outputs.tf deleted file mode 100644 index c591f32f..00000000 --- a/terraform/lib/constants/outputs.tf +++ /dev/null @@ -1,26 +0,0 @@ -output "default_restart_policy" { - value = { - condition = "on-failure" - delay = "3s" - window = "10s" - max_attempts = 3 - } -} - -output "default_container_env" { - value = { - PGID = "1000" - PUID = "1000" - TZ = "Europe/Chisinau" - } -} - -output "docker_user" { - value = "1000:1000" -} - -output "manager_constraints" { - value = [ - "node.role==manager" - ] -} diff --git a/terraform/lib/image/main.tf b/terraform/lib/image/main.tf deleted file mode 100644 index 52b89d8e..00000000 --- a/terraform/lib/image/main.tf +++ /dev/null @@ -1,8 +0,0 @@ -data "docker_registry_image" "image" { - name = "${var.name}:${var.tag}" -} - -resource "docker_image" "image" { - name = data.docker_registry_image.image.name - pull_triggers = [data.docker_registry_image.image.sha256_digest] -} diff --git a/terraform/lib/image/outputs.tf b/terraform/lib/image/outputs.tf deleted file mode 100644 index 5b280e6d..00000000 --- a/terraform/lib/image/outputs.tf +++ /dev/null @@ -1,3 +0,0 @@ -output "name" { - value = docker_image.image.name -} diff --git a/terraform/lib/image/providers.tf b/terraform/lib/image/providers.tf deleted file mode 100644 index b433ffb4..00000000 --- a/terraform/lib/image/providers.tf +++ /dev/null @@ -1,7 +0,0 @@ -terraform { - required_providers { - docker = { - source = "kreuzwerker/docker" - } - } -} diff --git a/terraform/lib/image/vars.tf b/terraform/lib/image/vars.tf deleted file mode 100644 index 1ee47289..00000000 --- a/terraform/lib/image/vars.tf +++ /dev/null @@ -1,10 +0,0 @@ -variable "name" { - type = string - description = "Docker image" -} - -variable "tag" { - type = string - default = "latest" - description = "Docker image tag" -} diff --git a/terraform/lib/traefik-labels/outputs.tf b/terraform/lib/traefik-labels/outputs.tf deleted file mode 100644 index 2bce154a..00000000 --- a/terraform/lib/traefik-labels/outputs.tf +++ /dev/null @@ -1,12 +0,0 @@ -locals { - labels = { - "subdomain" = var.name - "traefik.http.routers.${var.name}.service" = var.name - "traefik.http.services.${var.name}.loadbalancer.server.port" = var.port - "traefik.docker.network" = var.network - } -} - -output "labels" { - value = var.enabled ? local.labels : {} -} diff --git a/terraform/lib/traefik-labels/vars.tf b/terraform/lib/traefik-labels/vars.tf deleted file mode 100644 index caa4970d..00000000 --- a/terraform/lib/traefik-labels/vars.tf +++ /dev/null @@ -1,20 +0,0 @@ -variable "name" { - type = string - description = "Service name" -} - -variable "port" { - type = string - description = "Service port" -} - -variable "network" { - type = string - description = "Service network" -} - -variable "enabled" { - type = bool - default = true - description = "Enable Traefik Proxy" -} diff --git a/terraform/lib/volume/main.tf b/terraform/lib/volume/main.tf deleted file mode 100644 index 20cd34e5..00000000 --- a/terraform/lib/volume/main.tf +++ /dev/null @@ -1,12 +0,0 @@ -locals { - suffix = var.target_path == null ? "" : "-${replace(var.target_path, "/", "")}" -} - -resource "docker_volume" "volume" { - name = "${var.name}${local.suffix}" - - driver = "local-persist" - driver_opts = { - mountpoint = var.path - } -} diff --git a/terraform/lib/volume/outputs.tf b/terraform/lib/volume/outputs.tf deleted file mode 100644 index 8769f4c4..00000000 --- a/terraform/lib/volume/outputs.tf +++ /dev/null @@ -1,7 +0,0 @@ -output "name" { - value = docker_volume.volume.name -} - -output "target" { - value = var.target_path -} diff --git a/terraform/lib/volume/providers.tf b/terraform/lib/volume/providers.tf deleted file mode 100644 index b433ffb4..00000000 --- a/terraform/lib/volume/providers.tf +++ /dev/null @@ -1,7 +0,0 @@ -terraform { - required_providers { - docker = { - source = "kreuzwerker/docker" - } - } -} diff --git a/terraform/lib/volume/vars.tf b/terraform/lib/volume/vars.tf deleted file mode 100644 index 38681b2c..00000000 --- a/terraform/lib/volume/vars.tf +++ /dev/null @@ -1,15 +0,0 @@ -variable "name" { - type = string - description = "Volume name" -} - -variable "path" { - type = string - description = "Location on disk" -} - -variable "target_path" { - type = string - default = null - description = "Target path" -} diff --git a/terraform/main.tf b/terraform/main.tf deleted file mode 100644 index 6016e7ef..00000000 --- a/terraform/main.tf +++ /dev/null @@ -1,16 +0,0 @@ -module "proxy" { - source = "./modules/proxy" - - hostname = var.domain - pilot_token = var.pilot_token - network_ids = [ -// module.debug.network_id - ] -} - -module "media" { - source = "./modules/media" - - appdata_root = var.appdata_root - storage_root = var.storage_root -} diff --git a/terraform/modules/media/main.tf b/terraform/modules/media/main.tf deleted file mode 100644 index f1a1a367..00000000 --- a/terraform/modules/media/main.tf +++ /dev/null @@ -1,25 +0,0 @@ -locals { - name = "media" - networks = [docker_network.network.id] -} - -resource "docker_network" "network" { - name = "${local.name}-network" - driver = "overlay" -} - -module "xteve" { - source = "./xteve" - - port = 34400 - network_ids = local.networks - config_path = "${var.appdata_root}/xteve" -} - -//module "ombi" { -// source = "./ombi" -// -// port = 3579 -// network_ids = local.networks -// config_path = "${var.appdata_root}/ombi" -//} diff --git a/terraform/modules/media/ombi/main.tf b/terraform/modules/media/ombi/main.tf deleted file mode 100644 index 2333d5a3..00000000 --- a/terraform/modules/media/ombi/main.tf +++ /dev/null @@ -1,61 +0,0 @@ -locals { - name = "ombi" -} - -module "constants" { - source = "../../../lib/constants" -} - -module "image" { - source = "../../../lib/image" - name = "linuxserver/ombi" - tag = var.tag -} - -resource "docker_volume" "config_volume" { - name = "${local.name}-config" - driver = "local-persist" - driver_opts = { - mountpoint = var.config_path - } -} - -resource "docker_service" "app" { - name = local.name - - task_spec { - restart_policy = module.constants.default_restart_policy - - networks = var.network_ids - - container_spec { - image = module.image.name - env = merge(module.constants.default_container_env, { - WEBUI_PORT: var.port - }) - - mounts { - source = docker_volume.config_volume.name - target = "/config" - type = "volume" - } - } - - placement { - constraints = module.constants.manager_constraints - } - - log_driver { - name = "json-file" - } - } - - endpoint_spec { - ports { - target_port = 3579 - published_port = var.port - protocol = "tcp" - publish_mode = "ingress" - } - } -} diff --git a/terraform/modules/media/ombi/outputs.tf b/terraform/modules/media/ombi/outputs.tf deleted file mode 100644 index c2b4ea32..00000000 --- a/terraform/modules/media/ombi/outputs.tf +++ /dev/null @@ -1,7 +0,0 @@ -output "port" { - value = var.port -} - -output "name" { - value = local.name -} diff --git a/terraform/modules/media/ombi/providers.tf b/terraform/modules/media/ombi/providers.tf deleted file mode 100644 index b433ffb4..00000000 --- a/terraform/modules/media/ombi/providers.tf +++ /dev/null @@ -1,7 +0,0 @@ -terraform { - required_providers { - docker = { - source = "kreuzwerker/docker" - } - } -} diff --git a/terraform/modules/media/ombi/vars.tf b/terraform/modules/media/ombi/vars.tf deleted file mode 100644 index 83beaf63..00000000 --- a/terraform/modules/media/ombi/vars.tf +++ /dev/null @@ -1,27 +0,0 @@ -variable "port" { - type = number - default = 3579 - description = "WEBUI Port" -} - -variable "network_ids" { - type = list(string) - description = "Service networks" -} - -variable "tag" { - type = string - default = "latest" - description = "Image version tag" - - validation { - condition = can(regex("(latest|development)", var.tag)) - error_message = "The `tag` must be one of: latest, development." - } -} - -variable "config_path" { - type = string - default = "" - description = "Config folder path" -} diff --git a/terraform/modules/media/outputs.tf b/terraform/modules/media/outputs.tf deleted file mode 100644 index a40485f2..00000000 --- a/terraform/modules/media/outputs.tf +++ /dev/null @@ -1,33 +0,0 @@ -output "services" { - value = [ - { - name = "sonarr", - port = module.sonarr.port - }, - { - name = "radarr", - port = module.radarr.port - }, - { - name = "tautulli", - port = module.tautulli.port - }, - { - name = "xteve", - port = module.xteve.port - }, - { - name = "plex", - port = module.plex.port - }, -// { -// name = "ombi", -// port = module.ombi.port -// }, - ] -} - -output "network_ids" { - value = local.networks -} - diff --git a/terraform/modules/media/providers.tf b/terraform/modules/media/providers.tf deleted file mode 100644 index b433ffb4..00000000 --- a/terraform/modules/media/providers.tf +++ /dev/null @@ -1,7 +0,0 @@ -terraform { - required_providers { - docker = { - source = "kreuzwerker/docker" - } - } -} diff --git a/terraform/modules/media/vars.tf b/terraform/modules/media/vars.tf deleted file mode 100644 index 1d08e273..00000000 --- a/terraform/modules/media/vars.tf +++ /dev/null @@ -1,11 +0,0 @@ -variable "appdata_root" { - type = string - default = "/appdata" - description = "Appdata root" -} - -variable "storage_root" { - type = string - default = "/storage" - description = "Storage root" -} diff --git a/terraform/modules/media/xteve/main.tf b/terraform/modules/media/xteve/main.tf deleted file mode 100644 index 19d78b28..00000000 --- a/terraform/modules/media/xteve/main.tf +++ /dev/null @@ -1,58 +0,0 @@ -locals { - name = "xteve" -} - -module "constants" { - source = "../../../lib/constants" -} - -module "image" { - source = "../../../lib/image" - name = "tnwhitwell/xteve" -} - -resource "docker_volume" "config_volume" { - name = "${local.name}-config" - driver = "local-persist" - driver_opts = { - mountpoint = var.config_path - } -} - -resource "docker_service" "app" { - name = local.name - - task_spec { - restart_policy = module.constants.default_restart_policy - - networks = var.network_ids - - container_spec { - image = module.image.name - env = module.constants.default_container_env - - mounts { - source = docker_volume.config_volume.name - target = "/config" - type = "volume" - } - } - - placement { - constraints = module.constants.manager_constraints - } - - log_driver { - name = "json-file" - } - } - - endpoint_spec { - ports { - target_port = 34400 - published_port = var.port - protocol = "tcp" - publish_mode = "ingress" - } - } -} diff --git a/terraform/modules/media/xteve/outputs.tf b/terraform/modules/media/xteve/outputs.tf deleted file mode 100644 index c2b4ea32..00000000 --- a/terraform/modules/media/xteve/outputs.tf +++ /dev/null @@ -1,7 +0,0 @@ -output "port" { - value = var.port -} - -output "name" { - value = local.name -} diff --git a/terraform/modules/media/xteve/providers.tf b/terraform/modules/media/xteve/providers.tf deleted file mode 100644 index b433ffb4..00000000 --- a/terraform/modules/media/xteve/providers.tf +++ /dev/null @@ -1,7 +0,0 @@ -terraform { - required_providers { - docker = { - source = "kreuzwerker/docker" - } - } -} diff --git a/terraform/modules/media/xteve/vars.tf b/terraform/modules/media/xteve/vars.tf deleted file mode 100644 index 1320de80..00000000 --- a/terraform/modules/media/xteve/vars.tf +++ /dev/null @@ -1,21 +0,0 @@ -variable "port" { - type = number - default = 34400 - description = "Exposed Port" -} - -variable "network_ids" { - type = list(string) - description = "Service networks" -} - -variable "config_path" { - type = string - description = "Config folder path" -} - -variable "tmp_path" { - type = string - default = "/tmp/xteve" - description = "tmp folder path" -} diff --git a/terraform/modules/proxy/main.tf b/terraform/modules/proxy/main.tf deleted file mode 100644 index f2d671ff..00000000 --- a/terraform/modules/proxy/main.tf +++ /dev/null @@ -1,18 +0,0 @@ -locals { - name = "proxy" - networks = concat(var.network_ids, [docker_network.network.id]) -} - -resource "docker_network" "network" { - name = "${local.name}-network" - driver = "overlay" -} - -module "traefik" { - source = "./traefik" - - api_port = 8080 - network_ids = local.networks - hostname = var.hostname - pilot_token = var.pilot_token -} diff --git a/terraform/modules/proxy/outputs.tf b/terraform/modules/proxy/outputs.tf deleted file mode 100644 index 522397f2..00000000 --- a/terraform/modules/proxy/outputs.tf +++ /dev/null @@ -1,14 +0,0 @@ -output "services" { - value = [ - { - name = "traefik", - port = module.traefik.port - test = "value" - }, - ] -} - -output "network_id" { - value = local.networks[0] -} - diff --git a/terraform/modules/proxy/providers.tf b/terraform/modules/proxy/providers.tf deleted file mode 100644 index b433ffb4..00000000 --- a/terraform/modules/proxy/providers.tf +++ /dev/null @@ -1,7 +0,0 @@ -terraform { - required_providers { - docker = { - source = "kreuzwerker/docker" - } - } -} diff --git a/terraform/modules/proxy/traefik/config.tf b/terraform/modules/proxy/traefik/config.tf deleted file mode 100644 index 39ff3e0a..00000000 --- a/terraform/modules/proxy/traefik/config.tf +++ /dev/null @@ -1,18 +0,0 @@ -data "template_file" "traefik_yaml_tpl" { - template = file("${path.module}/config/traefik.yaml.tpl") - - vars = { - pilot_token = var.pilot_token - hostname = var.hostname - } -} - -resource "docker_config" "traefik_yaml" { - name = "traefik_yaml-${replace(timestamp(),":", ".")}" - data = base64encode(data.template_file.traefik_yaml_tpl.rendered) - - lifecycle { - ignore_changes = [name] - create_before_destroy = true - } -} diff --git a/terraform/modules/proxy/traefik/config/traefik.yaml.tpl b/terraform/modules/proxy/traefik/config/traefik.yaml.tpl deleted file mode 100644 index da5b69a2..00000000 --- a/terraform/modules/proxy/traefik/config/traefik.yaml.tpl +++ /dev/null @@ -1,13 +0,0 @@ -api: - dashboard: true - debug: true - insecure: true - -pilot: - token: "${pilot_token}" - -providers: - docker: - defaultRule: "Host(`{{ index .Labels \"subdomain\" }}.${hostname}`)" - endpoint: "unix:///var/run/docker.sock" - swarmMode: true diff --git a/terraform/modules/proxy/traefik/main.tf b/terraform/modules/proxy/traefik/main.tf deleted file mode 100644 index b7dff4be..00000000 --- a/terraform/modules/proxy/traefik/main.tf +++ /dev/null @@ -1,73 +0,0 @@ -locals { - name = "traefik" - port = 8080 -} - -module "constants" { - source = "../../../lib/constants" -} - -module "image" { - source = "../../../lib/image" - name = "traefik" - tag = var.tag -} - -resource "docker_service" "app" { - name = local.name - - task_spec { - restart_policy = module.constants.default_restart_policy - - networks = var.network_ids - - container_spec { - image = module.image.name - env = module.constants.default_container_env - - configs { - config_id = docker_config.traefik_yaml.id - config_name = docker_config.traefik_yaml.name - file_name = "/traefik.yaml" - } - - mounts { - target = "/var/run/docker.sock" - source = "/var/run/docker.sock" - type = "bind" - read_only = true - } - } - - placement { - constraints = module.constants.manager_constraints - - platforms { - architecture = "amd64" - os = "linux" - } - } - - log_driver { - name = "json-file" - } - } - - endpoint_spec { - dynamic "ports" { - for_each = var.api_port == null ? { - 80 = 80 - } : { - 80 = 80, - (var.api_port) = local.port - } - - content { - target_port = ports.value - published_port = ports.key - protocol = "tcp" - publish_mode = "ingress" - } - } - } -} diff --git a/terraform/modules/proxy/traefik/outputs.tf b/terraform/modules/proxy/traefik/outputs.tf deleted file mode 100644 index 8988ffb7..00000000 --- a/terraform/modules/proxy/traefik/outputs.tf +++ /dev/null @@ -1,7 +0,0 @@ -output "port" { - value = var.api_port -} - -output "name" { - value = local.name -} diff --git a/terraform/modules/proxy/traefik/providers.tf b/terraform/modules/proxy/traefik/providers.tf deleted file mode 100644 index b433ffb4..00000000 --- a/terraform/modules/proxy/traefik/providers.tf +++ /dev/null @@ -1,7 +0,0 @@ -terraform { - required_providers { - docker = { - source = "kreuzwerker/docker" - } - } -} diff --git a/terraform/modules/proxy/traefik/vars.tf b/terraform/modules/proxy/traefik/vars.tf deleted file mode 100644 index 03c8335b..00000000 --- a/terraform/modules/proxy/traefik/vars.tf +++ /dev/null @@ -1,26 +0,0 @@ -variable "api_port" { - type = number - description = "API Port" -} - -variable "tag" { - type = string - default = "v2.3" - description = "Image version tag" -} - -variable "network_ids" { - type = list(string) - description = "Service networks" -} - -variable "pilot_token" { - type = string - default = "" - description = "Traefik pilot.token" -} - -variable "hostname" { - type = string - description = "Default hostname for subdomains" -} diff --git a/terraform/modules/proxy/vars.tf b/terraform/modules/proxy/vars.tf deleted file mode 100644 index 862b6073..00000000 --- a/terraform/modules/proxy/vars.tf +++ /dev/null @@ -1,15 +0,0 @@ -variable "network_ids" { - type = list(string) - description = "Service networks" -} - -variable "pilot_token" { - type = string - default = "" - description = "Traefik pilot.token" -} - -variable "hostname" { - type = string - description = "Default hostname for subdomains" -} diff --git a/terraform/outputs.tf b/terraform/outputs.tf deleted file mode 100644 index e3582586..00000000 --- a/terraform/outputs.tf +++ /dev/null @@ -1,9 +0,0 @@ -output "service_names" { - // TODO add remaining modules - value = concat(module.debug.service_names) -} - -output "published_ports" { - // TODO add remaining modules - value = merge(module.debug.published_ports) -} diff --git a/terraform/providers.tf b/terraform/providers.tf deleted file mode 100644 index 835b609c..00000000 --- a/terraform/providers.tf +++ /dev/null @@ -1,22 +0,0 @@ -terraform { - required_providers { - docker = { - source = "kreuzwerker/docker" - } -// vault = { -// source = "hashicorp/vault" -// } - } - - backend "remote" { - organization = "hobroker" - - workspaces { - name = "selfhosted" - } - } -} - -provider "docker" {} - -provider "vault" {} diff --git a/terraform/vars.tf b/terraform/vars.tf deleted file mode 100644 index 7707d79e..00000000 --- a/terraform/vars.tf +++ /dev/null @@ -1,22 +0,0 @@ -variable "domain" { - type = string - description = "The domain where the sevices will be deployed (ex: corp.com)" -} - -variable "appdata_root" { - type = string - default = "/appdata" - description = "Appdata root" -} - -variable "storage_root" { - type = string - default = "/storage" - description = "Storage root" -} - -variable "pilot_token" { - type = string - default = "" - description = "Traefik pilot.token" -}