From 503ac9cad8bc348a31f23d2a721118eb1ce4653d Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Tue, 24 Sep 2024 20:33:23 +0200 Subject: lol --- .settings.sh | 2 +- bin/requirements.txt | 1 + docs/.$2023-10-23 - tnet.drawio.bkp | 468 ------------------------------- docs/2023-10-23 - tnet.drawio | 99 +++++-- terraform/telegraf/conflatorio/vault.yml | 5 +- 5 files changed, 77 insertions(+), 498 deletions(-) delete mode 100644 docs/.$2023-10-23 - tnet.drawio.bkp diff --git a/.settings.sh b/.settings.sh index 38b5e20..65db934 100644 --- a/.settings.sh +++ b/.settings.sh @@ -5,7 +5,7 @@ basedir=$(cd "$basedir" && pwd) export ANSIBLE_CONFIG=$basedir/ansible/ansible.cfg -echo "Adding bin/ to path" +PATH="$basedir/bin/env/bin:$PATH" PATH="$basedir/bin:$PATH" #echo "Adding bin/.tmp/asdf-data/shims/ to path" diff --git a/bin/requirements.txt b/bin/requirements.txt index cb4fdce..8a88990 100644 --- a/bin/requirements.txt +++ b/bin/requirements.txt @@ -1,3 +1,4 @@ ansible==10.3.0 gns3fy==0.8.0 netaddr==1.3.0 +swiplserver==1.0.2 diff --git a/docs/.$2023-10-23 - tnet.drawio.bkp b/docs/.$2023-10-23 - tnet.drawio.bkp deleted file mode 100644 index fd3376b..0000000 --- a/docs/.$2023-10-23 - tnet.drawio.bkp +++ /dev/null @@ -1,468 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/2023-10-23 - tnet.drawio b/docs/2023-10-23 - tnet.drawio index f8460bd..e70c06b 100644 --- a/docs/2023-10-23 - tnet.drawio +++ b/docs/2023-10-23 - tnet.drawio @@ -1,4 +1,4 @@ - + @@ -458,65 +458,68 @@ - + - + - - + + - + - - + + - - + + - - + + - - + + + + + - + - + - - + + - + - + - - + + - + - + - - + + @@ -525,6 +528,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/terraform/telegraf/conflatorio/vault.yml b/terraform/telegraf/conflatorio/vault.yml index 90061a8..e380599 100644 --- a/terraform/telegraf/conflatorio/vault.yml +++ b/terraform/telegraf/conflatorio/vault.yml @@ -1,5 +1,4 @@ influx_token: ENC[AES256_GCM,data:48AbbP7v1QRvK7h73J6RYb1BBXsKdF+8YREXqtvPlEk3DFHoncmPIVWCH0G8it21BJtBsAupnJCPoa9IR7nJMWZMy/2NotmjeJuBD7LYY05BFEs4K5y+yw==,iv:RbWI8JWTg1LHqNUAEsx42rFp7IIntkz7PR6l/kCl7z8=,tag:lCpcfh7xQR+29RhWEkG1lA==,type:str] -config_url: ENC[AES256_GCM,data:tlhn8wfyD7EETkWGeeLEVOVQ3OS+PXnfWL6zXbuKYxz2I4EftRTAG9QAGCw2nb2VpTkBG4AE3kkLKLTiNWFBQsQ=,iv:V1pSBlTeE3zFBI29DtrzgAySHxhTS5jp8kuc7HtCKiI=,tag:Yo8vqUr9gohQYvuwqFkdFw==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +14,8 @@ sops: Snd2V1FCL0hXUHA0R0FyUHBEUmNoeTAKK3uEAXKZetmJmn9vwleVzpfvIqyDMbuv FEYrJ4oBr+NykSfWqZSLB+y4DPTNyE2jhZ1vOK1u/CcxisaVa3o7+A== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-10-26T17:50:27Z" - mac: ENC[AES256_GCM,data:eFMCwmDaAvVaF1a45UQo/Z0lahAPVw5Mi7MH0m/UcVmvczad31gbPNuSZDAHyF+CWz4RmVCuqR0ukRBBXF5y18mVaTWC0zXhBaMsYIV3LR4CrdJ3wgmD5uY91X4un1aPJ/iR6T7w0wPfEaSnTR00n+f7tVhmyVfl6+9IwuUlcUo=,iv:Kme2RcQXWpYKPXfbzmK0JxbNyJqK1PEvLO6K4smWMLM=,tag:11nLZIVh7AYqhcO+1E6HmA==,type:str] + lastmodified: "2023-10-31T14:31:13Z" + mac: ENC[AES256_GCM,data:0KMb/2PdJybWd47RFIDn5bLaQzjKLATPDSgjmT7O79ErKvRu5gqt/or04kPcla1ToofNza1b1tH2nvJONTrIx8I/GCvy1nNa1sFfFa8cbb12em1SWwVIrqG8O2zEiQ9Wh2FW4x2wFRTinOEzwhAnum5OPD2K58fPWm6jFsG9fxY=,iv:SeCYnl/dngeAGOtTL3/qblrMXvRPPTfnhjoVSmbNGZA=,tag:t8grQyCkM0SWWFYWUomIJg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 -- cgit v1.2.3