From 87986ff3cf98d09fa0c477c6087c95a4872a7d0e Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Sat, 25 Dec 2021 19:40:30 +0100
Subject: [PATCH] Move out .hcl files specific to Neptune cluster

---
 app/dummy/deploy/dummy-nginx.hcl              |  41 ------
 app/dummy/deploy/dummy-synapse.hcl            |  48 -------
 .../deploy/frontend-tricot-neptune.hcl        |  67 ---------
 app/garage-staging/config/garage.toml         |  23 ----
 app/garage-staging/deploy/garage.hcl          | 130 ------------------
 .../secrets/garage-staging/rpc_secret         |   1 -
 6 files changed, 310 deletions(-)
 delete mode 100644 app/dummy/deploy/dummy-nginx.hcl
 delete mode 100644 app/dummy/deploy/dummy-synapse.hcl
 delete mode 100644 app/frontend/deploy/frontend-tricot-neptune.hcl
 delete mode 100644 app/garage-staging/config/garage.toml
 delete mode 100644 app/garage-staging/deploy/garage.hcl
 delete mode 100644 app/garage-staging/secrets/garage-staging/rpc_secret

diff --git a/app/dummy/deploy/dummy-nginx.hcl b/app/dummy/deploy/dummy-nginx.hcl
deleted file mode 100644
index 6415010..0000000
--- a/app/dummy/deploy/dummy-nginx.hcl
+++ /dev/null
@@ -1,41 +0,0 @@
-job "dummy-nginx" {
-	datacenters = ["neptune"]
-	type = "service"
-	
-	group "nginx" {
-		count = 1
-
-		constraint {
-			attribute = "${attr.unique.hostname}"
-			operator = "="
-			value = "carcajou"
-		}
-
-		network {
-			port "http" {
-				to = 80
-			}
-		}
-
-		task "nginx" {
-			driver = "docker"
-			config {
-				image = "nginx"
-				ports = [ "http" ]
-			}
-		}
-
-		service {
-			port = "http"
-			tags = [
-				"tricot home.adnab.me 100",
-			]
-			check {
-				type = "http"
-				path = "/"
-				interval = "10s"
-				timeout = "2s"
-			}
-		}
-	}
-}
diff --git a/app/dummy/deploy/dummy-synapse.hcl b/app/dummy/deploy/dummy-synapse.hcl
deleted file mode 100644
index 2d54960..0000000
--- a/app/dummy/deploy/dummy-synapse.hcl
+++ /dev/null
@@ -1,48 +0,0 @@
-job "dummy-synapse" {
-	datacenters = ["neptune"]
-	type = "service"
-	
-	group "synapse" {
-		count = 1
-
-		constraint {
-			attribute = "${attr.unique.hostname}"
-			operator = "="
-			value = "cariacou"
-		}
-
-		network {
-			port "http" {
-				to = 8008
-			}
-		}
-
-		task "synapse" {
-			driver = "docker"
-			config {
-				image = "matrixdotorg/synapse:v1.48.0"
-				ports = [ "http" ]
-        volumes = [
-          "/mnt/ssd/dummy-synapse:/data",
-        ]
-			}
-		}
-
-
-		service {
-			port = "http"
-			tags = [
-				"tricot matrix.home.adnab.me 100",
-				"tricot matrix.home.adnab.me:443 100",
-				"tricot matrix.home.adnab.me:8448 100",
-        "tricot-add-header Access-Control-Allow-Origin *",
-			]
-			check {
-				type = "http"
-				path = "/"
-				interval = "10s"
-				timeout = "2s"
-			}
-		}
-	}
-}
diff --git a/app/frontend/deploy/frontend-tricot-neptune.hcl b/app/frontend/deploy/frontend-tricot-neptune.hcl
deleted file mode 100644
index d36cce7..0000000
--- a/app/frontend/deploy/frontend-tricot-neptune.hcl
+++ /dev/null
@@ -1,67 +0,0 @@
-job "frontend" {
-  datacenters = ["neptune"]
-  type = "service"
-  priority = 90
-
-  group "tricot" {
-    constraint {
-      attribute = "${attr.unique.hostname}"
-      operator = "="
-      value = "carcajou"
-    }
-
-    network {
-      port "http_port" { static = 80 }
-      port "https_port" { static = 443 }
-      port "admin_port" { static = 8082 }
-    }
-
-    task "server" {
-      driver = "docker"
-
-      config {
-        image = "lxpz/amd64_tricot:25"
-        network_mode = "host"
-        readonly_rootfs = true
-        ports = [ "http_port", "https_port", "admin_port" ]
-      }
-
-      resources {
-        cpu = 2000
-        memory = 200
-      }
-
-      restart {
-        interval = "30m"
-        attempts = 2
-        delay    = "15s"
-        mode     = "delay"
-      }
-
-      template {
-        data = <<EOH
-TRICOT_NODE_NAME={{ env "attr.unique.hostname" }}
-TRICOT_LETSENCRYPT_EMAIL=alex@adnab.me
-TRICOT_ENABLE_COMPRESSION=true
-RUST_LOG=tricot=trace
-EOH
-        destination = "secrets/env"
-        env = true
-      }
-
-      service {
-        name = "tricot-http"
-        port = "http_port"
-        tags = [ "(diplonat (tcp_port 80))" ]
-        address_mode = "host"
-      }
-
-      service {
-        name = "tricot-https"
-        port = "https_port"
-        tags = [ "(diplonat (tcp_port 443))" ]
-        address_mode = "host"
-      }
-    }
-  }
-}
diff --git a/app/garage-staging/config/garage.toml b/app/garage-staging/config/garage.toml
deleted file mode 100644
index fffcf0c..0000000
--- a/app/garage-staging/config/garage.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-block_size = 1048576
-
-metadata_dir = "/meta"
-data_dir = "/data"
-
-replication_mode = "3"
-
-rpc_bind_addr = "0.0.0.0:3991"
-rpc_secret = "{{ key "secrets/garage-staging/rpc_secret" | trimSpace }}"
-
-consul_host = "localhost:8500"
-consul_service_name = "garage-staging-rpc-self-advertised"
-
-bootstrap_peers = []
-
-[s3_api]
-s3_region = "garage-staging"
-api_bind_addr = "0.0.0.0:3990"
-
-[s3_web]
-bind_addr = "0.0.0.0:3992"
-root_domain = ".garage-staging-web.home.adnab.me"
-index = "index.html"
diff --git a/app/garage-staging/deploy/garage.hcl b/app/garage-staging/deploy/garage.hcl
deleted file mode 100644
index 21faffb..0000000
--- a/app/garage-staging/deploy/garage.hcl
+++ /dev/null
@@ -1,130 +0,0 @@
-job "garage-staging" {
-  type = "system"
-  datacenters = [ "neptune", "pluton" ]
-
-  priority = 80
-
-  constraint {
-    attribute = "${attr.cpu.arch}"
-    value     = "amd64"
-  }
-
-  group "garage-staging" {
-    network {
-      port "s3" { static = 3990 }
-      port "rpc" { static = 3991 }
-      port "web" { static = 3992 }
-    }
-
-    update {
-      max_parallel = 1
-      min_healthy_time = "30s"
-      healthy_deadline = "5m"
-    }
-
-    task "server" {
-      driver = "docker"
-
-      config {
-        image = "dxflrs/amd64_garage:v0.5-beta1"
-        command = "/garage"
-        args = [ "server" ]
-        network_mode = "host"
-        volumes = [
-          "/mnt/storage/garage-staging/data:/data",
-          "/mnt/ssd/garage-staging/meta:/meta",
-          "secrets/garage.toml:/etc/garage.toml",
-        ]
-        logging {
-          type = "journald"
-        }
-      }
-
-      template {
-        data = file("../config/garage.toml")
-        destination = "secrets/garage.toml"
-      }
-
-      resources {
-        memory = 1000
-        cpu = 1000
-      }
-
-      kill_signal = "SIGINT"
-      kill_timeout = "20s"
-
-      service {
-        tags = [
-          "garage-staging-api",
-          "tricot garage-staging.home.adnab.me",
-        ]
-        port = 3990
-        address_mode = "driver"
-        name = "garage-staging-api"
-        check {
-          type = "tcp"
-          port = 3990
-          address_mode = "driver"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-      }
-
-      service {
-        tags = ["garage-staging-rpc"]
-        port = 3991
-        address_mode = "driver"
-        name = "garage-staging-rpc"
-        check {
-          type = "tcp"
-          port = 3991
-          address_mode = "driver"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-      }
-
-      service {
-        tags = [
-            "garage-staging-web",
-            "tricot *.garage-staging-web.home.adnab.me",
-            "tricot matrix.home.adnab.me/.well-known/matrix/server",
-            "tricot rust-docs",
-            "tricot-add-header Access-Control-Allow-Origin *",
-        ]
-        port = 3992
-        address_mode = "driver"
-        name = "garage-staging-web"
-        check {
-          type = "tcp"
-          port = 3992
-          address_mode = "driver"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-      }
-
-      restart { 
-        interval = "30m"  
-        attempts = 10  
-        delay    = "15s"  
-        mode     = "delay"
-      }
-    }
-  }
-}
diff --git a/app/garage-staging/secrets/garage-staging/rpc_secret b/app/garage-staging/secrets/garage-staging/rpc_secret
deleted file mode 100644
index d831d53..0000000
--- a/app/garage-staging/secrets/garage-staging/rpc_secret
+++ /dev/null
@@ -1 +0,0 @@
-CMD_ONCE openssl rand -hex 32