From ffadc7b847b027441d995e8e70d742854d6ecbea Mon Sep 17 00:00:00 2001
From: Saundr21 <saunder@ator.io>
Date: Sun, 11 Aug 2024 03:06:23 +0100
Subject: [PATCH] Prepare increase in stage DAs

---
 .github/workflows/stage-build-and-deploy.yml |   4 +
 .github/workflows/stage-deploy.yml           |   4 +
 operations/anon-da-node-stage.hcl            | 421 ++++++++++++++++---
 3 files changed, 370 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/stage-build-and-deploy.yml b/.github/workflows/stage-build-and-deploy.yml
index 760ec7e2b9..c3dca8a379 100644
--- a/.github/workflows/stage-build-and-deploy.yml
+++ b/.github/workflows/stage-build-and-deploy.yml
@@ -12,6 +12,10 @@ env:
   da-1-hc-url: http://88.99.219.105:9130/tor/status-vote/current/consensus
   da-2-hc-url: http://176.9.29.53:9130/tor/status-vote/current/consensus
   da-3-hc-url: http://95.216.32.105:9130/tor/status-vote/current/consensus
+  da-4-hc-url: http://176.9.29.53:9131/tor/status-vote/current/consensus
+  da-5-hc-url: http://176.9.29.53:9132/tor/status-vote/current/consensus
+  da-6-hc-url: http://95.216.32.105:9131/tor/status-vote/current/consensus
+  da-7-hc-url: http://95.216.32.105:9132/tor/status-vote/current/consensus
 
 jobs:
   build-and-push:
diff --git a/.github/workflows/stage-deploy.yml b/.github/workflows/stage-deploy.yml
index 54d7201977..82f8d84fee 100644
--- a/.github/workflows/stage-deploy.yml
+++ b/.github/workflows/stage-deploy.yml
@@ -10,6 +10,10 @@ env:
   da-1-hc-url: http://88.99.219.105:9130/tor/status-vote/current/consensus
   da-2-hc-url: http://176.9.29.53:9130/tor/status-vote/current/consensus
   da-3-hc-url: http://95.216.32.105:9130/tor/status-vote/current/consensus
+  da-4-hc-url: http://176.9.29.53:9131/tor/status-vote/current/consensus
+  da-5-hc-url: http://176.9.29.53:9132/tor/status-vote/current/consensus
+  da-6-hc-url: http://95.216.32.105:9131/tor/status-vote/current/consensus
+  da-7-hc-url: http://95.216.32.105:9132/tor/status-vote/current/consensus
 
 jobs:
   push:
