diff options
-rw-r--r-- | files/files/etc/config/wireless | 6 | ||||
-rw-r--r-- | flake.nix | 9 | ||||
-rw-r--r-- | patches/wifi-passphrases.sops | 21 |
3 files changed, 31 insertions, 5 deletions
diff --git a/files/files/etc/config/wireless b/files/files/etc/config/wireless index e6192bc..a548c26 100644 --- a/files/files/etc/config/wireless +++ b/files/files/etc/config/wireless | |||
@@ -20,7 +20,7 @@ config wifi-iface 'default_radio0' | |||
20 | option pmk_r1_push '1' | 20 | option pmk_r1_push '1' |
21 | 21 | ||
22 | config wifi-iface 'dmz01_radio0' | 22 | config wifi-iface 'dmz01_radio0' |
23 | option device 'radio2' | 23 | option device 'radio0' |
24 | option network 'dmz01' | 24 | option network 'dmz01' |
25 | option mode 'ap' | 25 | option mode 'ap' |
26 | option key '<passphrase_tesla>' | 26 | option key '<passphrase_tesla>' |
@@ -54,10 +54,10 @@ config wifi-iface 'default_radio1' | |||
54 | option pmk_r1_push '1' | 54 | option pmk_r1_push '1' |
55 | 55 | ||
56 | config wifi-iface 'dmz01_radio1' | 56 | config wifi-iface 'dmz01_radio1' |
57 | option device 'radio3' | 57 | option device 'radio1' |
58 | option network 'dmz01' | 58 | option network 'dmz01' |
59 | option mode 'ap' | 59 | option mode 'ap' |
60 | option ssid 'teslo' | 60 | option ssid 'tesla' |
61 | option encryption 'psk2+ccmp' | 61 | option encryption 'psk2+ccmp' |
62 | option key '<passphrase_tesla>' | 62 | option key '<passphrase_tesla>' |
63 | option ieee80211r '1' | 63 | option ieee80211r '1' |
@@ -91,6 +91,7 @@ | |||
91 | 91 | ||
92 | pkgconfig | 92 | pkgconfig |
93 | ubnt-mkfwimage | 93 | ubnt-mkfwimage |
94 | gnused | ||
94 | ]; | 95 | ]; |
95 | 96 | ||
96 | openwrtWithPackages = pkgs.stdenv.mkDerivation { | 97 | openwrtWithPackages = pkgs.stdenv.mkDerivation { |
@@ -164,8 +165,12 @@ | |||
164 | done < <(find . "$patchDir" -not \( \( -path ./tmp -o -path ./build_dir -o -path ./bin -o -path ./staging_dir \) -a -prune \) -a \( -type f -a -name '*.sops' -a -print0 \)) | 165 | done < <(find . "$patchDir" -not \( \( -path ./tmp -o -path ./build_dir -o -path ./bin -o -path ./staging_dir \) -a -prune \) -a \( -type f -a -name '*.sops' -a -print0 \)) |
165 | 166 | ||
166 | while IFS= read -r -d $'\0' patchFile; do | 167 | while IFS= read -r -d $'\0' patchFile; do |
167 | patch -p1 --batch <$patchFile | 168 | if [[ "''${patchFile##*.}" = "patch" ]]; then |
168 | done < <(find "$patchDir" -type f -name '*.patch' -print0) | 169 | patch -p1 --batch <$patchFile |
170 | else | ||
171 | . $patchFile | ||
172 | fi | ||
173 | done < <(find "$patchDir" -type f -print0) | ||
169 | } | 174 | } |
170 | 175 | ||
171 | function buildPhase() { | 176 | function buildPhase() { |
diff --git a/patches/wifi-passphrases.sops b/patches/wifi-passphrases.sops new file mode 100644 index 0000000..8a1ec85 --- /dev/null +++ b/patches/wifi-passphrases.sops | |||
@@ -0,0 +1,21 @@ | |||
1 | { | ||
2 | "data": "ENC[AES256_GCM,data:4lzSBetxQJQC/DKpfeozY66HauRwgmsSqrsPuaph4UVGAU/cr5LsZSkTO6QYcWcuWasCy8//1xM1tP9AQNaifFU4xYxcqn4NHPCLJlw3wR+gCaZ7ggbkXIUjcNI4UbA368ksRsrIEhFWEx7h26kQn7sqLpheBApkL3/8LKyA0A7OGJIrUSxeDbaOnG8kklQjLNzEhSvxWVWv,iv:jCrd+rbg9akUFVw+GYMr/KU0wMvfvpX/dT51zrxdeYQ=,tag:lg0MKi/vYnmDWYNANj38QA==,type:str]", | ||
3 | "sops": { | ||
4 | "kms": null, | ||
5 | "gcp_kms": null, | ||
6 | "azure_kv": null, | ||
7 | "hc_vault": null, | ||
8 | "age": null, | ||
9 | "lastmodified": "2022-01-07T23:55:55Z", | ||
10 | "mac": "ENC[AES256_GCM,data:7thcVQOenGhqETjyu+49NQFehhXJfKLReQZwHJzHCCB9TykosU4vXml5KA5sW9jY3jnvcbwvW7Og7q4s7Vpb3+1eSh9m8W/Eqkb/InEeC57y9RYl8rlegmuynCOmo1pVJDJSM3N+fiqlsneg3hCYUgAWam/NG0tfsq1eNNNSMIA=,iv:iUNx6rnFIeZET7v25QGuy960yQ7VYO7jyj1dlt/Tt2s=,tag:0VxPKHELmL8zwTwC70kZVA==,type:str]", | ||
11 | "pgp": [ | ||
12 | { | ||
13 | "created_at": "2022-01-07T23:55:55Z", | ||
14 | "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DXxoViZlp6dISAQdA3vMhLweSNx8NpOc5InJC4mSvrvoL2+BdWWo8bl/2Yl8w\nnBGAv0COfBA8CaH4LINa38L/HCq2p+7zm1oTvgmXhYQH4UFz5+zDi4XtTpNSY7a1\n0lwB2mPBl1omUMmGYTwLq7lTjFNDCphdYa/5fwYr2yL8WW4VTgmeXkuY7ExzCtSU\n2gcJtnXSweOotnq9Lp5erjKmlozDRcCiXdkmKywe14EZGj3lrhCBfpNKXoNxDA==\n=N6Hw\n-----END PGP MESSAGE-----\n", | ||
15 | "fp": "30D3453B8CD02FE2A3E7C78C0FB536FB87AE8F51" | ||
16 | } | ||
17 | ], | ||
18 | "unencrypted_suffix": "_unencrypted", | ||
19 | "version": "3.7.1" | ||
20 | } | ||
21 | } \ No newline at end of file | ||