diff --git a/hosts/kazuki/storage.nix b/hosts/kazuki/storage.nix index b00cfbb..61582e8 100644 --- a/hosts/kazuki/storage.nix +++ b/hosts/kazuki/storage.nix @@ -1,29 +1,22 @@ -{ - config, - pkgs, - ... -}: { - age.secrets = { - storage-box-creds.file = ../../secrets/storage-box-creds.age; +{config, ...}: { + age.secrets.storage-box-webdav = { + file = ../../secrets/storage-box-webdav.age; }; - environment.systemPackages = with pkgs; [cifs-utils]; + services.davfs2.enable = true; + environment.etc."davfs2/secrets".source = config.age.secrets.storage-box-webdav.path; + fileSystems."/storage-box" = { - fsType = "cifs"; - device = "//u389358.your-storagebox.de/backup"; + fsType = "davfs"; + device = "https://u389358.your-storagebox.de"; options = [ - "iocharset=utf8" "x-systemd.automount" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" + "noauto" "uid=${toString config.users.users.atticd.uid}" "gid=${toString config.users.groups.atticd.gid}" - "credentials=${config.age.secrets.storage-box-creds.path}" - "cache=none" + "rw" ]; }; - - networking.firewall.extraCommands = '' - iptables -t raw -A OUTPUT -p udp -m udp --dport 137 -j CT --helper netbios-ns - ''; } diff --git a/secrets/alert-nrab-lol-pass.age b/secrets/alert-nrab-lol-pass.age index 371a235..38d6f33 100644 --- a/secrets/alert-nrab-lol-pass.age +++ b/secrets/alert-nrab-lol-pass.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 84j9mw tfUR84yYxwWvNBmxvhsZHGtaIruTij97ZI50cJSL/Qg -O4l3r8XdWzLZuxp5BolTS7XOfbDvwj1Ybbl1TPSrtSY --> ssh-ed25519 GKhvwg DItnbkoSp8LfS6MZsKZ8njOnbtiqYufdEHr+dbb8i0M -NYOrpEIWujBGLdBWyHJmtTTdvlhVlpDaI1r3RM8K9zg ---- Lyzm1dKlnSIdBYB2tQuDEbGy9Gf/KlHfOAPw3NT15Xs -69@#JQ#;)? 8/08Z {ጶS[N{rJbS~zkO'4 \ No newline at end of file +-> ssh-ed25519 84j9mw /MUTGq+iyWhVoQNesvu97kaBxlni+hjzhpfQBNHUz2o +e9utVXMky5s63KE+r7N1L7d6nPPRLT0gfFk4GYEbQj0 +-> ssh-ed25519 GKhvwg 6qDXOjNKw9SJyM3oNUU6bKB1yD0P5lhy6ehr+Umw128 +T1eT9l5AFG1ettCswOn8RjTAj4v0C/7N9C2QrVRQgzI +--- Kg4t0+dP+r+l0QNPW86PTwN8OCCfNLa6YnzF1EZDOi8 +ߔp5^+a b~?[Dm@}(u:"mO~ވQ2C찂PΛw[04wJn= \ No newline at end of file diff --git a/secrets/alert-plain-pass.age b/secrets/alert-plain-pass.age index 8ebd447..f14dcc4 100644 --- a/secrets/alert-plain-pass.age +++ b/secrets/alert-plain-pass.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 ioPMHA ataMxkoppMnkRaCScXAtEohUU3WE8fEYxBeaZYOQoXE -WcBLxLGjV1uawwi5C70+XMEo7Z+UfWspPbWW+mQDqhc --> ssh-ed25519 GKhvwg 01u8Pl4uXUryHlKVkgywl0glUBEtVjdNxXCPexoqvFE -mVlJz6NKCto+Re1Ps64+yg1Ztf6sWWPX91TKyerIXa0 ---- b/8Zb9zbaU7zLm0OXMsWrIx0Iahq/oKkxcQLhkDsutA -">YklRi}="-u:8":(DWp \ No newline at end of file +-> ssh-ed25519 ioPMHA Gv76vkaN8gnHdjgF990BR8wU/16Uozc4vQzDPWqRSQA +FpweZzuyy6ItXQlF857r4b/3DJ0HDxu48DIm0SbqodA +-> ssh-ed25519 GKhvwg 72KEasV0qfMzA6S85PlKgIn08za+n7urNIlX51veAFw +/V2pvyUjT/W+Zuk957atU4Hm9U8L2n/ai2wafU5KZO8 +--- Ej/nMu/WdUX5UNVb60CYZFwTnmh0NA3yGHeA26qIHeM +蛴7@6A1 (Q`$fETiC=hheH [I \ No newline at end of file diff --git a/secrets/attic-creds.age b/secrets/attic-creds.age index 393a98b..af8ddef 100644 --- a/secrets/attic-creds.age +++ b/secrets/attic-creds.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 84j9mw v0YsgTbyCuVI0uAXTeCR6XSORbwJxVpegx+adh15aw8 -HvNFhJmh8MEybRtG92IlsQZXYeDyvh0vsiu0f08CXy0 --> ssh-ed25519 GKhvwg MrFFxPlJ7JBvUhl2QByLvRIigGmBT2J/123O90srXx0 -f8dGUqoJbQjH1epgvTte161wRn/sas6AayOvqgEcfc0 ---- s1v3ZB9lVmLob/xQ48C/xa3DnXZhoJr0zVk/X5VfdJU -Рέ+OPUuΒMxүVG')˴nS.>4ف]Y:pPT4UB?J<&dZS"2_( -IM?BIVP:%Or[&0A?[J ssh-ed25519 84j9mw iaVig2Q/70n3JmIZFKa0rp/IsN1OJskSU3PwOq2VqnM +2deFW+uHtCJXXLGwNHErSzm2H2tZY/jA9sgT/tV5r94 +-> ssh-ed25519 GKhvwg fzMri40VIdAlPmXqmhs6CLKFxTn7z4PXQrBlWggJy1M ++ieE5OGrLHU2ypVbUI5iPH4b/cCywlcZx5MY44NBzw4 +--- 9ZpWiAPL2hlagDqllJ279riho8UW6rH2TnCOLPmbU3M +s;I iaY *%;5)|Mun|T'T~8i^K5^lM6ӱ?.hfF8 шfߵ){/' _Fwg UA_mʆ S}NZkܽE@5 ; &5VHc%9'=;1 \ No newline at end of file diff --git a/secrets/github-token.age b/secrets/github-token.age index 8426af6..61b997c 100644 --- a/secrets/github-token.age +++ b/secrets/github-token.age @@ -1,9 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 IFuY+w O/FQauaFhUwbinIrTM7/cRbolpvUWXNKJBxrMoUVJF0 -GKPP4rmiC2YQs/ythlp+UwPEchVg5PMQ4zr1Kapukmw --> ssh-ed25519 84j9mw 4R3KhL7n/7/bLOwipVLST25sjANznNtdPCOUDS8Ztmg -JjrQ/BWgrBly4SyEskM0I4Q1tnyVytOA6TmwFAKilr8 --> ssh-ed25519 GKhvwg Fi1Ji7ohIublP7bzYWhHZeWVg6dB9SJClTZx9iGIxk4 -FH8JIjI+oPJTcQARh50PhegayJw6Bm71QglpB40Y5VE ---- Vzb2XFEK08ENArloqCy6gAU4laVkKo+0kKAJ8d/uzgo - IvVXO+,nn3\{'S9/ε>I;qܸdW9Tnl *=R)1C舋R \ No newline at end of file +-> ssh-ed25519 IFuY+w 01n6kTYgBCN4JIc1B7nkRaj3QYOOStbeDnkmt9bDfHc +MAzuOxdLsxvzYHWQeXac8EqROAwEZL6jQ89ddanG0WU +-> ssh-ed25519 84j9mw uhtWHjAcGy0SvpFp6Sh78atktwVbWJm8yIgLh8OYCSI +t3k7q6h6WOHzVIUbWCTDaO1jyvSejVOpFV3GiVCIZmk +-> ssh-ed25519 GKhvwg 4/dGqLf0iybqBpv5ysyKoOC+tCFDNvAsMCzNXoNJa3Y +flQT1QKyiQo0YEg2Gs0SrVD+j0JCHwxyETkn9AE4aPg +--- IJGHdUf/LcoZ9n0mRXukhkmPQXjv28KZUQfsdWoVmhk +irXl +ʠ2=).[/31l8Ґ./WLO-p73]"޹ +w)nU \ No newline at end of file diff --git a/secrets/hercules-cache.age b/secrets/hercules-cache.age index 1acf80e..bacac2d 100644 Binary files a/secrets/hercules-cache.age and b/secrets/hercules-cache.age differ diff --git a/secrets/hercules-secrets.age b/secrets/hercules-secrets.age index 67f3294..edacee9 100644 Binary files a/secrets/hercules-secrets.age and b/secrets/hercules-secrets.age differ diff --git a/secrets/hercules-token.age b/secrets/hercules-token.age index 547375c..ccda6ad 100644 Binary files a/secrets/hercules-token.age and b/secrets/hercules-token.age differ diff --git a/secrets/leet-nrab-lol-pass.age b/secrets/leet-nrab-lol-pass.age index 1d5f709..c138149 100644 Binary files a/secrets/leet-nrab-lol-pass.age and b/secrets/leet-nrab-lol-pass.age differ diff --git a/secrets/legion-niko-pass.age b/secrets/legion-niko-pass.age index 52fb6ef..7717338 100644 Binary files a/secrets/legion-niko-pass.age and b/secrets/legion-niko-pass.age differ diff --git a/secrets/nrab-lol-cf.age b/secrets/nrab-lol-cf.age index 32e5c77..36244ea 100644 --- a/secrets/nrab-lol-cf.age +++ b/secrets/nrab-lol-cf.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 84j9mw Ao9xAby1hDTHybu6IkkpSYj2+fIrp7RyPtD4UhDcllU -JagJ33GdoNif6fv4x679IkFUVKIB5s+q8p/86pYWG/k --> ssh-ed25519 GKhvwg wWBJKWZBeHz19y6/YHooVoeNtyS45+ff3zwZ+uTLTBo -NjgD+eZzt6lYZlN+TgpYQxTJ+JhjHY56vktCoLpvGLE ---- ebDqhUoYKbGEfLWElIgwD8nPei/6dWKTRyLuT3AgG0w -OlknLЗvi%(326dWN$i)zz^c :@l|Vkd[X_)h?UaC} \ No newline at end of file +-> ssh-ed25519 84j9mw 5H+mBQAvf8DAjxZyUFyQS1AU0WZ65RkTg/HmLbdOKSc +ZK/tpgID8e/LFL9AmzLydfKncjr76tEh67vnURN3xrQ +-> ssh-ed25519 GKhvwg jPKQ3ZRtBooEgciogjH65EWYKoa2gHxC2YgJeTg6YUY +kDK0aZjRlnHpGTk2kgTFy2Gf/1YJVn6CwuI32O1PINs +--- ElgW/+gXo/LKHY24flvFrodSYPmNw12/j81XOiD6O6U +\􂁳ɆVrlt)W Zн*6)]եj5Tfџ+O0tܻif" 0m4W[Ėg+`j \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 6164cf5..160c76a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -60,4 +60,8 @@ in { keys.system.kazuki keys.other.bootstrap ]; + "storage-box-webdav.age".publicKeys = [ + keys.system.kazuki + keys.other.bootstrap + ]; } diff --git a/secrets/storage-box-creds.age b/secrets/storage-box-creds.age index 941510f..1ab2fe5 100644 --- a/secrets/storage-box-creds.age +++ b/secrets/storage-box-creds.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 84j9mw flAGDRU7ONCpOxgQvudxjl2H8U4LB3ATxOF6/Q04QnA -KTudGd6ePDARxgM3pxNbcFvmHKOsrr1+5pMhoBOOn8c --> ssh-ed25519 GKhvwg xyDU0Bfmt/ib35pF8PcZAi4mBwbsMlyacUqNnBlAyG0 -fjyIGDjOaLgb1qzejoxDEUZiMGuXwRKc1p9Az0qy20I ---- rLpJ72c+QSvu+8LMOJp1XRrtlNmH6xU8ObnvilPzl4I -0=v2U篱Ruޞ y.,&9![A`$Ɖ ݰq{D]W!Bk \ No newline at end of file +-> ssh-ed25519 84j9mw b+gqU+iy0XfWUkuFJqDTF+ETlr0U78E2/mbVpywu0T8 +GcGo62Jqw7jnRpavEhYZmrEf3/NK4wAxRwJytZlVRWE +-> ssh-ed25519 GKhvwg 01ruI2RYAS9CdZCdm2luZER4qskyRmGLzYU/p7a2N2c +CVlYH/tJLddklJLoxliATtUDK+Ty4/FeBU2k7T8otzE +--- BDq+9S5bFU2ymqhtWJ+R4HIOEdjrTcDtup8tPHzeUT8 +J \oFhտ &DM)pű<=PuN|]#Q!߳cu \ No newline at end of file diff --git a/secrets/storage-box-webdav.age b/secrets/storage-box-webdav.age new file mode 100644 index 0000000..bf0f6e5 Binary files /dev/null and b/secrets/storage-box-webdav.age differ diff --git a/secrets/vault-cert-env.age b/secrets/vault-cert-env.age index 7ff0cc2..a539e70 100644 --- a/secrets/vault-cert-env.age +++ b/secrets/vault-cert-env.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 84j9mw hvZRPX7KPlenU4WVrYxW9LrmjGuJyUv3L8Vf07QvIDA -1r+hIxsH22OlbqmPnhBO+8IYAgF+MyzYIslzfyKYkHQ --> ssh-ed25519 GKhvwg WvQ3d2G+R3vLmBmz5P7zEP/0/xNgmg09sMEzbVGy11c -joIgz1+t5czRm3Mz7H+aggPJCU3EsfLunRc3T0CTZOM ---- 8Vd7XSFbf48XVttovVQcS4eVwn3tf6eTEUN5HHn+r14 --Pp>9RS:dS7F_D-&ЍYzW5d0pd$ie: -u:2N]#W*s){cy Yt. \ No newline at end of file +-> ssh-ed25519 84j9mw sTfVHMell5tgxp/jz0fKSTHJsexbtU1XD4OMiHVoNV0 +3aUk2VlF8+8iUbUYsiimBbfvS/8e9sYWIVsuSvBUJHQ +-> ssh-ed25519 GKhvwg SbUPOlYh9/u0odOxpnPpyEP+q0desmBuWEAKda/b/CM +z9miux3iXlmlL1e/alUVSFJXgKB0CzrTT09CY9GTMkY +--- Vvqw8Ym3wSS0+TkKOcpaXP7kfOx2WxrT0riWKTNb4fI +zJ&tV@?~fP'7&b#49BfMf?R=[㓴Fi!7M$}OT HQO8 \ No newline at end of file