From 87accba9fc91bb5cdf656c8757a5aaa63b6eadf4 Mon Sep 17 00:00:00 2001 From: Ember 'n0emis' Keske Date: Sun, 24 Jul 2022 12:10:45 +0200 Subject: [PATCH] add sipgate-secrets --- hosts/yate-dialup/secrets.yaml | 7 +++---- switchconfig/sw-technik-container | 2 +- switchconfig/sw-technik-zelt | 22 +++++++++++++++++++++- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/hosts/yate-dialup/secrets.yaml b/hosts/yate-dialup/secrets.yaml index 8af3d8f..29646b2 100644 --- a/hosts/yate-dialup/secrets.yaml +++ b/hosts/yate-dialup/secrets.yaml @@ -1,5 +1,4 @@ -sipgate_user: ENC[AES256_GCM,data:LN+orRI7,iv:kiqcyMVTNQQI7kREr4DXT1P8lMq6Cq+E5zDSnTkCMM0=,tag:uKmxgnfaiFyeQw9d7i+AeA==,type:str] -sipgate_password: ENC[AES256_GCM,data:vbWL/aqu,iv:h7N93PsQs/N3RSvgiSNZZ88cJFWLyNJmA+6v7rxO3gk=,tag:QU2YoiGWRBKc73mLZq4Png==,type:str] +sipgate_password: ENC[AES256_GCM,data:mqqkkCaMYsuEWpjW,iv:JhTKMKdj2gj9uRVBWm/kVmaHgTggdBUWZ7Af73IJa94=,tag:PhPnkrvE7NWkfOpCM39Kkg==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +14,8 @@ sops: WWZiOTdRS3pUdi9sb1hraHZ5aFFHUkUKCo+qUjs8zXH4PSIv8ONpkOFM+T4I94E8 Cf30aeB7OeViVTfV6+tg76zrbdJ0uyQVJcIfbQPlDflvbrS2/D28xQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2022-07-18T06:44:56Z" - mac: ENC[AES256_GCM,data:uAh1zM3J5w7ZAFgKk3sRQqs3AmjnRLUCD+aGo9XlsG0xGbwKM6uJ3DHXY2MUSJJNy09nDLXBg4Q20no9BBAhyY5/VY4cYLSlZt5RineplKnotAeAbaf/LmqoPcixwOuWWeHFtpZ0ny4DoBGOjI9zbKIrrg5Psqq/tKsL6uji6vA=,iv:hgRYwAn6mfhg4wtXzXdxpyYdRun7ytSkhV3aAPFhQvU=,tag:oNr/F0EOd9wccc5/FObhAg==,type:str] + lastmodified: "2022-07-24T08:41:00Z" + mac: ENC[AES256_GCM,data:w6DF3AY6rRDhef6ZClFe4jvS7NIWADTTp4nP9a0CIE4F7hFQRNeQMG92OgKajaSDZhmo6gVWWm0IO9Bw2WlndLgTISigjHnQUMF0/p8HXhc69Bpnl9RVa1mghs4qLiGys5HIHBnSVnkj9Sq7W9psOwS4sTpFGVj/BMEcB3nfrYw=,iv:HWVDMWAJ5SoCuW34+Bu7iRzr39RassXqKSFsE/OCHaA=,tag:WqGcnCiLRVW6IvQCtXT0dQ==,type:str] pgp: - created_at: "2022-07-18T06:44:35Z" enc: | diff --git a/switchconfig/sw-technik-container b/switchconfig/sw-technik-container index ed80db3..7e05ef3 100644 --- a/switchconfig/sw-technik-container +++ b/switchconfig/sw-technik-container @@ -106,7 +106,7 @@ interfaces { unit 0 { family ethernet-switching { vlan { - members VL_TECHNIK; + members VL_WLAN; } } } diff --git a/switchconfig/sw-technik-zelt b/switchconfig/sw-technik-zelt index be86d9d..59e4d54 100644 --- a/switchconfig/sw-technik-zelt +++ b/switchconfig/sw-technik-zelt @@ -115,11 +115,31 @@ interfaces { unit 0 { family ethernet-switching { vlan { - members VL_DECT; + members VL_SIP; } } } } + ge-0/0/17 { + unit 0 { + family ethernet-switching { + vlan { + members VL_SIP; + } + } + } + } + ge-0/0/22 { + unit 0 { + family ethernet-switching { + port-mode trunk; + vlan { + members VL_MGMT; + } + native-vlan-id VL_WLAN; + } + } + } ge-0/0/23 { unit 0 { family ethernet-switching {