diff --git a/operations/anon-da-node-stage.hcl b/operations/anon-da-node-stage.hcl
index bbe96d979a..b30be5d4c0 100644
--- a/operations/anon-da-node-stage.hcl
+++ b/operations/anon-da-node-stage.hcl
@@ -1,30 +1,66 @@
-#TODO: use templating to avoid copypaste
-
 job "dir-auth-stage" {
   datacenters = ["ator-fin"]
   type = "service"
   namespace = "ator-network"
 
-  group "dir-auth-stage-group" {
-    count = 3
+  meta {
+    anonrc_template = <<EOF
+# Run Tor as a regular user (do not change this)
+User anond
+DataDirectory /var/lib/anon
 
-    spread {
-      attribute = "${node.unique.id}"
-      weight    = 100
-      target "c8e55509-a756-0aa7-563b-9665aa4915ab" {
-        percent = 34
-      }
-      target "c2adc610-6316-cd9d-c678-cda4b0080b52" {
-        percent = 33
-      }
-      target "4aa61f61-893a-baf4-541b-870e99ac4839" {
-        percent = 33
-      }
+AgreeToTerms 1
+
+AuthoritativeDirectory 1
+V3AuthoritativeDirectory 1
+
+# Run Tor only as a server (no local applications)
+SocksPort 0
+ControlSocket 0
+
+# Run as a relay only (change policy to enable exit node)
+ExitPolicy reject *:*        # no exits allowed
+ExitPolicy reject6 *:*
+ExitRelay 0
+IPv6Exit 0
+
+AuthDirMaxServersPerAddr 8
+
+ConsensusParams "CircuitPriorityHalflifeMsec=30000 DoSCircuitCreationBurst=60 DoSCircuitCreationEnabled=1 DoSCircuitCreationMinConnections=2 DoSCircuitCreationRate=2 DoSConnectionEnabled=1 DoSConnectionMaxConcurrentCount=50 DoSRefuseSingleHopClientRendezvous=1 ExtendByEd25519ID=1 KISTSchedRunInterval=3 NumNTorsPerTAP=100 UseOptimisticData=1 bwauthpid=1 bwscanner_cc=1 cbttestfreq=10 cc_alg=2 cc_cwnd_full_gap=4 cc_cwnd_full_minpct=25 cc_cwnd_inc=1 cc_cwnd_inc_rate=31 cc_cwnd_min=124 cc_sscap_exit=600 cc_sscap_onion=475 cc_vegas_alpha_exit=186 cc_vegas_beta_onion=372 cc_vegas_delta_exit=310 cc_vegas_delta_onion=434 cc_vegas_gamma_onion=248 cfx_low_exit_threshold=5000 circ_max_cell_queue_size=1250 circ_max_cell_queue_size_out=1000 dos_num_circ_max_outq=5 guard-n-primary-dir-guards-to-use=2"
+
+# Set limits
+#AccountingMax 999 GB
+#RelayBandwidthRate 512 KB   # Throttle traffic to
+#RelayBandwidthBurst 1024 KB # But allow bursts up to
+#MaxMemInQueues 512 MB       # Limit Memory usage to
+
+## If no Nickname or ContactInfo is set, docker-entrypoint will use
+## the environment variables to add Nickname/ContactInfo below
+ContactInfo atorv4@example.org
+
+V3BandwidthsFile /var/lib/sbws/v3bw/latest.v3bw
+EOF
+  }
+
+  spread {
+    attribute = "${node.unique.id}"
+    weight    = 100
+    target "c8e55509-a756-0aa7-563b-9665aa4915ab" {
+      percent = 14
+    }
+    target "c2adc610-6316-cd9d-c678-cda4b0080b52" {
+      percent = 43
     }
+    target "4aa61f61-893a-baf4-541b-870e99ac4839" {
+      percent = 43
+    }
+  }
 
-    network  {
+  group "dir-auth-stage" {
+    count = 3
+
+    network {
       mode = "bridge"
-      
       port "orport" {
         static = 9101
       }
@@ -74,115 +110,382 @@ job "dir-auth-stage" {
       }
 
       resources {
-        cpu = 2560
+        cpu    = 2560
         memory = 2560
       }
 
       template {
         change_mode = "noop"
         data = <<EOH
-           {{ key (env `node.unique.id` | printf `ator-network/stage/dir-auth-%s/authority_certificate`) }}
+           {{ key (printf `ator-network/stage/dir-auth-%s/authority_certificate` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}
         EOH
         destination = "secrets/anon/keys/authority_certificate"
       }
 
       template {
         change_mode = "noop"
-        data = "{{ with secret (env `node.unique.id` | printf `kv/ator-network/stage/dir-auth-%s`) }}{{ .Data.data.authority_identity_key}}{{end}}"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ .Data.data.authority_identity_key}}{{end}}"
         destination = "secrets/anon/keys/authority_identity_key"
       }
 
       template {
         change_mode = "noop"
-        data = "{{ with secret  (env `node.unique.id` | printf `kv/ator-network/stage/dir-auth-%s`) }}{{.Data.data.authority_signing_key}}{{end}}"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{.Data.data.authority_signing_key}}{{end}}"
         destination = "secrets/anon/keys/authority_signing_key"
       }
 
       template {
         change_mode = "noop"
-        data = "{{ with secret  (env `node.unique.id` | printf `kv/ator-network/stage/dir-auth-%s`) }}{{ base64Decode .Data.data.ed25519_master_id_secret_key_base64}}{{end}}"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.ed25519_master_id_secret_key_base64}}{{end}}"
         destination = "secrets/anon/keys/ed25519_master_id_secret_key"
       }
 
       template {
         change_mode = "noop"
-        data = "{{ with secret  (env `node.unique.id` | printf `kv/ator-network/stage/dir-auth-%s`) }}{{ base64Decode .Data.data.ed25519_signing_secret_key_base64}}{{end}}"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.ed25519_signing_secret_key_base64}}{{end}}"
         destination = "secrets/anon/keys/ed25519_signing_secret_key"
       }
 
       template {
         change_mode = "noop"
-        data = "{{ with secret  (env `node.unique.id` | printf `kv/ator-network/stage/dir-auth-%s`) }}{{ base64Decode .Data.data.secret_id_key_base64}}{{end}}"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.secret_id_key_base64}}{{end}}"
         destination = "secrets/anon/keys/secret_id_key"
       }
 
       template {
         change_mode = "noop"
-        data = "{{ with secret  (env `node.unique.id` | printf `kv/ator-network/stage/dir-auth-%s`) }}{{ base64Decode .Data.data.secret_onion_key_base64}}{{end}}"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.secret_onion_key_base64}}{{end}}"
         destination = "secrets/anon/keys/secret_onion_key"
       }
 
       template {
         change_mode = "noop"
-        data = "{{ with secret  (env `node.unique.id` | printf `kv/ator-network/stage/dir-auth-%s`) }}{{ base64Decode .Data.data.secret_onion_key_ntor_base64}}{{end}}"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.secret_onion_key_ntor_base64}}{{end}}"
         destination = "secrets/anon/keys/secret_onion_key_ntor"
       }
 
       template {
         change_mode = "noop"
         data = <<EOH
-# Run Tor as a regular user (do not change this)
-User anond
-DataDirectory /var/lib/anon
+{{ env "NOMAD_META_anonrc_template" }}
 
-AgreeToTerms 1
+# Server's public IP Address (usually automatic)
+Address {{ key (printf "ator-network/stage/dir-auth-%s-%d/public_ipv4" (env "node.unique.id") (env "NOMAD_PORT_orport")) }}
 
-AuthoritativeDirectory 1
-V3AuthoritativeDirectory 1
+# Port to advertise for incoming Tor connections.
+ORPort {{ env "NOMAD_PORT_orport" }}
+
+# Mirror directory information for others (optional, not used on bridge)
+DirPort {{ env "NOMAD_PORT_dirport" }}
+
+Nickname {{ key (printf "ator-network/stage/dir-auth-%s-%d/nickname" (env "node.unique.id") (env "NOMAD_PORT_orport")) }}
+        EOH
+        destination = "local/anonrc"
+      }
+
+      service {
+        name = "dir-auth-stage-1"
+        port = "dirport"
+        tags = ["logging"]
+        check {
+          name     = "dir auth stage alive"
+          type     = "tcp"
+          interval = "10s"
+          timeout  = "10s"
+          check_restart {
+            limit = 10
+            grace = "30s"
+          }
+        }
+      }
+    }
+  }
+
+  group "dir-auth-stage-group-2" {
+    count = 2
+
+    constraint {
+      operator = "distinct_hosts"
+      value    = "true"
+    }
+
+    network {
+      mode = "bridge"
+      port "orport" {
+        static = 9102
+      }
+      port "dirport" {
+        static = 9131
+      }
+    }
+
+    volume "dir-auth-stage-group-2" {
+      type      = "host"
+      read_only = false
+      source    = "dir-auth-stage-group-2"
+    }
+
+    volume "sbws-stage-group-2" {
+      type      = "host"
+      read_only = false
+      source    = "sbws-stage-group-2"
+    }
+
+    task "dir-auth-stage-task" {
+      driver = "docker"
+
+      volume_mount {
+        volume      = "dir-auth-stage-group-2"
+        destination = "/var/lib/anon/"
+        read_only   = false
+      }
+
+      volume_mount {
+        volume      = "sbws-stage-group-2"
+        destination = "/var/lib/sbws/"
+        read_only   = false
+      }
+
+      config {
+        image = "ghcr.io/ator-development/ator-protocol-stage:PLACEIMAGETAGHERE"
+        ports = ["orport", "dirport"]
+        volumes = [
+          "local/anonrc:/etc/anon/anonrc",
+          "secrets/anon/keys:/var/lib/anon/keys"
+        ]
+      }
+
+      vault {
+        policies = ["ator-network-read"]
+      }
+
+      resources {
+        cpu    = 2560
+        memory = 2560
+      }
+
+      template {
+        change_mode = "noop"
+        data = <<EOH
+           {{ key (printf `ator-network/stage/dir-auth-%s/authority_certificate` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}
+        EOH
+        destination = "secrets/anon/keys/authority_certificate"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ .Data.data.authority_identity_key}}{{end}}"
+        destination = "secrets/anon/keys/authority_identity_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{.Data.data.authority_signing_key}}{{end}}"
+        destination = "secrets/anon/keys/authority_signing_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.ed25519_master_id_secret_key_base64}}{{end}}"
+        destination = "secrets/anon/keys/ed25519_master_id_secret_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.ed25519_signing_secret_key_base64}}{{end}}"
+        destination = "secrets/anon/keys/ed25519_signing_secret_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.secret_id_key_base64}}{{end}}"
+        destination = "secrets/anon/keys/secret_id_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.secret_onion_key_base64}}{{end}}"
+        destination = "secrets/anon/keys/secret_onion_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.secret_onion_key_ntor_base64}}{{end}}"
+        destination = "secrets/anon/keys/secret_onion_key_ntor"
+      }
+
+      template {
+        change_mode = "noop"
+        data = <<EOH
+{{ env "NOMAD_META_anonrc_template" }}
 
 # Server's public IP Address (usually automatic)
-Address {{ key (env "node.unique.id" | printf "ator-network/stage/dir-auth-%s/public_ipv4") }}
+Address {{ key (printf "ator-network/stage/dir-auth-%s-%d/public_ipv4" (env "node.unique.id") (env "NOMAD_PORT_orport")) }}
 
 # Port to advertise for incoming Tor connections.
-ORPort {{ env `NOMAD_PORT_orport` }}
+ORPort {{ env "NOMAD_PORT_orport" }}
 
 # Mirror directory information for others (optional, not used on bridge)
-DirPort {{ env `NOMAD_PORT_dirport` }}
+DirPort {{ env "NOMAD_PORT_dirport" }}
 
-# Run Tor only as a server (no local applications)
-SocksPort 0
-ControlSocket 0
+Nickname {{ key (printf "ator-network/stage/dir-auth-%s-%d/nickname" (env "node.unique.id") (env "NOMAD_PORT_orport")) }}
+        EOH
+        destination = "local/anonrc"
+      }
 
-# Run as a relay only (change policy to enable exit node)
-ExitPolicy reject *:*        # no exits allowed
-ExitPolicy reject6 *:*
-ExitRelay 0
-IPv6Exit 0
+      service {
+        name = "dir-auth-stage-2"
+        port = "dirport"
+        tags = ["logging"]
+        check {
+          name     = "dir auth stage alive"
+          type     = "tcp"
+          interval = "10s"
+          timeout  = "10s"
+          check_restart {
+            limit = 10
+            grace = "30s"
+          }
+        }
+      }
+    }
+  }
 
