Compare commits

..

No commits in common. "f23b6fbb2f385e493c56717ff1f0d87a2de532fd" and "435910e5609d46a9ef14486321398781a500dfde" have entirely different histories.

7 changed files with 96 additions and 181 deletions

View file

@ -1,28 +1,33 @@
/*provider "ssh" {
server = {
host = "california.ti"
port = 22
}
user = "techinc"
auth = {
private_key = {
content = file("~/.ssh/keys/exploding_bolts_2_rsa")
}
}
}
data "ssh_tunnel" "docker" {
connection_name = "docker_socket_tunnel_california"
remote = {
socket = "/var/run/docker.sock"
}
}
*/
provider "docker" {
host = "ssh://california.ti"
registry_auth {
address = "docker.io"
username = "matthewbaggett"
password = "dckr_pat_6ytcZqdfqRXzFYe5GUh79RfH1Hw"
}
}
provider "docker" {
alias = "printi"
host = "ssh://prin.ti"
registry_auth {
address = "docker.io"
username = "matthewbaggett"
password = "dckr_pat_6ytcZqdfqRXzFYe5GUh79RfH1Hw"
}
}
provider "docker" {
alias = "unifi"
host = "ssh://unifi.ti"
registry_auth {
address = "docker.io"
username = "matthewbaggett"
password = "dckr_pat_6ytcZqdfqRXzFYe5GUh79RfH1Hw"
}
}

View file

