Cleanup and comment unused stuff
This commit is contained in:
parent
86db1b2da9
commit
735279b0c1
|
@ -13,7 +13,7 @@ resource "docker_image" "ubooquity" {
|
||||||
pull_triggers = ["${data.docker_registry_image.ubooquity.sha256_digest}"]
|
pull_triggers = ["${data.docker_registry_image.ubooquity.sha256_digest}"]
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "docker_image" "lychee" {
|
# resource "docker_image" "lychee" {
|
||||||
name = "${data.docker_registry_image.lychee.name}"
|
# name = "${data.docker_registry_image.lychee.name}"
|
||||||
pull_triggers = ["${data.docker_registry_image.lychee.sha256_digest}"]
|
# pull_triggers = ["${data.docker_registry_image.lychee.sha256_digest}"]
|
||||||
}
|
# }
|
||||||
|
|
|
@ -10,6 +10,11 @@ module "firefox-sync" {
|
||||||
host = "firesync.${var.root-domain}"
|
host = "firesync.${var.root-domain}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resource {
|
||||||
|
memory = "400"
|
||||||
|
memory_swap = "400"
|
||||||
|
}
|
||||||
|
|
||||||
volumes = [{
|
volumes = [{
|
||||||
host_path = "/mnt/xwing/data/firefox-sync"
|
host_path = "/mnt/xwing/data/firefox-sync"
|
||||||
container_path = "/data"
|
container_path = "/data"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# https://github.com/go-gitea/gitea/releases
|
# https://github.com/go-gitea/gitea/releases
|
||||||
data "docker_registry_image" "gitea" {
|
data "docker_registry_image" "gitea" {
|
||||||
# not bleeding, this is hemorrhaging edge
|
# not bleeding, this is hemorrhaging edge
|
||||||
name = "gitea/gitea:1.10"
|
name = "gitea/gitea:1.11"
|
||||||
}
|
}
|
||||||
|
|
||||||
data "docker_registry_image" "redis" {
|
data "docker_registry_image" "redis" {
|
||||||
|
|
|
@ -1,67 +1,67 @@
|
||||||
module "airsonic" {
|
# module "airsonic" {
|
||||||
source = "../modules/container"
|
# source = "../modules/container"
|
||||||
image = "linuxserver/airsonic:latest"
|
# image = "linuxserver/airsonic:latest"
|
||||||
name = "airsonic"
|
# name = "airsonic"
|
||||||
|
|
||||||
resource {
|
# resource {
|
||||||
memory = "1024"
|
# memory = "1024"
|
||||||
memory_swap = "1024"
|
# memory_swap = "1024"
|
||||||
}
|
# }
|
||||||
|
|
||||||
web {
|
# web {
|
||||||
port = 4040
|
# port = 4040
|
||||||
host = "airsonic.bb8.fun"
|
# host = "airsonic.bb8.fun"
|
||||||
expose = true
|
# expose = true
|
||||||
}
|
# }
|
||||||
|
|
||||||
networks = "${list(docker_network.media.id, data.docker_network.bridge.id)}"
|
# networks = "${list(docker_network.media.id, data.docker_network.bridge.id)}"
|
||||||
|
|
||||||
env = [
|
# env = [
|
||||||
"PUID=1004",
|
# "PUID=1004",
|
||||||
"PGID=1003",
|
# "PGID=1003",
|
||||||
"TZ=Asia/Kolkata",
|
# "TZ=Asia/Kolkata",
|
||||||
"JAVA_OPTS=-Xmx512m -Dserver.use-forward-headers=true -Dserver.context-path=/",
|
# "JAVA_OPTS=-Xmx512m -Dserver.use-forward-headers=true -Dserver.context-path=/",
|
||||||
]
|
# ]
|
||||||
|
|
||||||
devices = [{
|
# devices = [{
|
||||||
host_path = "/dev/snd"
|
# host_path = "/dev/snd"
|
||||||
container_path = "/dev/snd"
|
# container_path = "/dev/snd"
|
||||||
}]
|
# }]
|
||||||
|
|
||||||
# files = [
|
# # files = [
|
||||||
# "/usr/lib/jvm/java-1.8-openjdk/jre/lib/airsonic.properties",
|
# # "/usr/lib/jvm/java-1.8-openjdk/jre/lib/airsonic.properties",
|
||||||
# "/usr/lib/jvm/java-1.8-openjdk/jre/lib/sound.properties",
|
# # "/usr/lib/jvm/java-1.8-openjdk/jre/lib/sound.properties",
|
||||||
# ]
|
# # ]
|
||||||
|
|
||||||
|
|
||||||
# contents = [
|
# # contents = [
|
||||||
# "${data.template_file.airsonic-properties-file.rendered}",
|
# # "${data.template_file.airsonic-properties-file.rendered}",
|
||||||
# "${file("${path.module}/conf/airsonic.sound.properties")}",
|
# # "${file("${path.module}/conf/airsonic.sound.properties")}",
|
||||||
# ]
|
# # ]
|
||||||
|
|
||||||
volumes = [
|
# volumes = [
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/config/airsonic2"
|
# host_path = "/mnt/xwing/config/airsonic2"
|
||||||
container_path = "/config"
|
# container_path = "/config"
|
||||||
},
|
# },
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/media/Music"
|
# host_path = "/mnt/xwing/media/Music"
|
||||||
container_path = "/music"
|
# container_path = "/music"
|
||||||
},
|
# },
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/config/airsonic/playlists"
|
# host_path = "/mnt/xwing/config/airsonic/playlists"
|
||||||
container_path = "/playlists"
|
# container_path = "/playlists"
|
||||||
},
|
# },
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/config/airsonic/podcasts"
|
# host_path = "/mnt/xwing/config/airsonic/podcasts"
|
||||||
container_path = "/podcasts"
|
# container_path = "/podcasts"
|
||||||
},
|
# },
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/config/airsonic/jre"
|
# host_path = "/mnt/xwing/config/airsonic/jre"
|
||||||
container_path = "/usr/lib/jvm/java-1.8-openjdk/jre/lib/"
|
# container_path = "/usr/lib/jvm/java-1.8-openjdk/jre/lib/"
|
||||||
},
|
# },
|
||||||
]
|
# ]
|
||||||
}
|
# }
|
||||||
|
|
||||||
# data "template_file" "airsonic-properties-file" {
|
# data "template_file" "airsonic-properties-file" {
|
||||||
# template = "${file("${path.module}/conf/airsonic.properties.tpl")}"
|
# template = "${file("${path.module}/conf/airsonic.properties.tpl")}"
|
||||||
|
|
|
@ -1,39 +1,39 @@
|
||||||
module "bazarr-container" {
|
# module "bazarr-container" {
|
||||||
name = "bazarr"
|
# name = "bazarr"
|
||||||
source = "../modules/container"
|
# source = "../modules/container"
|
||||||
image = "linuxserver/bazarr:latest"
|
# image = "linuxserver/bazarr:latest"
|
||||||
|
|
||||||
web {
|
# web {
|
||||||
expose = true
|
# expose = true
|
||||||
port = 6767
|
# port = 6767
|
||||||
host = "bazarr.${var.domain}"
|
# host = "bazarr.${var.domain}"
|
||||||
}
|
# }
|
||||||
|
|
||||||
resource {
|
# resource {
|
||||||
memory = 512
|
# memory = 512
|
||||||
memory_swap = 1024
|
# memory_swap = 1024
|
||||||
}
|
# }
|
||||||
|
|
||||||
volumes = [
|
# volumes = [
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/config/bazarr"
|
# host_path = "/mnt/xwing/config/bazarr"
|
||||||
container_path = "/config"
|
# container_path = "/config"
|
||||||
},
|
# },
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/media/TV"
|
# host_path = "/mnt/xwing/media/TV"
|
||||||
container_path = "/tv"
|
# container_path = "/tv"
|
||||||
},
|
# },
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/media/Movies"
|
# host_path = "/mnt/xwing/media/Movies"
|
||||||
container_path = "/movies"
|
# container_path = "/movies"
|
||||||
},
|
# },
|
||||||
]
|
# ]
|
||||||
|
|
||||||
env = [
|
# env = [
|
||||||
"PUID=1004",
|
# "PUID=1004",
|
||||||
"PGID=1003",
|
# "PGID=1003",
|
||||||
"TZ=Asia/Kolkata",
|
# "TZ=Asia/Kolkata",
|
||||||
]
|
# ]
|
||||||
|
|
||||||
networks = "${list(docker_network.media.id, data.docker_network.bridge.id)}"
|
# networks = "${list(docker_network.media.id, data.docker_network.bridge.id)}"
|
||||||
}
|
# }
|
||||||
|
|
|
@ -1,34 +1,36 @@
|
||||||
module "gonic" {
|
# module "gonic" {
|
||||||
source = "../modules/container"
|
# source = "../modules/container"
|
||||||
image = "sentriz/gonic"
|
# image = "sentriz/gonic"
|
||||||
name = "gonic"
|
# name = "gonic"
|
||||||
|
|
||||||
resource {
|
# resource {
|
||||||
memory = "256"
|
# memory = "256"
|
||||||
memory_swap = "256"
|
# memory_swap = "256"
|
||||||
}
|
# }
|
||||||
|
|
||||||
web {
|
# web {
|
||||||
port = 80
|
# port = 80
|
||||||
host = "gonic.bb8.fun"
|
# host = "gonic.bb8.fun"
|
||||||
expose = true
|
# expose = true
|
||||||
}
|
# }
|
||||||
|
|
||||||
env = [
|
# env = [
|
||||||
"GONIC_SCAN_INTERVAL=60"
|
# "GONIC_SCAN_INTERVAL=60",
|
||||||
]
|
# "GONIC_MUSIC_PATH=/music",
|
||||||
|
# "GONIC_DB_PATH=/data/gonic.db"
|
||||||
|
# ]
|
||||||
|
|
||||||
networks = "${list(docker_network.media.id, data.docker_network.bridge.id)}"
|
# networks = "${list(docker_network.media.id, data.docker_network.bridge.id)}"
|
||||||
|
|
||||||
volumes = [
|
# volumes = [
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/config/gonic"
|
# host_path = "/mnt/xwing/config/gonic"
|
||||||
container_path = "/data"
|
# container_path = "/data"
|
||||||
},
|
# },
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/media/Music"
|
# host_path = "/mnt/xwing/media/Music"
|
||||||
container_path = "/music"
|
# container_path = "/music"
|
||||||
read_only = true
|
# read_only = true
|
||||||
}
|
# }
|
||||||
]
|
# ]
|
||||||
}
|
# }
|
||||||
|
|
|
@ -1,47 +1 @@
|
||||||
resource "docker_container" "jellyfin" {
|
#
|
||||||
name = "jellyfin"
|
|
||||||
image = "${docker_image.jellyfin.latest}"
|
|
||||||
|
|
||||||
volumes {
|
|
||||||
host_path = "/mnt/xwing/config/jellyfin"
|
|
||||||
container_path = "/config"
|
|
||||||
}
|
|
||||||
|
|
||||||
volumes {
|
|
||||||
host_path = "/mnt/xwing/media"
|
|
||||||
container_path = "/media"
|
|
||||||
}
|
|
||||||
|
|
||||||
labels = "${merge(
|
|
||||||
var.traefik-labels,
|
|
||||||
map(
|
|
||||||
"traefik.frontend.rule", "Host:media.in.${var.domain},media.${var.domain}",
|
|
||||||
"traefik.frontend.passHostHeader", "true",
|
|
||||||
"traefik.port", 8096,
|
|
||||||
))}"
|
|
||||||
|
|
||||||
networks = ["${docker_network.media.id}", "${var.traefik-network-id}"]
|
|
||||||
|
|
||||||
memory = 2048
|
|
||||||
restart = "unless-stopped"
|
|
||||||
destroy_grace_seconds = 10
|
|
||||||
must_run = true
|
|
||||||
|
|
||||||
# Running as lounge:tatooine
|
|
||||||
env = [
|
|
||||||
"APP_USER=lounge",
|
|
||||||
"APP_UID=1004",
|
|
||||||
"APP_GID=1003",
|
|
||||||
"APP_CONFIG=/mnt/xwing/config",
|
|
||||||
"TZ=Asia/Kolkata",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "docker_image" "jellyfin" {
|
|
||||||
name = "${data.docker_registry_image.jellyfin.name}"
|
|
||||||
pull_triggers = ["${data.docker_registry_image.jellyfin.sha256_digest}"]
|
|
||||||
}
|
|
||||||
|
|
||||||
data "docker_registry_image" "jellyfin" {
|
|
||||||
name = "jellyfin/jellyfin:latest"
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,35 +1,35 @@
|
||||||
module "mylar" {
|
# module "mylar" {
|
||||||
name = "mylar"
|
# name = "mylar"
|
||||||
source = "../modules/container"
|
# source = "../modules/container"
|
||||||
image = "linuxserver/mylar:latest"
|
# image = "linuxserver/mylar:latest"
|
||||||
|
|
||||||
web {
|
# web {
|
||||||
expose = true
|
# expose = true
|
||||||
port = 8090
|
# port = 8090
|
||||||
host = "mylar.${var.domain}"
|
# host = "mylar.${var.domain}"
|
||||||
auth = true
|
# auth = true
|
||||||
}
|
# }
|
||||||
|
|
||||||
volumes = [
|
# volumes = [
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/media/EBooks/Comics"
|
# host_path = "/mnt/xwing/media/EBooks/Comics"
|
||||||
container_path = "/comics"
|
# container_path = "/comics"
|
||||||
},
|
# },
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/config/mylar"
|
# host_path = "/mnt/xwing/config/mylar"
|
||||||
container_path = "/config"
|
# container_path = "/config"
|
||||||
},
|
# },
|
||||||
{
|
# {
|
||||||
host_path = "/mnt/xwing/media/DL"
|
# host_path = "/mnt/xwing/media/DL"
|
||||||
container_path = "/downloads"
|
# container_path = "/downloads"
|
||||||
},
|
# },
|
||||||
]
|
# ]
|
||||||
|
|
||||||
env = [
|
# env = [
|
||||||
"PUID=1004",
|
# "PUID=1004",
|
||||||
"PGID=1003",
|
# "PGID=1003",
|
||||||
"TZ=Asia/Kolkata",
|
# "TZ=Asia/Kolkata",
|
||||||
]
|
# ]
|
||||||
|
|
||||||
networks = "${list(docker_network.media.id, data.docker_network.bridge.id)}"
|
# networks = "${list(docker_network.media.id, data.docker_network.bridge.id)}"
|
||||||
}
|
# }
|
||||||
|
|
|
@ -14,12 +14,12 @@ scrape_configs:
|
||||||
- targets: ["nodeexporter:9100"]
|
- targets: ["nodeexporter:9100"]
|
||||||
|
|
||||||
- job_name: "cadvisor"
|
- job_name: "cadvisor"
|
||||||
scrape_interval: 5s
|
scrape_interval: 1m
|
||||||
static_configs:
|
static_configs:
|
||||||
- targets: ["cadvisor:8080"]
|
- targets: ["cadvisor:8080"]
|
||||||
|
|
||||||
- job_name: "speedtest"
|
- job_name: "speedtest"
|
||||||
scrape_interval: 15m
|
scrape_interval: 1h
|
||||||
scrape_timeout: 2m
|
scrape_timeout: 2m
|
||||||
static_configs:
|
static_configs:
|
||||||
- targets: ["speedtest:9696"]
|
- targets: ["speedtest:9696"]
|
||||||
|
@ -35,7 +35,7 @@ scrape_configs:
|
||||||
- targets: ["192.168.1.111:1111"]
|
- targets: ["192.168.1.111:1111"]
|
||||||
|
|
||||||
- job_name: "act"
|
- job_name: "act"
|
||||||
scrape_interval: 15m
|
scrape_interval: 1h
|
||||||
scrape_timeout: 1m
|
scrape_timeout: 1m
|
||||||
static_configs:
|
static_configs:
|
||||||
- targets: ["act-exporter:3000"]
|
- targets: ["act-exporter:3000"]
|
||||||
|
|
|
@ -2,7 +2,7 @@ module "rss-bridge" {
|
||||||
name = "rss-bridge"
|
name = "rss-bridge"
|
||||||
source = "modules/container"
|
source = "modules/container"
|
||||||
|
|
||||||
image = "rssbridge/rss-bridge:latest"
|
image = "captn3m0/rss-bridge:develop"
|
||||||
|
|
||||||
resource {
|
resource {
|
||||||
memory = 256
|
memory = 256
|
||||||
|
|
10
stringer.tf
10
stringer.tf
|
@ -1,8 +1,8 @@
|
||||||
module "stringer-db" {
|
# module "stringer-db" {
|
||||||
source = "modules/postgres"
|
# source = "modules/postgres"
|
||||||
name = "stringer"
|
# name = "stringer"
|
||||||
password = "${data.pass_password.stringer-db-password.password}"
|
# password = "${data.pass_password.stringer-db-password.password}"
|
||||||
}
|
# }
|
||||||
|
|
||||||
# module "stringer-container" {
|
# module "stringer-container" {
|
||||||
# name = "stringer"
|
# name = "stringer"
|
||||||
|
|
|
@ -22,7 +22,7 @@ variable "traefik-common-labels" {
|
||||||
"traefik.frontend.headers.STSIncludeSubdomains" = "false"
|
"traefik.frontend.headers.STSIncludeSubdomains" = "false"
|
||||||
|
|
||||||
// X-Powered-By, Server headers
|
// X-Powered-By, Server headers
|
||||||
"traefik.frontend.headers.customResponseHeaders" = "X-Powered-By:Allomancy||X-Server:Blackbox"
|
"traefik.frontend.headers.customResponseHeaders" = "X-Powered-By:Allomancy||X-Server:Blackbox||X-Clacks-Overhead:GNU Terry Pratchett"
|
||||||
|
|
||||||
// X-Frame-Options
|
// X-Frame-Options
|
||||||
"traefik.frontend.headers.customFrameOptionsValue" = "ALLOW-FROM https://bb8.fun/"
|
"traefik.frontend.headers.customFrameOptionsValue" = "ALLOW-FROM https://bb8.fun/"
|
||||||
|
|
Loading…
Reference in New Issue