From 91bdee7dd0ac816861e9027b99b4ab270f0e0b3e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 8 Jan 2022 00:41:43 +0100 Subject: dmz01 --- files/files/etc/config/network | 10 ++++++++++ files/files/etc/config/wireless | 30 ++++++++++++++++++++++++++++-- patches/shannon-passphrase.patch.sops | 21 --------------------- wifi-passphrase.patch.sops | 21 +++++++++++++++++++++ 4 files changed, 59 insertions(+), 23 deletions(-) delete mode 100644 patches/shannon-passphrase.patch.sops create mode 100644 wifi-passphrase.patch.sops diff --git a/files/files/etc/config/network b/files/files/etc/config/network index cec228b..fd55ab9 100644 --- a/files/files/etc/config/network +++ b/files/files/etc/config/network @@ -8,6 +8,11 @@ config interface 'lan' option type 'bridge' option proto 'none' list ifname 'eth0.3' + +config interface 'dmz01' + option type 'bridge' + option proto 'none' + list ifname 'eth0.4' config interface 'mgmt' option type 'bridge' @@ -33,3 +38,8 @@ config switch_vlan option device 'switch0' option vlan '3' option ports '2t 0t' + +config switch_vlan + option device 'switch0' + option vlan '4' + option ports '2t 0t' \ No newline at end of file diff --git a/files/files/etc/config/wireless b/files/files/etc/config/wireless index 6f06f25..e6192bc 100644 --- a/files/files/etc/config/wireless +++ b/files/files/etc/config/wireless @@ -10,7 +10,7 @@ config wifi-iface 'default_radio0' option device 'radio0' option network 'lan' option mode 'ap' - option key '' + option key '' option ssid 'shannon' option encryption 'psk2+ccmp' option ieee80211r '1' @@ -19,6 +19,19 @@ config wifi-iface 'default_radio0' option ft_over_ds '1' option pmk_r1_push '1' +config wifi-iface 'dmz01_radio0' + option device 'radio2' + option network 'dmz01' + option mode 'ap' + option key '' + option ssid 'tesla' + option encryption 'psk2+ccmp' + option ieee80211r '1' + option mobility_domain 'e612' + option ft_psk_generate_local '1' + option ft_over_ds '1' + option pmk_r1_push '1' + config wifi-device 'radio1' option type 'mac80211' option hwmode '11g' @@ -33,7 +46,20 @@ config wifi-iface 'default_radio1' option mode 'ap' option ssid 'shannon' option encryption 'psk2+ccmp' - option key '' + option key '' + option ieee80211r '1' + option mobility_domain 'e612' + option ft_psk_generate_local '1' + option ft_over_ds '1' + option pmk_r1_push '1' + +config wifi-iface 'dmz01_radio1' + option device 'radio3' + option network 'dmz01' + option mode 'ap' + option ssid 'teslo' + option encryption 'psk2+ccmp' + option key '' option ieee80211r '1' option mobility_domain 'e612' option ft_psk_generate_local '1' diff --git a/patches/shannon-passphrase.patch.sops b/patches/shannon-passphrase.patch.sops deleted file mode 100644 index 592aa7f..0000000 --- a/patches/shannon-passphrase.patch.sops +++ /dev/null @@ -1,21 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:fL0e0Vt/uesQkV/tMz3DusvCfaKnBEZEtphBdqsg6d/GGU1Ob8PHAwpvtAuEkI+5iY5oJaN6iuatdRQgfqn+6+ni7JclQCNxv3T+8cy9Ljn5OBhTanRn50vJoWaipFzD2qKlNpuYI5i8k5eUcJDJI8xZ2Lwbu7lPilZWKCb9SiOYbNQtT4R3cI9Y9uUb8imzkzwCluAf517+ZSeI61oF6NAxcS0j49BtJWYe9/aPgX9G7slXktiP4lJD2AUKvdLp6VURurSfQCmWd5jrMw3kjM93bUgnOZGbKF/VYQz4Uon+va5cbmYGeDoYZwzFVn142w7gxLk3GC2NUjkl1DbWHbpfUF3GP1jXGlspZEUIU0AbP3MqSsAdq3W4LKB0peF3oZiJdeWEIbpr4i0anx7VLFPdjyJlXvrEJJLko+Prez5Nxf9ih+u7Nvy5Yz89CSenieDnlCCbWCHD9U4Kitb8aNPr1oQ/h4JTC6FUjJdSzmeQhLK08a1wA3c4pi/kYndQYhR0vvYQuE712A4D/WjPOl+ADjsPedo/su0jHZ67pcEyRsq6tLf0hTtPQws9CSJkbLickbvmHygMfXFJUoujr8FcAt6vdhgtkD+3jZiL6lwIWyYgSuXGs0Y0yMYEbukfi/oD85bZtMwZlJv63dhn5btXICHS1Ix7Je0BtOk9k1BKp9GNhoZn5bpSFsLDMbD8zktTlkI+lLsAXIJNDbwA7yt2jQKX6b9xvYgEnwyL/q8Y3oP/CXTc/q64ocbZS+gFboLRfI/GDW3vjj3Vuzw3+NuEF/E7xyv8G8gzEy+q7m6+TG/pcDyECeQso+40gYW5rqkE922JqtLb6wB5EI5nLRcjW1xGdKT8zqrzr9FKCsvXz+mG9ee8Bc1cB+9I//LPuVAIIdsPYQd4WB953M/xRcD+lvzpYD4dTWjb+db1y86ybLW+Z9qykrvNLOy/TSPKgDrxH8iOYfk=,iv:yBpJGbVzEqwQ3/xQqTMqsUP6lPfbp+TvKG+uK+1HdFo=,tag:lB/qb6Bwc6cKuW6RZlHvOg==,type:str]", - "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, - "age": null, - "lastmodified": "2022-01-06T00:06:07Z", - "mac": "ENC[AES256_GCM,data:0/3v8DeWijSOIJAMsKwXZsDXy020FWWWKquMs+99IB0ky8r/BX8CGlJD3T1mKO+j1olznvN4AqpaOFsMEexdqlxOFx1UwBMTzQZhfPlHsgDkf3XtplHMZbLsK+XNWAjCPiAqdooCd5NeYKiYKBRvJP3IclIwn+aLFw5wv4LlMuo=,iv:lcQeXL/s/NwxyysdqcSfBr8XXN8ef3T9Sw5s2uPYlG8=,tag:lWNPEENTv42CZuZIutxAJA==,type:str]", - "pgp": [ - { - "created_at": "2022-01-06T00:06:07Z", - "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DXxoViZlp6dISAQdAiTff5/oPWj97TYpAeywxbPJxgeiZJcsKBSqB4c/fEC4w\nnkrawta5umacLix+FgjfJwsqcsI7kHtgUlwhE0oPr+CoinVP5SXqvsm5oPqIxQCw\n0lwB0Wy6sCLBUyXrqbQX8jZQEUl6xMDb55W8Vk3YEurYpYtYya7jL7ArxB3qkyts\nKEnP7TVTcQrppUeHFwLHZp1PTiOyUuYVhhlpUWs3YhSuRj0OXqepVjbs3Uf/jQ==\n=3zRQ\n-----END PGP MESSAGE-----\n", - "fp": "30D3453B8CD02FE2A3E7C78C0FB536FB87AE8F51" - } - ], - "unencrypted_suffix": "_unencrypted", - "version": "3.7.1" - } -} \ No newline at end of file diff --git a/wifi-passphrase.patch.sops b/wifi-passphrase.patch.sops new file mode 100644 index 0000000..d173b23 --- /dev/null +++ b/wifi-passphrase.patch.sops @@ -0,0 +1,21 @@ +{ + "data": "ENC[AES256_GCM,data:ywen+j6Vmj8WQLwLGrTY9hwyE46UUHr+7NlqZsorFZ9CxYh3ULf/32q4U1S56x7Hpr5WdRWvYGsbNo334UrJnLt+Bql93O5zfZ6mdOF7aHsHe4nX4icH3WBOCiu2wQKJp3fkNST4xBSWoAarVRtgi+8bPgm5/36AB7u5EbOyFReVe4YKqVopyKEtTTad8zOXmq2shuohS9rWls4kytm1H1tW3zeJA6b5SgOjMO+/XP48YCNnzsIkEl0XGdh1tHj2Cxik/vZID+nQoXVLZ5FU9zBnUTwcI+BkrAMWwVF3n6H7fgRmmtAvks8l8jm5WJGMJf0GcNsVnNw+ksrYw9E1Zy795acory6HTrszg9jcxBww3IxLBLyOHflY+MzVpMubUVidR/7W7+jhV8S5peMP5E7kMQU4CHk/uzCXZKmN+BCmwvtUrpGrjHzEHs7CkI4JeiiZbGtbzc/aETjeTqzEodGz9LetIIzDD1RCS8+Lum/EDSbYX0ReAfRxzHASDpkz8tWXXZPL6EyfDPXtArjnsvgysV/KuM+HoLaV5uMrqP1s+9sZRm7jsdQmqtf4a4dhbCMPh+nxUq93x7uiP3LA/mDcPb9MGnvpc6pXXwq4ZiPekubIqpHrvSpUjMogfbTJnhgYgsZ9GBZW3pCteSpWFCRaj70/dV2kMzclBg19MFbpvgUAY36kspIeBCQR4NdUq3AP10YaS0vSwEs1dzJSVyEbe4YVermGB6ALUR5MLBcER0k2UUeVrwpDYBVZylCC9la30MwrURHoamZ2FOqMPUTy5cHgBfL4xx/zJEmJPljN2pzflU8Ilq10EC7S3UtvLsSz1Efy6Rq52+uhXPHRdzwvfZoskDqlfcmXUUY0PvUwEBiFNQjE/Any53VWaezfZ9kDJlyJSCfaf1wVyVYP/V5CKshx4XYInK64QD+H52lvmynrvrE9X+yb2VKSBBiwUhw0sHFEEX8uFoxZPC3BGNq8dfgFaTBWpvj56VhR4zgG4h+z0+PkfzuYs/8ysqarddJdnvyGC/hJpY4AlzX8GHcGc6TAESYgvIALtSqAEkWmbAtHqkybONzSZTXCaqcFQ2uoG7YqfLDCTsixBhXJQ0+ymw+dPfD1mhwdaqTBePdfwDQB2nxHx1UYx0q1+TraDSImkX6tuT7czAvUW0eBxws9sHo3o+EIy3QFZzpWf4hvPKzcxADXX8r0I4x7RzO/TIOMHmnIkBdsJqWXT3Ao8WMWzisv1Bhvbb6M7SDPRsK03UMtsso6jvT/eXwhaLW2K/TF9vpQNp1uX47vYGalUiFUj8DExeYXtYdIn4gVyEN6KUlPUw6cLphn2pvWvdUh15ddVsk2mpKiPazRH7yp/5psGGjrFSZvTBww/cewYuar4u8eq8MEZREn3QlE8iE730pXYTqlVctsgdw063Dqc/DCJd6QZ44nL3uzAfsmxJjbd4RHJRmuL+4J2YEbW2pdl2qXb722qVJBeDnMwMFKR7ugFjngAVIDa7ahuI/TiNGdjvVGeGFqhyl1nOUFeIAgGPfv9CZOG9hSS3HZOi5vQQ==,iv:06FF/Wj6j0fzHHzbbMHKdKCEDZHC5ROE8uJkulRZaHY=,tag:HIY+IvYC1L8zWM97fr5PHg==,type:str]", + "sops": { + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": null, + "lastmodified": "2022-01-07T23:41:20Z", + "mac": "ENC[AES256_GCM,data:55UnPfqXSF+4son0vojGfQ7PP3FPEq38rE/riKKP4ZiAOcz6wnyFG6Ykqv4vtmEhV4654UFlSKLATIg/9FS06whkmfW5MD4ZTtlGsGDpDVqCpfiaipYbxpXa5qg/RHGo0itc+W5ytK3NR75OQ2vUL3OrxVp8f6ShdX3LgYFJ7pg=,iv:GBwkTRkMTNq/fvgbS9lReMgo5WsCLCWrsx3z/du+T9Y=,tag:uPWyEidZfDQcsZf1Z/p7jg==,type:str]", + "pgp": [ + { + "created_at": "2022-01-07T23:40:29Z", + "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DXxoViZlp6dISAQdAcVFfdB1YSPRPtya04j+nw0+PxEQKmRDb6BRqxYFzNA0w\nq6FPd6vlTs3idcP6motDWdKI9kEnAadhSIOphIVflCs1kF6558y0sWsSYeL9zLdx\n0l4BNK5a5dAQja8hHbmUg1ZbJSHzOpCZtJwwQUCbkFPVQVXN5Sna+V47UPHNY3HB\nqroE6ulOLy9VTt+IpOwQD2fx11AMGoiqS/W+LKHZW9wEl9U0Ne6RtTj3kVEvbnr8\n=UvH4\n-----END PGP MESSAGE-----\n", + "fp": "30D3453B8CD02FE2A3E7C78C0FB536FB87AE8F51" + } + ], + "unencrypted_suffix": "_unencrypted", + "version": "3.7.1" + } +} \ No newline at end of file -- cgit v1.2.3