-AuthDirMaxServersPerAddr 8
+  group "dir-auth-stage-group-3" {
+    count = 2
 
-ConsensusParams "CircuitPriorityHalflifeMsec=30000 DoSCircuitCreationBurst=60 DoSCircuitCreationEnabled=1 DoSCircuitCreationMinConnections=2 DoSCircuitCreationRate=2 DoSConnectionEnabled=1 DoSConnectionMaxConcurrentCount=50 DoSRefuseSingleHopClientRendezvous=1 ExtendByEd25519ID=1 KISTSchedRunInterval=3 NumNTorsPerTAP=100 UseOptimisticData=1 bwauthpid=1 bwscanner_cc=1 cbttestfreq=10 cc_alg=2 cc_cwnd_full_gap=4 cc_cwnd_full_minpct=25 cc_cwnd_inc=1 cc_cwnd_inc_rate=31 cc_cwnd_min=124 cc_sscap_exit=600 cc_sscap_onion=475 cc_vegas_alpha_exit=186 cc_vegas_beta_onion=372 cc_vegas_delta_exit=310 cc_vegas_delta_onion=434 cc_vegas_gamma_onion=248 cfx_low_exit_threshold=5000 circ_max_cell_queue_size=1250 circ_max_cell_queue_size_out=1000 dos_num_circ_max_outq=5 guard-n-primary-dir-guards-to-use=2"
+    constraint {
+      operator = "distinct_hosts"
+      value    = "true"
+    }
 
-# Set limits
-#AccountingMax 999 GB
-#RelayBandwidthRate 512 KB   # Throttle traffic to
-#RelayBandwidthBurst 1024 KB # But allow bursts up to
-#MaxMemInQueues 512 MB       # Limit Memory usage to
+    network {
+      mode = "bridge"
+      port "orport" {
+        static = 9103
+      } 
+      port "dirport" {
+        static = 9132
+      }
+    }
 
-## If no Nickname or ContactInfo is set, docker-entrypoint will use
-## the environment variables to add Nickname/ContactInfo below
-Nickname {{ key (env "node.unique.id" | printf "ator-network/stage/dir-auth-%s/nickname") }}
-ContactInfo atorv4@example.org
+    volume "dir-auth-stage-group-3" {
+      type      = "host"
+      read_only = false
+      source    = "dir-auth-stage-group-3"
+    }
 
-V3BandwidthsFile /var/lib/sbws/v3bw/latest.v3bw
+    volume "sbws-stage-group-3" {
+      type      = "host"
+      read_only = false
+      source    = "sbws-stage-group-3"
+    }
+
+    task "dir-auth-stage-task" {
+        driver = "docker"
+     volume_mount {
+        volume      = "dir-auth-stage-group-3"
+        destination = "/var/lib/anon/"
+        read_only   = false
+      }
+
+      volume_mount {
+        volume      = "sbws-stage-group-3"
+        destination = "/var/lib/sbws/"
+        read_only   = false
+      }
+
+      config {
+        image = "ghcr.io/ator-development/ator-protocol-stage:PLACEIMAGETAGHERE"
+        ports = ["orport", "dirport"]
+        volumes = [
+          "local/anonrc:/etc/anon/anonrc",
+          "secrets/anon/keys:/var/lib/anon/keys"
+        ]
+      }
+
+      vault {
+        policies = ["ator-network-read"]
+      }
+
+      resources {
+        cpu    = 2560
+        memory = 2560
+      }
+
+      template {
+        change_mode = "noop"
+        data = <<EOH
+           {{ key (printf `ator-network/stage/dir-auth-%s/authority_certificate` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}
+        EOH
+        destination = "secrets/anon/keys/authority_certificate"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ .Data.data.authority_identity_key}}{{end}}"
+        destination = "secrets/anon/keys/authority_identity_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{.Data.data.authority_signing_key}}{{end}}"
+        destination = "secrets/anon/keys/authority_signing_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.ed25519_master_id_secret_key_base64}}{{end}}"
+        destination = "secrets/anon/keys/ed25519_master_id_secret_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.ed25519_signing_secret_key_base64}}{{end}}"
+        destination = "secrets/anon/keys/ed25519_signing_secret_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.secret_id_key_base64}}{{end}}"
+        destination = "secrets/anon/keys/secret_id_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.secret_onion_key_base64}}{{end}}"
+        destination = "secrets/anon/keys/secret_onion_key"
+      }
+
+      template {
+        change_mode = "noop"
+        data = "{{ with secret (printf `kv/ator-network/stage/dir-auth-%s-%d` (env `node.unique.id`) (env `NOMAD_PORT_orport`)) }}{{ base64Decode .Data.data.secret_onion_key_ntor_base64}}{{end}}"
+        destination = "secrets/anon/keys/secret_onion_key_ntor"
+      }
+
+      template {
+        change_mode = "noop"
+        data = <<EOH
+{{ env "NOMAD_META_anonrc_template" }}
+
+# Server's public IP Address (usually automatic)
+Address {{ key (printf "ator-network/stage/dir-auth-%s-%d/public_ipv4" (env "node.unique.id") (env "NOMAD_PORT_orport")) }}
+
+# Port to advertise for incoming Tor connections.
+ORPort {{ env "NOMAD_PORT_orport" }}
+
+# Mirror directory information for others (optional, not used on bridge)
+DirPort {{ env "NOMAD_PORT_dirport" }}
+
+Nickname {{ key (printf "ator-network/stage/dir-auth-%s-%d/nickname" (env "node.unique.id") (env "NOMAD_PORT_orport")) }}
         EOH
         destination = "local/anonrc"
       }
 
       service {
-        name = "dir-auth-stage"
+        name = "dir-auth-stage-3"
         port = "dirport"
-        tags     = ["logging"]
+        tags = ["logging"]
         check {
           name     = "dir auth stage alive"
           type     = "tcp"
@@ -196,4 +499,4 @@ V3BandwidthsFile /var/lib/sbws/v3bw/latest.v3bw
       }
     }
   }
-}
+}
\ No newline at end of file