Browse Source

chore: Update versions

pull/3/head
Karan Sharma 1 year ago
parent
commit
496b5bca14
  1. 8
      floyd/terraform/caddy/conf/Caddyfile.tpl
  2. 6
      floyd/terraform/caddy/data.tf
  3. 2
      floyd/terraform/gitea/image.tf
  4. 33
      floyd/terraform/main.tf
  5. 4
      floyd/terraform/monitoring/image.tf
  6. 2
      floyd/terraform/pihole/image.tf
  7. 6
      floyd/terraform/providers.tf
  8. 44
      floyd/terraform/ripe-atlas/container.tf

8
floyd/terraform/caddy/conf/Caddyfile.tpl

@ -26,6 +26,14 @@ grafana.mrkaran.dev {
}
}
sync.mrkaran.dev {
reverse_proxy sync:8384
tls {
dns cloudflare "${cloudflare_api_token}"
}
}
firefly.mrkaran.dev {
reverse_proxy firefly:8080
tls {

6
floyd/terraform/caddy/data.tf

@ -1,6 +1,6 @@
data "template_file" "caddyfile" {
template = "${file("${path.module}/conf/Caddyfile.tpl")}"
template = file("${path.module}/conf/Caddyfile.tpl")
vars = {
cloudflare_api_token = "${var.cloudflare_api_token}"
cloudflare_api_token = var.cloudflare_api_token
}
}
}

2
floyd/terraform/gitea/image.tf

@ -1,5 +1,5 @@
data "docker_registry_image" "gitea" {
name = "gitea/gitea:1.12.3"
name = "gitea/gitea:latest"
}
resource "docker_image" "gitea" {

33
floyd/terraform/main.tf

@ -1,7 +1,7 @@
module "hydra-infra" {
source = "./digitalocean-infra"
providers = {
docker = docker.floyd
digitalocean = digitalocean
}
}
@ -29,14 +29,14 @@ module "gitea" {
}
}
module "bookstack" {
source = "./bookstack"
ips = var.ips
bookstack_mariadb_password = var.bookstack_mariadb_password
providers = {
docker = docker.floyd
}
}
# module "bookstack" {
# source = "./bookstack"
# ips = var.ips
# bookstack_mariadb_password = var.bookstack_mariadb_password
# providers = {
# docker = docker.floyd
# }
# }
module "caddy" {
source = "./caddy"
@ -65,10 +65,19 @@ module "firefly" {
}
}
module "ripe-atlas" {
source = "./ripe-atlas"
# module "ripe-atlas" {
# source = "./ripe-atlas"
# ips = var.ips
# providers = {
# docker = docker.parvaaz
# }
# }
module "syncthing" {
source = "./syncthing"
ips = var.ips
providers = {
docker = docker.parvaaz
docker = docker.floyd
}
}

4
floyd/terraform/monitoring/image.tf

@ -8,7 +8,7 @@ resource "docker_image" "cadvisor" {
}
data "docker_registry_image" "grafana" {
name = "grafana/grafana:7.1.4-ubuntu"
name = "grafana/grafana:latest-ubuntu"
}
resource "docker_image" "grafana" {
@ -17,7 +17,7 @@ resource "docker_image" "grafana" {
}
data "docker_registry_image" "prometheus" {
name = "prom/prometheus:v2.20.1"
name = "prom/prometheus:latest"
}
resource "docker_image" "prometheus" {

2
floyd/terraform/pihole/image.tf

@ -1,5 +1,5 @@
data "docker_registry_image" "pihole" {
name = "pihole/pihole:v5.1.2"
name = "pihole/pihole:latest"
}
resource "docker_image" "pihole" {

6
floyd/terraform/providers.tf

@ -1,15 +1,15 @@
provider "docker" {
alias = "floyd"
host = "ssh://floyd:22"
alias = "floyd"
}
provider "docker" {
alias = "parvaaz"
host = "ssh://parvaaz:22"
alias = "parvaaz"
}
provider "digitalocean" {
# You need to set this in your .bashrc
# export DIGITALOCEAN_TOKEN="Your API TOKEN"
#
}
}

44
floyd/terraform/ripe-atlas/container.tf

@ -1,26 +1,26 @@
# Referred to https://github.com/pi-hole/docker-pi-hole#quick-start
# for config.
resource "docker_container" "gitea" {
name = "gitea"
image = docker_image.gitea.latest
# # Referred to https://github.com/pi-hole/docker-pi-hole#quick-start
# # for config.
# resource "docker_container" "gitea" {
# name = "gitea"
# image = docker_image.gitea.latest
mounts {
target = "/var/atlasdata"
type = "tmpfs"
}
# mounts {
# target = "/var/atlasdata"
# type = "tmpfs"
# }
log_opts {
"max-size" = "10m"
}
# log_opts {
# max-size = "10m"
# }
capabilities {
add = ["SYS_ADMIN","NET_RAW","CHOWN"]
}
tmpfs {
/var/atlasdata
}
# capabilities {
# add = ["SYS_ADMIN","NET_RAW","CHOWN"]
# }
# tmpfs {
# /var/atlasdata
# }
restart = "unless-stopped"
destroy_grace_seconds = 30
must_run = true
}
# restart = "unless-stopped"
# destroy_grace_seconds = 30
# must_run = true
# }

Loading…
Cancel
Save