Deuxfleurs/nixcfg
17
6
Fork 2
Code Issues 15 Pull requests 2 Projects Releases Wiki Activity

Simplify network configuration #11

Merged
lx merged 25 commits from simplify-network-config into main 2023-05-16 13:19:33 +00:00
Conversation 0 Commits 25 Files changed 43 +2 -3
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cb8d7e92d2 - Show all commits

5
cluster/staging/app/core/deploy/core-system.hcl
View file

@ -13,7 +13,6 @@ job "core-system" {
stagger = "1m" stagger = "1m"
} }
/*
group "diplonat" { group "diplonat" {
task "diplonat" { task "diplonat" {
driver = "nix2" driver = "nix2"
@ -21,7 +20,7 @@ job "core-system" {
config { config {
packages = [ packages = [
"#iptables", "#iptables",
"git+https://git.deuxfleurs.fr/Deuxfleurs/diplonat.git?ref=main&rev=f306e8dc8d0e93478353ce39b6064e8c06a8bca6" "git+https://git.deuxfleurs.fr/Deuxfleurs/diplonat.git?ref=stun&rev=21ab77b8288630c5f39a30b098c6a3888df622a1"
] ]
command = "diplonat" command = "diplonat"
} }
@ -53,6 +52,7 @@ job "core-system" {
data = <<EOH data = <<EOH
DIPLONAT_REFRESH_TIME=60 DIPLONAT_REFRESH_TIME=60
DIPLONAT_EXPIRATION_TIME=300 DIPLONAT_EXPIRATION_TIME=300
DIPLONAT_IPV6_ONLY=true
DIPLONAT_CONSUL_NODE_NAME={{ env "attr.unique.hostname" }} DIPLONAT_CONSUL_NODE_NAME={{ env "attr.unique.hostname" }}
DIPLONAT_CONSUL_URL=https://localhost:8501 DIPLONAT_CONSUL_URL=https://localhost:8501
DIPLONAT_CONSUL_CA_CERT=/etc/diplonat/consul-ca.crt DIPLONAT_CONSUL_CA_CERT=/etc/diplonat/consul-ca.crt
@ -69,7 +69,6 @@ EOH
} }
} }
} }
*/
group "tricot" { group "tricot" {
network { network {