@ -19,10 +19,10 @@ variable "docker_networks" {
variable "monitored_services" {
type = map(list(object({
id = string
label = string
endpoints = list(string)
http_method = optional(string, null)
id = string
label = string
endpoints = list(string)
http_method = optional(string, null)
http_status_healthy_below = optional(number, 400)
http_status_healthy_above = optional(number, 200)
})))

212
netbox.tf
View file

@ -1,20 +1,17 @@
# Docker images in use
data "docker_registry_image" "netbox" {
name = "netboxcommunity/netbox:v4.0-2.9.1"
name = "docker.io/netboxcommunity/netbox:v4.0-2.9.1"
}
data "docker_registry_image" "netbox_postgres" {
name = "postgres:16-alpine"
name = "docker.io/postgres:16-alpine"
}
data "docker_registry_image" "netbox_redis" {
name = "redis:7-alpine"
name = "docker.io/redis:7-alpine"
}
# Docker Network
resource "docker_network" "netbox" {
name = "netbox"
driver = "overlay"
attachable = true
ipam_driver = "default"
name = "netbox"
}
# Docker Volumes
@ -42,64 +39,54 @@ resource "docker_volume" "netbox_cache" {
# Configs
resource "random_password" "postgres_password" {
length = 32
length = 32
special = false
}
resource "random_password" "redis_password" {
length = 32
special = false
}
resource "random_password" "redis_cache_password" {
length = 32
special = false
}
resource "random_password" "secret_key" {
length = 50
length = 32
special = false
}
locals {
netbox_conf = {
CORS_ORIGIN_ALLOW_ALL = true
CORS_ORIGIN_ALLOW_ALL = true
DB_HOST = docker_service.netbox_postgres.name
DB_NAME = "netbox"
DB_PASSWORD = nonsensitive(random_password.postgres_password.result)
DB_USER = "netbox"
DB_HOST=docker_service.netbox_postgres.name
DB_NAME="netbox"
DB_PASSWORD = nonsensitive(random_password.postgres_password.result)
DB_USER="netbox"
EMAIL_FROM = "netbox@bar.com"
EMAIL_PASSWORD = ""
EMAIL_PORT = 25
EMAIL_SERVER = "localhost"
EMAIL_SSL_CERTFILE = ""
EMAIL_SSL_KEYFILE = ""
EMAIL_TIMEOUT = 5
EMAIL_USERNAME = "netbox"
# EMAIL_USE_SSL and EMAIL_USE_TLS are mutually exclusive, i.e. they can't both be `true`!
EMAIL_USE_SSL = "false"
EMAIL_USE_TLS = "false"
EMAIL_FROM="netbox@bar.com"
EMAIL_PASSWORD=""
EMAIL_PORT=25
EMAIL_SERVER="localhost"
EMAIL_SSL_CERTFILE=""
EMAIL_SSL_KEYFILE=""
EMAIL_TIMEOUT=5
EMAIL_USERNAME="netbox"
# EMAIL_USE_SSL and EMAIL_USE_TLS are mutually exclusive, i.e. they can't both be `true`!
EMAIL_USE_SSL=false
EMAIL_USE_TLS=false
GRAPHQL_ENABLED = "true"
HOUSEKEEPING_INTERVAL = 86400
MEDIA_ROOT = "/opt/netbox/netbox/media"
METRICS_ENABLED = "false"
GRAPHQL_ENABLED=true
HOUSEKEEPING_INTERVAL=86400
MEDIA_ROOT="/opt/netbox/netbox/media"
METRICS_ENABLED=false
REDIS_DATABASE = 0
REDIS_HOST = docker_service.netbox_redis.name
REDIS_INSECURE_SKIP_TLS_VERIFY = "false"
//REDIS_PASSWORD = nonsensitive(random_password.redis_password.result)
REDIS_SSL = "false"
REDIS_CACHE_DATABASE=1
REDIS_CACHE_HOST=docker_service.netbox_redis_cache.name
REDIS_CACHE_INSECURE_SKIP_TLS_VERIFY=false
REDIS_CACHE_PASSWORD=nonsensitive(random_password.redis_password.result)
REDIS_CACHE_SSL=false
REDIS_CACHE_DATABASE = 1
REDIS_CACHE_HOST = docker_service.netbox_redis_cache.name
REDIS_CACHE_INSECURE_SKIP_TLS_VERIFY = "false"
//REDIS_CACHE_PASSWORD = nonsensitive(random_password.redis_cache_password.result)
REDIS_CACHE_SSL = "false"
REDIS_DATABASE=0
REDIS_HOST=docker_service.netbox_redis.name
REDIS_INSECURE_SKIP_TLS_VERIFY=false
REDIS_PASSWORD=nonsensitive(random_password.redis_password.result)
REDIS_SSL=false
RELEASE_CHECK_URL = "https://api.github.com/repos/netbox-community/netbox/releases"
SECRET_KEY = nonsensitive(random_password.secret_key.result)
SKIP_SUPERUSER = "true"
WEBHOOKS_ENABLED = "true"
}
RELEASE_CHECK_URL="https://api.github.com/repos/netbox-community/netbox/releases"
SECRET_KEY="r(m)9nLGnz$(_q3N4z1k(EFsMCjjjzx08x9VhNVcfd%6RF#r!6DE@+V5Zk2X"
SKIP_SUPERUSER=true
WEBHOOKS_ENABLED=true
}
# Services
@ -108,13 +95,12 @@ resource "docker_service" "netbox" {
task_spec {
container_spec {
image = "${data.docker_registry_image.netbox.name}@${data.docker_registry_image.netbox.sha256_digest}"
user = "unit:root"
env = local.netbox_conf
user = "unit:root"
healthcheck {
test = ["CMD-SHELL", "curl -f http://localhost:8080/login/ || exit 1"]
interval = "15s"
timeout = "3s"
start_period = "2m"
test = ["CMD-SHELL", "curl -f http://localhost:8080/login/ || exit 1"]
interval = "15s"
timeout = "3s"
start_period = "60s"
}
mounts {
target = "/etc/netbox/config"
@ -149,34 +135,18 @@ resource "docker_service" "netbox" {
window = "0s"
}
}
endpoint_spec {
ports {
protocol = "tcp"
publish_mode = "ingress"
target_port = 8080
}
}
converge_config {
timeout = "2m"
}
depends_on = [
docker_service.netbox_postgres,
docker_service.netbox_redis,
docker_service.netbox_redis_cache,
]
}
resource "docker_service" "netbox_worker" {
name = "netbox-worker"
task_spec {
container_spec {
image = "${data.docker_registry_image.netbox.name}@${data.docker_registry_image.netbox.sha256_digest}"
user = "unit:root"
env = local.netbox_conf
command = ["/opt/netbox/venv/bin/python", "/opt/netbox/netbox/manage.py", "rqworker", ]
image = "${data.docker_registry_image.netbox.name}@${data.docker_registry_image.netbox.sha256_digest}"
user = "unit:root"
command = ["/opt/netbox/venv/bin/python", "/opt/netbox/netbox/manage.py", "rqworker",]
healthcheck {
test = ["CMD-SHELL", "ps -aux | grep -v grep | grep -q rqworker || exit 1"]
interval = "15s"
timeout = "3s"
test = ["CMD-SHELL", "ps -aux | grep -v grep | grep -q rqworker || exit 1"]
interval = "15s"
timeout = "3s"
start_period = "20s"
}
mounts {
@ -209,25 +179,18 @@ resource "docker_service" "netbox_worker" {
window = "0s"
}
}
converge_config {
timeout = "2m"
}
depends_on = [
docker_service.netbox
]
}
resource "docker_service" "netbox_housekeeping" {
name = "netbox-housekeeping"
task_spec {
container_spec {
image = "${data.docker_registry_image.netbox.name}@${data.docker_registry_image.netbox.sha256_digest}"
user = "unit:root"
env = local.netbox_conf
command = ["/opt/netbox/housekeeping.sh", ]
image = "${data.docker_registry_image.netbox.name}@${data.docker_registry_image.netbox.sha256_digest}"
user = "unit:root"
command = ["/opt/netbox/housekeeping.sh",]
healthcheck {
test = ["CMD-SHELL", "ps -aux | grep -v grep | grep -q housekeeping || exit 1"]
interval = "15s"
timeout = "3s"
test = ["CMD-SHELL", "ps -aux | grep -v grep | grep -q housekeeping || exit 1"]
interval = "15s"
timeout = "3s"
start_period = "20s"
}
mounts {
@ -260,12 +223,6 @@ resource "docker_service" "netbox_housekeeping" {
window = "0s"
}
}
converge_config {
timeout = "2m"
}
depends_on = [
docker_service.netbox
]
}
# Netbox Postgres Database
@ -283,6 +240,7 @@ resource "docker_service" "netbox_postgres" {
POSTGRES_DB = "netbox"
POSTGRES_USER = "netbox"
POSTGRES_PASSWORD = random_password.postgres_password.result
}
}
networks_advanced {
@ -294,9 +252,6 @@ resource "docker_service" "netbox_postgres" {
window = "0s"
}
}
converge_config {
timeout = "2m"
}
}
# Netbox Redis
@ -305,21 +260,11 @@ resource "docker_service" "netbox_redis" {
task_spec {
container_spec {
image = "${data.docker_registry_image.netbox_redis.name}@${data.docker_registry_image.netbox_redis.sha256_digest}"
command = [
"sh", "-c",
"redis-server",
"--appendonly", "yes",
//"--requirepass", nonsensitive(random_password.redis_password.result),
]
command = ["sh", "-c", "redis-server","--appendonly","yes", "--requirepass", random_password.redis_password.result, ]
mounts {
target = "/data"
type = "volume"
source = docker_volume.netbox_redis.name
}
healthcheck {
test = ["CMD", "sh", "-c", "redis-cli", "PING"]
interval = "5s"
timeout = "3s"
source = docker_volume.netbox_database.name
}
}
networks_advanced {
@ -331,29 +276,17 @@ resource "docker_service" "netbox_redis" {
window = "0s"
}
}
converge_config {
timeout = "2m"
}
}
resource "docker_service" "netbox_redis_cache" {
name = "netbox-redis-cache"
task_spec {
container_spec {
image = "${data.docker_registry_image.netbox_redis.name}@${data.docker_registry_image.netbox_redis.sha256_digest}"
command = [
"sh", "-c",
"redis-server",
//"--requirepass", nonsensitive(random_password.redis_cache_password.result),
]
command = ["sh", "-c", "redis-server", "--requirepass", random_password.redis_password.result, ]
mounts {
target = "/data"
type = "volume"
source = docker_volume.netbox_cache.name
}
healthcheck {
test = ["CMD", "sh", "-c", "redis-cli", "PING"]
interval = "5s"
timeout = "3s"
source = docker_volume.netbox_database.name
}
}
networks_advanced {
@ -365,23 +298,4 @@ resource "docker_service" "netbox_redis_cache" {
window = "0s"
}
}
converge_config {
timeout = "2m"
}
}
# Set up some nginx bits for it
module "netbox_nginx_config" {
# tflint-ignore: terraform_module_pinned_source
source = "git::https://code.techinc.nl/grey/terraform-nginx.git//nginx-site-available"
hostname = "netbox.california.ti"
//certificate = acme_certificate.ooo_grey["s3"]
service_name = docker_service.netbox.name
upstream_host = "${docker_service.netbox.name}:8080"
config_prefix = "nginx"
allow_non_ssl = true
allow_ssl = false
depends_on = [
docker_service.netbox
]
}
}

View file

@ -17,10 +17,9 @@ module "nginx" {
module.minio.nginx_files,
module.vigil_nginx_config.files,
module.videobucket_nginx_config.files,
//module.netbox_nginx_config.files,
)
networks = [
docker_network.loadbalancer,
]
replicas = 2
replicas = 1
}

View file

@ -17,7 +17,8 @@ resource "scratch_string" "arse" {
}
resource "docker_container" "ender5plus" {
image = docker_image.octoprint.image_id
image = "${docker_image.octoprint.name}:latest"
#image = docker_image.octoprint.image_id
provider = docker.printi
name = "ender5plus"
env = [

View file

@ -14,7 +14,7 @@ terraform {
version = "~> 0.1.0"
}
scratch = {
source = "BrendanThompson/scratch"
source = "BrendanThompson/scratch"
version = "0.4.0"
}
}

View file

@ -7,9 +7,9 @@ resource "docker_service" "video_bucket" {
container_spec {
image = "${data.docker_registry_image.video_bucket.name}@${data.docker_registry_image.video_bucket.sha256_digest}"
configs {
config_id = docker_config.video_bucket_config.id
config_id = docker_config.video_bucket_config.id
config_name = docker_config.video_bucket_config.name
file_name = "/app/.env"
file_name = "/app/.env"
}
}
networks_advanced {
@ -22,8 +22,8 @@ resource "docker_service" "video_bucket" {
}
}
}
locals {
video_bucket_config = <<EOF
locals{
video_bucket_config = <<EOF
S3_ENDPOINT=http://s3.california.ti
S3_BUCKET=video
S3_KEY=Ipi5Xh1b2UgcGiLSLLpQ
@ -31,12 +31,8 @@ S3_SECRET=E4xMwB44MT4tGLStJnZTwQbuDNHL1KR9M4I8taBT
EOF
}
resource "docker_config" "video_bucket_config" {
name = "video_bucket_config_${substr(md5(local.video_bucket_config), 0, 7)}"
name = "video_bucket_config_${substr(md5(local.video_bucket_config),0,7)}"
data = base64encode(local.video_bucket_config)
lifecycle {
ignore_changes = [name]
create_before_destroy = true
}
}
module "videobucket_nginx_config" {
# tflint-ignore: terraform_module_pinned_source