Skip to content

Commit feb0c34

Browse files
kanshikanshi
committed
DA job convention updates, lock docker image
1 parent 49498ef commit feb0c34

2 files changed

Lines changed: 68 additions & 68 deletions

File tree

‎operations/anon-da-node-live.hcl‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ job "anon-da-node-live" {
6060
}
6161

6262
config {
63-
image = "ghcr.io/anyone-protocol/ator-protocol:PLACEIMAGETAGHERE"
63+
image = "ghcr.io/anyone-protocol/ator-protocol:bd506a47f917355bbe2742418481ec53bb89b261" // v0.4.9.11
6464
image_pull_timeout = "15m"
6565
ports = ["orport", "dirport"]
6666
volumes = [
@@ -133,51 +133,51 @@ job "anon-da-node-live" {
133133
template {
134134
change_mode = "noop"
135135
data = <<-EOH
136-
# Run Tor as a regular user (do not change this)
137-
User anond
138-
DataDirectory /var/lib/anon
136+
# Run Tor as a regular user (do not change this)
137+
User anond
138+
DataDirectory /var/lib/anon
139139
140-
AgreeToTerms 1
140+
AgreeToTerms 1
141141
142-
AuthoritativeDirectory 1
143-
V3AuthoritativeDirectory 1
142+
AuthoritativeDirectory 1
143+
V3AuthoritativeDirectory 1
144144
145-
# Server's public IP Address (usually automatic)
146-
Address {{ key (env "node.unique.id" | printf "ator-network/live/dir-auth-%s/public_ipv4") }}
145+
# Server's public IP Address (usually automatic)
146+
Address {{ key (env "node.unique.id" | printf "ator-network/live/dir-auth-%s/public_ipv4") }}
147147
148-
# Port to advertise for incoming Tor connections.
149-
ORPort 9201 # common ports are 9001, 443
150-
#ORPort 1.1.1.1:9001
148+
# Port to advertise for incoming Tor connections.
149+
ORPort 9201 # common ports are 9001, 443
150+
#ORPort 1.1.1.1:9001
151151
152-
# Mirror directory information for others (optional, not used on bridge)
153-
DirPort 9230 # common ports are 9030, 80
152+
# Mirror directory information for others (optional, not used on bridge)
153+
DirPort 9230 # common ports are 9030, 80
154154
155-
# Run Tor only as a server (no local applications)
156-
SocksPort 0
157-
ControlSocket 0
155+
# Run Tor only as a server (no local applications)
156+
SocksPort 0
157+
ControlSocket 0
158158
159-
# Run as a relay only (change policy to enable exit node)
160-
ExitPolicy reject *:* # no exits allowed
161-
ExitPolicy reject6 *:*
162-
ExitRelay 0
163-
IPv6Exit 0
159+
# Run as a relay only (change policy to enable exit node)
160+
ExitPolicy reject *:* # no exits allowed
161+
ExitPolicy reject6 *:*
162+
ExitRelay 0
163+
IPv6Exit 0
164164
165-
AuthDirMaxServersPerAddr 8
165+
AuthDirMaxServersPerAddr 8
166166
167-
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"
167+
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"
168168
169-
# Set limits
170-
#AccountingMax 999 GB
171-
#RelayBandwidthRate 512 KB # Throttle traffic to
172-
#RelayBandwidthBurst 1024 KB # But allow bursts up to
173-
#MaxMemInQueues 512 MB # Limit Memory usage to
169+
# Set limits
170+
#AccountingMax 999 GB
171+
#RelayBandwidthRate 512 KB # Throttle traffic to
172+
#RelayBandwidthBurst 1024 KB # But allow bursts up to
173+
#MaxMemInQueues 512 MB # Limit Memory usage to
174174
175-
## If no Nickname or ContactInfo is set, docker-entrypoint will use
176-
## the environment variables to add Nickname/ContactInfo below
177-
Nickname {{ key (env "node.unique.id" | printf "ator-network/live/dir-auth-%s/nickname") }}
178-
ContactInfo atorv4@example.org
175+
## If no Nickname or ContactInfo is set, docker-entrypoint will use
176+
## the environment variables to add Nickname/ContactInfo below
177+
Nickname {{ key (env "node.unique.id" | printf "ator-network/live/dir-auth-%s/nickname") }}
178+
ContactInfo atorv4@example.org
179179
180-
V3BandwidthsFile /var/lib/sbws/v3bw/latest.v3bw
180+
V3BandwidthsFile /var/lib/sbws/v3bw/latest.v3bw
181181
EOH
182182
destination = "local/anonrc"
183183
}

‎operations/anon-da-node-stage.hcl‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ job "anon-da-node-stage" {
6060
}
6161

6262
config {
63-
image = "ghcr.io/anyone-protocol/ator-protocol:PLACEIMAGETAGHERE"
63+
image = "ghcr.io/anyone-protocol/ator-protocol:bd506a47f917355bbe2742418481ec53bb89b261" // v0.4.9.11
6464
image_pull_timeout = "15m"
6565
ports = ["orport", "dirport"]
6666
volumes = [
@@ -133,51 +133,51 @@ job "anon-da-node-stage" {
133133
template {
134134
change_mode = "noop"
135135
data = <<-EOH
136-
# Run Tor as a regular user (do not change this)
137-
User anond
138-
DataDirectory /var/lib/anon
136+
# Run Tor as a regular user (do not change this)
137+
User anond
138+
DataDirectory /var/lib/anon
139139
140-
AgreeToTerms 1
140+
AgreeToTerms 1
141141
142-
AuthoritativeDirectory 1
143-
V3AuthoritativeDirectory 1
142+
AuthoritativeDirectory 1
143+
V3AuthoritativeDirectory 1
144144
145-
# Server's public IP Address (usually automatic)
146-
Address {{ key (env "node.unique.id" | printf "ator-network/stage/dir-auth-%s/public_ipv4") }}
145+
# Server's public IP Address (usually automatic)
146+
Address {{ key (env "node.unique.id" | printf "ator-network/stage/dir-auth-%s/public_ipv4") }}
147147
148-
# Port to advertise for incoming Tor connections.
149-
ORPort 9201 # common ports are 9001, 443
150-
#ORPort 1.1.1.1:9001
148+
# Port to advertise for incoming Tor connections.
149+
ORPort 9201 # common ports are 9001, 443
150+
#ORPort 1.1.1.1:9001
151151
152-
# Mirror directory information for others (optional, not used on bridge)
153-
DirPort 9230 # common ports are 9030, 80
152+
# Mirror directory information for others (optional, not used on bridge)
153+
DirPort 9230 # common ports are 9030, 80
154154
155-
# Run Tor only as a server (no local applications)
156-
SocksPort 0
157-
ControlSocket 0
155+
# Run Tor only as a server (no local applications)
156+
SocksPort 0
157+
ControlSocket 0
158158
159-
# Run as a relay only (change policy to enable exit node)
160-
ExitPolicy reject *:* # no exits allowed
161-
ExitPolicy reject6 *:*
162-
ExitRelay 0
163-
IPv6Exit 0
159+
# Run as a relay only (change policy to enable exit node)
160+
ExitPolicy reject *:* # no exits allowed
161+
ExitPolicy reject6 *:*
162+
ExitRelay 0
163+
IPv6Exit 0
164164
165-
AuthDirMaxServersPerAddr 8
165+
AuthDirMaxServersPerAddr 8
166166
167-
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"
167+
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"
168168
169-
# Set limits
170-
#AccountingMax 999 GB
171-
#RelayBandwidthRate 512 KB # Throttle traffic to
172-
#RelayBandwidthBurst 1024 KB # But allow bursts up to
173-
#MaxMemInQueues 512 MB # Limit Memory usage to
169+
# Set limits
170+
#AccountingMax 999 GB
171+
#RelayBandwidthRate 512 KB # Throttle traffic to
172+
#RelayBandwidthBurst 1024 KB # But allow bursts up to
173+
#MaxMemInQueues 512 MB # Limit Memory usage to
174174
175-
## If no Nickname or ContactInfo is set, docker-entrypoint will use
176-
## the environment variables to add Nickname/ContactInfo below
177-
Nickname {{ key (env "node.unique.id" | printf "ator-network/stage/dir-auth-%s/nickname") }}
178-
ContactInfo atorv4@example.org
175+
## If no Nickname or ContactInfo is set, docker-entrypoint will use
176+
## the environment variables to add Nickname/ContactInfo below
177+
Nickname {{ key (env "node.unique.id" | printf "ator-network/stage/dir-auth-%s/nickname") }}
178+
ContactInfo atorv4@example.org
179179
180-
V3BandwidthsFile /var/lib/sbws/v3bw/latest.v3bw
180+
V3BandwidthsFile /var/lib/sbws/v3bw/latest.v3bw
181181
EOH
182182
destination = "local/anonrc"
183183
}

0 commit comments

Comments
 (0)