diff --git a/helpers/services.nix b/helpers/services.nix index 21cd9fe..e3a0501 100644 --- a/helpers/services.nix +++ b/helpers/services.nix @@ -140,9 +140,10 @@ in { else [] ) ]; + readWritePaths = lib.mkIf (dump != null) [ "/var/backup/postgres/" ]; preHook = lib.mkIf (dump != null) '' - mkdir -p /var/backup - ${pkgs.sudo}/bin/sudo -u postgres pg_dump ${dump} > /var/backup/postgres/${key}.sql + mkdir -p /var/backup/postgres + ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/pg_dump ${dump} > /var/backup/postgres/${key}.sql ''; postHook = lib.mkIf (dump != null) '' rm -f /var/backup/postgres/${key}.sql @@ -153,7 +154,7 @@ in { acc // { "${key}" = { - repo = backup_cfg.borgRepository + "/./${key}"; + repo = lib.strings.concatStrings [backup_cfg.borgRepository "/./${key}"]; environment = { BORG_RSH = "ssh -i ${backup_cfg.borgSSHKey} -o 'StrictHostKeyChecking=no'"; }; @@ -169,6 +170,7 @@ in { weekly = 4; monthly = -1; }; + inherit readWritePaths; inherit preHook; inherit postHook; }; diff --git a/secrets/bind_pw b/secrets/bind_pw index 3fd851e..a6982d7 100644 --- a/secrets/bind_pw +++ b/secrets/bind_pw @@ -1,15 +1,11 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBoOGtv -Z0lMMXRoRVBmRXpnaGNlSEEwVlc4bUw4ejdmM2RCc0o5UFVYRWpJCnV4MVJQOXRX -VW10bTE2dVJiUjNPN1BpNU85ZmJhMitidE1VYmFPaExWV1EKLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIE51Y2s0MkRnYS9VMnBROGpMMTBzeHk0RnhHeDNPUm9YT2FzTDNi -cnBqQXcKcW1mK3EwdzNvbFZpc215ZS9lVzVUNlM2S2VoSDI2K1N6TFliUGVmeWhv -YwotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgZmJ2eTI3R3F3aTRKNlZuU0pLUk82b05I -bDlocWRVUXdUTmxuZWt2bFNYRQphSFkwMm1rbnUyNTBRUFoyWGtuNXc5bVdpTzhk -TmEreDFkbXBscjN3cFFnCi0+ID9MO3M1Qk4tZ3JlYXNlICMgTSt0RjwKcnN3Undk -T3hTSWdoREpMbWNtUUpmaU0rYklmWHUrRnNZeVk5SVZ0dnBZYWV6UVQ5YUxQZ0pX -NzVmNk1UdXhabQo2UDlISTVVOG5Tc3hKLzRMb0NMRmFud2NaNDZKU3hFQ3MvR2NB -aTBteEdtZGZMZXlBMGFiTGZiMzJoZG5NbzROCgotLS0gaW5CTUxRS3lHbVJsUmJT -SENPZmlJTlFGZ0lQVENITGN4aHQ2NVpYeG10YwrVnO3q+X87iQL9UD4YvF88ZXKb -0UKXy+royJlN7xqXW0Ub89DKhLc3Owvp4Hs= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBQQ0t4 +UW1vSGJVRlRab3NSOFRLSTgyTkhMNUlwVkcyVEFpcVhidkZKWFFzClllQzRKUUl1 +YThSbmp1N0RqL2hFMmFoRTdUNjBoM2p6Yk81RitGRWM0SGMKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIFUzeE9hTjhPNkRIa0tnd3Z4L00wMWQwWjdPRVZLT29WYk1WWU1B +U2dPRmsKcEt4ckhNbzhSZjFHazFsZndGUUdvampkVDROY0xCbXM2MTkreHBRc1hv +cwotPiBzemAtZ3JlYXNlID5CIDVlSmV8UCBRRCVjMkMgNnJjCmJnMnFiR1VWd2ln +cVBQMVZRcUlpMC8xZTluT0hid2tLelhTMHhKRmw5TEEKLS0tIHBKVnhGUDgxeDE3 +ZDJxSEVrU21jeGZaYnQ4bzNBbk42VVlMdXhPWjJXODgKDiuNAvBoXmi6/a+7p8gf +oRu0Bdf9ZT4d0EQkHFB1n1A/YHbKFPRR7MB7DKJi -----END AGE ENCRYPTED FILE----- diff --git a/secrets/borg_ed25519 b/secrets/borg_ed25519 index 8f25723..e4eb8bb 100644 --- a/secrets/borg_ed25519 +++ b/secrets/borg_ed25519 @@ -1,21 +1,21 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBXMU9r -QTcyL1JBeXg4VUZpd0NIS244bjU2cDh3TTF3T2FYT3VNOTJhVGc0CjA2WUw5Z29M -YlpkcFMwSzQyYzUxY1RKMzdCaGtac2s1SHBQL1J3b2dOT2sKLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIHRTUzhHM2xxQW43TC85c00xS0QxUGlDL2pFcGZDZ3JUbHFCTnVV -Z1pUWGcKWlBzNjZaN044REFoOUFVazBnc2phTm84bkduUWh3RmhzTnc5K2pkN2Ix -VQotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgQmc5eFBDZUpWNUJuMHJtWkh5cmRIUHFD -a0hUQ0ROZ2xubDhIWG1UdXlrdwpsbHB0YmdFNEFLUEwxaG9YSnJlbzNuYjZjR2w4 -QXNKVWg1TmRBSzN1ZTVRCi0+IHgvRS1ncmVhc2UgcX1gPiAlQC5PeApFSjBGc0Nk -cW5UMjEybkI2cnZoTWFZYVI2QWlhVlZHSHRZY2hYaVk3SnNqNWZ3Ci0tLSBvRHRj -elIrWXI2cXU2a0hvVUwxaWhFWXZDU0dOY00yVmFDalM0dEdPRExvCj4Hs76si92L -oB+KxxTYS4vIHacLWVepvfr2WrNb/RL6LbWQFr29VVPDPglnIhdb/csP/U3CqubJ -AFgTuwOUnD8HGyorn+09NbEDmJHAIqATe2jlcjh/gE7aedeYpXfZUYr6PuHaCxgm -Bj8ExvLUnqW7Y6/BMtinmKSPHm9pm8Ah73UJ3X7/fYm1QEtrigjNwyB1+so2anYJ -ROkblT4MwtdnlU8TWB8ak9Ey/NYF+B3EHqZ19/ugr3eRo5zBrWbycwNavR/a+oew -9JHBrk1gzRdE3dxphW1GoKMDFnEaW6aQ2Z9xE3uQJPj+IQX3P2/c/DzaCECNx7n8 -yqGrERz8UEpEF/Hw9lXDFoD0lyQAlc6Ea9bWRvzFDlRSAY22BGqEvGrpWwEZMYH3 -HlV9YHM0YZjKD7Xm/8Rv76czpnRXeDqmcXXD6UTU0maMu1F+t0XcyTnMSKOaYstR -00Nz5N8kNic+4eyqeCVe52iiPMaiOhpaqTnhIQ6PJu+nAGfCJYG6HXqeetgUf6DE -twy2AWNX7BSeV3vm1dh/dGixSMyu2t9lJtHE2/hbTs2cpfxI6EDk +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyAybU5C +S0NLM05EUUZoU1dlK3I3ZUprSlNOOTh2bjFEZytLZ2pCbGZINlRNCjdHVytqY0ZZ +cHEvUFlBVW1NUVEyWCtZT080WFhTRkFQZE0zL0lidjJpcmsKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRICtPM0RIRGE0UmFZQlRXMUFzTERNblZ3cUd2K2FiTG54UTNjNVhC +Y1dmVDgKUjJyL1lVYUNIbjE1SmxsTTBPdkh1eUpIcXp6cDI4ZG9ZdmRmV2tNTnZp +OAotPiBAYFUoNi1ncmVhc2UgSEV1QkhLfWUgM3I9KmRhCkdLS1VLQ21NUys5d3Zn +WmlxT1pUSUhuNG03aGRWL0ZiVDI5ajM3SDJUSEpPTVJQTllkaTdBTjYzR0lJejJT +OGwKUU9VNE1Gd0pQOC8rN3ZWV1FCWVBtbXE1UHord2ZXcnJQQmU5akxsa2RLUmt6 +OUt6a1p2cy8vc21SenZDSVVnCi0tLSA5aWxuR2I1Q2dhTFlRSm1GWWJSTllyYlNF +amVtUzF3RVVXVVRKSllMeDJFCkFwpTqEDibJJctsux389ImOZF9rxImaAPXs2cx+ +Wx7SUq5rxqwsd+9HigJxBvqBWPtzQaxnOSloul/kKlFfHuk0IXzilzD1EEtjL76w +R4luPereoHHThrzh+UwkSgPqhTJAvijQm+qt12pk5PVma+V2mFWw6aBzpiUKwvxR +XdqtJ0dMDhqc4u/ObPylkl76zyXnFv4rwvn9wWDPnTFvYBybaFi8Xnm9FS6D7h6X +5PdmyoWhRo0YkGskGyO1NDYW0p8zgd24XmWRly2mwm7k/sxewjQuO8AOjN3g89/A +egD319xs3EbKvkc1bK2XlPL7sc+NLUMU2CqyPUbOoRSpEX8Mtj1RGm4rpmp0jhGN +WkU8L3jUAHoIs5May1xFPZ5kBkzOXRR9A4DeWN95z7bOYTHtZhFnPPKQ3D+VPuX4 +DMZ0XJOflTY/nf3ElYH3GOZiL9kWEFK716VIrzcTrkLTC3LFPhlsJPDmuA/XpKIL +gmf1kvjXoDPERIjgC/DQSh59Z579YxCm+qEhN0rAaDCxtke3i3cATO3CHqnMary4 +k6LNloAkxyG0fBNMnj8lt/+t -----END AGE ENCRYPTED FILE----- diff --git a/secrets/borg_pass b/secrets/borg_pass index b41f7be..4f34c68 100644 --- a/secrets/borg_pass +++ b/secrets/borg_pass @@ -1,13 +1,12 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBTbldF -L2NNRGFueWJBY1kvZ1EvR0V6WEQ4UE96RnVPelVibmJsWm8yUGlBCnBYSTl2WS9h -K2VRaHJnbmpUM0hYYWd1U1NUcThoanF1YTMvTXBONktQQlkKLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIHg4NGVrU3lTYzh1SHJ3R1E2aFdkaXFQbW5RRk1SdFV0ZnFHVXZM -bk1MUzAKa25uN2VjUHZwb1dOb3V0aHFNYzZQSzFnOTdxNExaVUpGQy9hSG42ZEFF -UQotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgY1dTMHdWWTdQYlZ6SytvYnFVS0lLL3pa -ZE9oRUlLUGw2VXBCcTY1OHAwVQptcWtmR2oxN3g5Y011RUlrRHBjSE44RThaeCto -a0ZKRXFmQS9ZK0l4OEh3Ci0+IClnLWdyZWFzZQpObkR3eHcKLS0tIHd0bzBBc1dD -aU1YWklDR25sN3hFU2FDK0VNN1pyVWF1MjlWMFhCa0Z5bHcKfDCMWr0lipEBAaRo -QQ9gbXBDVsc2vPPL04Efg7IQXgLwBnQnS6TsbXz2WzgrVHthAKgjS+IcRwxBWz92 -Az3nW/gB/OUOR5Rz2JeI84h7jYg3eGKBezjaFJgweHxqXfrMlQ== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyAyT0kz +b2JrNlQ1VXkxNWRnaGxYTWlXRmhFbUUrVVBIelBOVS9aTW1naVJnCjhlMmJSa3d2 +M2x3K2QraUJnTDhYRUpwN05SRndlUE9nT0l6TG1uU2k4aW8KLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIHBlT2dDTFlaT0o4SFNDWmR5SXAxenRrK29Gb0RNOVFhdDBoTGVj +eFVCVUUKRG9zWFhUalZLV3dEQUhTM2hac2dKeEhjYURsZEtMS1hwazdSK0ZkUzR6 +NAotPiAwTCtPWSktZ3JlYXNlIH4KMkwvTVJnenl5Q1hSSHlpTGpmNUlTT3hpWVp1 +UlJwWmJ2RzhuQkxLdnViaEpDYVd3NkxsVUxPb1l4Vmp3VENZCi0tLSB6bjNCV2Ns +SFpBd0wreEZUaEZCeHJMWUNCYVFxcUkzaWU0MS9wZmE1Z0J3CuoyI97L7IvP82Sh +37Gdo3gUcx/KIq5T1kCHVeAuVB02Ri57QFXmAvwtzlCoqEGJYbtPT3nBunHO2o3Y +wzYz53N0SYVCU1n9N9yVpS3NQbNK861BDi1VQId6YlYX20MRMm0= -----END AGE ENCRYPTED FILE----- diff --git a/secrets/hidden_service/akkoma b/secrets/hidden_service/akkoma index 71cbd12..4458113 100644 --- a/secrets/hidden_service/akkoma +++ b/secrets/hidden_service/akkoma @@ -1,15 +1,14 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyA2MVIy -ZmdkRnR4b0tmYUhRbGdPL0FEQkkzSHRVeHc0Y2lGK3BmL04zY1NrCnA2Tnp4cE8z -a3p6SU9Idi8xd2t6NFZjaTJTQ3hsaCtGRGlsNklmNURKaE0KLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIDFOSW9Fc0d6U2VBTURGNUtlTS9FYmplY3RHOHdTZXFaVjlPM3BL -S2JkRVUKNm5oVzloUUl3K24zSEg1UTZSOGVsNzI5YzQ3OTA4Z3JabTdocjBoa01m -TQotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgMUJLZXBVRUtYWnJTcFVQM2VaS0VlV1hW -cGZwdDRvVnZNZ2UyYWpoenNubwp3TWRrWGYzczNvdGc4alJCam1Ma2Qxdkd2OVdG -emNySkUrc3UxWTdTT2tFCi0+ID9oLWdyZWFzZSAsfFEgJSxnIlFHJT0gemE8Clg4 -d0hBUlNCVm1rRWUvTThUV3J0NkhkRzZ4aHFvMGgwUWp2ZFNsN3MySCtxRGcKLS0t -IDI0NTdzYkNqWnBod2pDK2lSUXUwY1hVQkxRank0bGVoWjFHRzlBRlYyc0EKYNvj -glnDK2maohw1ITiltvkvPTZbn+JtTnjqq6T8Y0LA54FUIvKjl9L8M1hR3pzMlj4S -GxcFj3JSJDwMXOwXGQJoH+o1RzzLnmtTWnwBPoRhJxn92dTMtuI4DwCJi6WsxJlq -tf/wzNXHHxqhUf+Uel+Zrk9wgJalecN8T+OAspk= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyAwazg4 +K1dGTEQ2aHdQQkkwcGVydHVMUVVvYXlZOVZpTjJSbldvWkJJem0wCmkzUFZETVox +aFBLamRZRGNrbk1WNEI1WWdFM2JQNWNqalVQa3EwR3NXV28KLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIE9KakRkcytaR2tXZ1lFamxHc1JPTkJ3VEswbTVUR2N1S0dCRzJO +TEU4Z28KNWx0Q2Voc0dWYTZwM1QySmtBRUQ1VDFTNk82Q2tqSDgwcCt0M3FPR1do +SQotPiB2ei1PLWdyZWFzZSBjWmUvRCFTRSA+fVdhNGg9IHgoIlI2ViQKUmM1ODRu +czgzMjlzY0VoOGRNQTBIb1NsYmw1ejExOVNGb0kvVm9naWQvNEdXQXUyMnE1aXli +Q1c0Y2JMb2dvdQpNWTRvZ0hndXJaQU5vc0QzZENVZ1BnCi0tLSB1dVEwUXNXdnN4 +SUVVajl1dm1LbkYxVlg5dXJsYS9LK3BCU3JxTlhGZlljCpcMfqqF6OfaiaYVHFYB +ZWa4WrmsC7twSFVtoCdLt2yhIdOE63WOGLstj16hDXlDr4ol0qVuX1A5Bs48RCDR +tH8TnfrakIbAx65Axnti5MJC+m4MaIo81GiktO56Z3SeBiDPz3/5CUrX/rTuYZXJ +8aKambIa+gM76sBf3OWOK/Wc -----END AGE ENCRYPTED FILE----- diff --git a/secrets/hidden_service/forgejo b/secrets/hidden_service/forgejo index cffc153..0bc3f25 100644 --- a/secrets/hidden_service/forgejo +++ b/secrets/hidden_service/forgejo @@ -1,16 +1,14 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBJYWk4 -dk1idWFLRkhiT0NLY2Y0K1dGVy9DZzhBam85RkNkRUpiY2VDbFZRClJrazhKVk5U -RDNaUXd1QkJnZGZhRG1uNEVRYzlHRHpZSUdoUUpESWNPMEEKLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIGdLVzlPczdLOWtuMkN3SkZidTNzTHJ2T3pidWFOU2tVSTFhOEZn -QWFoMkUKSEJLcWhLaEdubGlzQTNCRlVaV2taZ2J4MDU0dlZ5aUJnNWFJOFlad1gx -TQotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgc2paWFdMR1NGSlc5N1FLdUJtYUFnVFh3 -VUs3b1hvd2g5RTJHTWRmb0FDTQpzdTJpZGtHNlNHZ0hMbnJBUExpc09zRktGY2VH -THJDRFRxeVlEVnBkZkJJCi0+IH5oPD5ueC1ncmVhc2UgcDpLCmNZbHQ2MXAxNmtq -NmVHS1EyYkZYMk5QTlcxMi84cEVKN3BldVRoOTczK0FBbEdxZkJPc3VSNEZ4YlFR -Y3VPYi8KSWdXZjF2OTFVWEg3bGI4akpkYU1ES2FxWm5yb3lnYks1QXM3OWpyRE5N -ZERVL2x3Z05qYTl3Ci0tLSAzT0w5RzdXZlNTWXlvWTFTWDRGK1pzWEd3ODZiWnNy -MTU2L3gvMHNoUnpNCsyy7OctF0wY2O0eA7w2j+VlLHUAYMMECoverl/rcb1Tziag -1Oxgo1gaoNIyBK1R+q183zwG1+Ze8yD46v4eb52MFaCW9SIPW8zri/zQ5chZPEdR -xWhhDy0nnr3D6+nWgy0FxYqUAi7Y/+P/zj+J9rxHkTrH6grStGBvgNg+sHBi +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyA5WlRo +UDc2L3Z3U1M4RFRJNXZsWXVQdVhpVlRqaUIxc0wyaFgya1h6QVdvCjlIZTg2YWRm +VThDYUcrT3NUSFlJVXR6bER5bE9vcVl0YnpYVi9lZ3hSK2MKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIHpiUWExQi9ScmFrWldqcitKdmxCK3RZWUFyT2c2WHl6ei9sRDVl +Q0x5R3MKcnFBbG5XMHY5dXZoblZEYTdldU5yWFg2c0xSYlJGM2RTRlB0WXJ6dkRv +TQotPiBGSigtZ3JlYXNlCmJCUHZjbTZGeTMxODBLKzNhQTV6SzFjWmRKZFBFckhZ +SzZ2UEFrcVo5clZ0WTVwcENjbEhkN3hVelVwVVA1dDAKVUttaG9PWVZPalhSbTg2 +ZWVjMTZPR21EdkRUdll1aHVQYjY2czBFOUFDQ0lpNmxncUVrSmhPaXRKWWZqdVZz +Ci0tLSBIVUZ1UDl2dFNvcmRBWWc0SnFRanVabjJ3M0g5bmxDenl6d21LUktNbVVZ +CvtPWw1LNmJ79GlWzH6QddNi+tg5Ps53aVVzCSIS52QzXZqgo0F1zN0tml8JU4Fy +iCSrw+BvPF84fkWw0jvXKXoa8U6qS0cMOkyaB7O02BQ9aglhBzZF93+rtx3v/P+E +sCrkH7CFLmBtDjGHoxLnWM3UrpgaFPZG1A054nOTLAPc -----END AGE ENCRYPTED FILE----- diff --git a/secrets/hidden_service/lldap b/secrets/hidden_service/lldap index 9f91a02..97219e2 100644 --- a/secrets/hidden_service/lldap +++ b/secrets/hidden_service/lldap @@ -1,14 +1,14 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBhSnFK -VUttd05PS2JCaUxwb3hIN1Qxa1ZYTUJibUtzbXU1dTJjTks1c1ZNCmROay8wL1gv -bkZTN2l4UitYeHBFajNQTUx1QlpCbjA4SGJFOHpPcUJvRmsKLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIHFoYTZySTd4RWNhekJPeUtqSlJ5N1ZwejFBTTQraGt6V1dpdTk2 -QTlZaVkKS3BHbk9KcjRqOGJ3TXcwUEFtVFdJL0YyemFCaUVtbHRuMFVFdWhZYUtq -VQotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgczRIRUhHbEwybmhybTAweURTQ3Q0bzZK -VS9jdnk1ejhOekRua1RnSkJrWQovcTRIYTRXRzd5SkpkaU9WZXhIc3ZXN3l1RnlS -RTEzUy9zU2hwS3E4WUxrCi0+IDBRLWdyZWFzZSA3RmRzNSBJRSNBPTVRUCBUVXV9 -aSB3XWtvT1kiCgotLS0gMGIyQzNQMVhycWZsTG1yQm1zZVFMUGVSZnFDejBQY0hD -MHR2SktRVVJnZwodu88XjTwu8G6Ap4P4J5kwDEg8ZTSUROELn16CAdc44x98nN31 -15Yt+bEnqY3zeBt0shjZ5h4Us1JAut79df6UNXSqDWbt9pPp7PSRq3IqbFoyToxy -4i/HLHXm7nA3AdSwAzxIU74T06FPgcPwuaaPLwprKsNxQAdP75bxVIFaGA== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyAyb0N1 +U1NwYlZVem9RWUhJb09sUFVKTzBQeW1IVXR3eFluR0dVbVZsTFN3CmJwUVVYOWw0 +b3ByUXU1dHdCYlFXdGl5VWI1eE9Wcy9NdGhiejAxVGxUdzgKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIEhKWWVuc2xBeHFKYjVDN2pVako5UDNyY2ZGRnpPN3BNbzlUajFV +V2RMbEEKTHJVd0tkRkUrUjRoVnBHMUFQOGxFdEpkN0w3Z1VEVWo4NXY1RDFzUzJz +QQotPiB5YUolby1ncmVhc2UgMT9AaFpVLCA9UiwtSEIKVzRabTVpWnhTend2bTVZ +RzRFbUpvOFByRWp1c0FDRlhoOTFNTFFoaDl1MVdNWUhLVmVTQlAzbm43ZW5LV2F3 +TwpndlFrOXIzNFZxUlF1aVo2bEEKLS0tIHRZMU4wdy9JdmFiWjE5NEtrbTZ5ZW1C +a1hvNlhpYjdjOXpqb2gzSndJa28K7oW0DJsrqsu41tuEjY/W7II+AgMnB902UXvb +mHpKoSk7PinVyd0/RllLnh4WCBRfE5Jlq54Vi2zD6+x+BzLWOFyp4MSpUJ/c2qKS +BMJwcndgcUt2XemSD/pflcGLgMAXqSqtU6GFHZ/TxLy0TL7PHUAparwcHY5RYNcd +J2uNSkw= -----END AGE ENCRYPTED FILE----- diff --git a/secrets/hidden_service/microbin b/secrets/hidden_service/microbin index b04ea4c..3fb992d 100644 --- a/secrets/hidden_service/microbin +++ b/secrets/hidden_service/microbin @@ -1,16 +1,14 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBMUG1Q -eU8wYVJNS0VWZGk1QktDUXc0Tm1QYS9VSzB4b3pCUkRrV1RwcEJjClgycjlEL29F -Rit1SDQwYm5EaXdGUnVzVWwyOXY4enBtSlVZeFc5aUxOV00KLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIG1hcGpOSVJHcVp5YzZVZGxmbW9vY0VndkdwMTM4WENzNE1TUEFr -RmR0RjQKOFdzeG5GTnR5WEVOaGJqVXZ6RzJvRzN4SVNlSXg3dlR3WU9Hd1VrZVBL -TQotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgYW1ETXdZYmwwRWduL2pxK1BkZUtvQkt3 -NWRiLzdCOWNpNjRFZEF4b2lHdwpNcjUvaHp5Z1haNVdSM1plKzB0bmdQZE4yNVNF -VTBueVF5S2pTTnllZ0xJCi0+IDZ5ay1ncmVhc2UgcUprPmAgWXRFMn1EICxbInMw -d3YoCnFwQ2RRUHBqTkxMYjVSc2Z6Q0Q1NVVCSUJKdTJSVmh2NFFWcmpuMElKV1Rv -Qlg3SGNQaWZoQ3NIQzNXYXF6Sk0KcU9sYVl0MFlyQXRyU2hxaHloampmZwotLS0g -eDRMdDk2d2FiSlRENnBCQ2ZFOWFlMTB0UDV3S3htN1FuYzRYMkErbEpsWQpi4fpN -LuwxbGns2YlTVwBosYSB6W2cV8x2LLA8zxtP9dsiSXYDsGGns0Vd0UvRzN0XvSXT -CmV+68pBD+5bmxidkY0V6P8UeDwsJ5WKGhw7CxU/tNsY/IXI3p00ocVURhjqRu9C -Pq6wRrevlOaOjGTyegVRW90LhC3pN1cdLwPtNw== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBjTVBv +RWp3ZjBDd3h2Vy9CcEJ3a1JncGx0RGsrMDRydU94NUpCdjJ0ZnhBClg0dlFpdXpO +VDlUWDBiWG53QWZJcnZYVkxNQmZkRlNNTWl3aGZLeTZacmsKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIDZaK2xTcjBCSHJpMngxei9wbzdUZjJKbkoxY1VkeGtSQVl4dlQ3 +VjhlbTAKNS9WQTJHaC91M3JPeUhqdVd0SnRBYWVCdThGMjUvMmZ6Y3o3Tmhwdk5t +SQotPiBlW2J4Zid9JS1ncmVhc2UgbHhtIEcrCmJqeXZHSXB3UGRqZS9jeEJNRStK +bUIxMDhONkVRZStkSVdvN3dHTEFReWNJRzNhTWpoZEhaamdMMUF3aFdKYkMKVTZu +eTJucVlDc0tnOTBXZEhYcWE2UnZpNnpGVVIyTTBvMEx2MGg2ZWRvawotLS0gR2F6 +SnZucThoSXNPaGJmVDdSMVVSSEF6RS9na3RiVU5PM1l5UVRiMHFySQrthpqoxWaS +9BqRBrlRzxcY+Fj75GTzdoKyer9z/RIHEU8M01o/Slm2ovrIH924N9K/8x7m/7E/ +NKNTAQWeJAUujZ83ATwHMa8JYqx7Qf7pcacqb9oKAG/HnIW+o2CxeH0wBjHa88E+ +AitsAZ3GilqK0M2/9tt0FcV6+EgxdW0d9A== -----END AGE ENCRYPTED FILE----- diff --git a/secrets/hidden_service/nextcloud b/secrets/hidden_service/nextcloud index 4058b86..d980f8f 100644 --- a/secrets/hidden_service/nextcloud +++ b/secrets/hidden_service/nextcloud @@ -1,17 +1,12 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBVM1gr -MEF4aUdIWkdCT05KanJBc05uTTRLd3FYM1NXTFFIZkdKQ3Zmbm5vClQwVHZYVDg1 -amZhbEZiMWZMOFRPZFZoYkl1b1Zkek9yRllWMGMwQ1FmZEUKLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIE9aYjdlRmFiZXorSjYraDcyN29PTTRNZjMzWEtKQ2FrdnEvUW9U -cDhwV1EKa1ZMMWExMnZDZ1ZhQXEvQXhKenZGOXoveStIYTFKbUwxZFNESXIya1RC -VQotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgaS8zUHloTVp4MzNHSC9NK0R0SGpYdXBG -N3hCT24zL09IZXVQUis5aWpTSQo0N1Q0VlIxS0JWQ2hqblJFYllvSHo0L2xVRHhZ -bnlWa3g4NjRNdFIrVERZCi0+IEQ1JG4sLWdyZWFzZSB8KnwgQj9SfGEgNlR5QQpw -N3Z4d04rVWVRbkNzQi83SHMyR0hjL0s3UzRqL045ZEZRbGxKSG9XVFBLOFhqaHp0 -STdLNDJabU82NEh6ZDhaClRWSHB3b29nK2tKTnpEa1N5cHpIOFVmbWc4SVd1UTdF -KytCcFl2WFZzL21NQi94VG5tWDdUcGxRbnlkaG14UXoKN1U3QgotLS0gdFJtcnlF -TlY2R2lQWmVjdjJBRUF1ZDhad3FHRVk0MGpuVmlZUEVCcjlWYwofxHDcF2wBH8Io -4C6ze9gQQglTRzt+fTAkrHIaODsgoPzLaAT3aFmBNegPsoE1x23tI0uYKU8E7q1R -kzykQD8d03X/n5UQZw2NiA+Tzk+MQiwGFAB+di44OoqgJsdrxl34lRqhair+F68S -rvAIwU+Yetx78C/5OQOTomDBMDMdGg== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyB6NXo5 +ckI3VWJlRGdXMlA5U2p1WUs1Tm5JcjQ2VTVPZGFVajlyclB1QmhVCk5XSHNGRmt4 +VlgxRVVTOHQ5cHlodTRyTVk4UHdXSzJHYkJwQWRwTHFTOXMKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIEtJK2J0cDEzeDIrT2RmSHFucmoxTWZ3U2xRQ2ZEN2FxVEUwbjgx +VTlhaHMKc2UwYkFpY2xmM0JYc1BSbzJZZXd3MjFWdkhnejE2ZFJQK245bmVqTlh2 +ZwotPiBpbS5QPng0LWdyZWFzZSBLWCBPWnFfCk5GNmovem8KLS0tIERjaHpnYm1F +eTNGZDlxUkRVTk4zMHZPbTcvMVpCNmZpcVdydlJTQzJEVGMK0Pho+er77k6+yN6G +t2kZ/nrqWqZoIT9IhVxaN9e7u7kM+7UO+mc1Z4x3YFYxL3cf4qYStgCGnlQrq2+x +82BltHMb1ROGqCqrylQUTOJU2YuKwK79bQ6V2WToYCQ47iaP4RafPd3/B656ILGS +dX5qIMo7nXzADUZ0v5ASKiZpxF8= -----END AGE ENCRYPTED FILE----- diff --git a/secrets/hidden_service/site b/secrets/hidden_service/site index 09fc432..001fcb7 100644 --- a/secrets/hidden_service/site +++ b/secrets/hidden_service/site @@ -1,16 +1,14 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBuZUZX -eUpvRkROVTZHQ3NpR2VkcHdhRXh6V2N6eURMc0lPRDNFWEJQQWxJClU0YlY5cDVM -ZVMwUS9NVHdUM2w4c2pEcnI3RXJxMEswMCtnaFBzcEtPSWcKLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIDFpWHR6d0s0UE1UMzFWeG9LVXZxSDhGOTU4UzIvQjlQU3cwWk42 -YjF3RUkKc2tENENZWlllRGk4YVpqVHBSNUs5a0tnQkI2NUJvY2JxSlE3aXRUZFhW -TQotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgak16NlVSd0QvS0FmdHJvNTlUZFpmTFFo -NnFISmJycnRZNG5ZaE50WmNIVQp6OGhmcmtIOElVaDlra2k4cklEMGZ4M3ZEK2pE -RW5NSEZObWNkTVV6Tk9RCi0+IH02cE1yLX4tZ3JlYXNlIGBmW3ZXOApNUzFOV2ZC -cW1OTk9xS0ppb2IyR1FIM3dMRld3cmxxaGJ6MHlmOFpaMmFNd0ZxVG1SSlhPcGVy -NG1qT3Y0OENMCnRQYmpXNDIvQmZKM0dnCi0tLSBiKzhUaXV3ek92RWo1RFFkc2Zp -TXMrU2s3REQrSkpLa3krdUVNNGVMZnk0ClLkhaPisY3xRCeo/YQ0gO/BLKkU6CfO -wvBJ5oeA/OSP3rRwboz1CGMrEjpn2zQBF/b8OxiIvANB+EEG5lCwDkalCIhMX1bu -c9T7DqkV5ihUMc1glC6g7JICu2v4ZSUqAAO4oTnrSbCIFhGA5FW1PmKfuzFvMCNz -qxjKClAnjp9T +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyB6WW1Z +bWJhVlYrLzhYOU1MdjhUYkRxQnJZZHhhYXFRb1QzdDhWVDdLYVR3CjBvd3BRQ0w4 +aHVLTnBzM094STdXdlI5cUd6MFRHdlRxSE9xYzg2RVczSEUKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIDdEZ0hlQjEyNk1HdDFscjBPUXY2bW1tQWY4VVFpam4vK1UreHVt +SHBhbFkKR1J4aDVoYitJZlM2U0tNSUE1aFo5RlByQ0d0Um94ZW12ZzJsWWxINmFN +WQotPiAoVmJZXXUoLWdyZWFzZSBeeEBnXApFTTlqN3JlRHJkTThwUklHb1BRaU9H +d2o2a016MUpkaStab1Z1UmZRcjVKY2ExUDdvc2c5TFE2Y2E4elJCRTBFCjIxU3Zn +b1VKOGpUY0MzUUVRems5ZmtoWk54YmZHMHd2R3RDYXc1ZWhhaXg1VmtlVWZlZ3JP +cG8KLS0tIDRqa2xMQXNyd2RMVTZuMUhqYStOQ0RRSERIRWo3Q0I3V1Nkbm5TN3lY +MXcKsQKXGa6+77glepdp6+iXwTRqpens88iMrrwGhzRaZYcd150lcOH6wTC19VAP +7kJz2ExD67BiLpuhlcwwe+4MHBA2cF2sT4ikX3IB4G5+Vq7NcXkK9Xp01GKrs0FN +xPjB2YeFFvzI2G5b6+5DhZQuMi34tkYIJRT/O4yNHjGKQdg= -----END AGE ENCRYPTED FILE----- diff --git a/secrets/hidden_service/vaultwarden b/secrets/hidden_service/vaultwarden index a05c76b..3b360b1 100644 --- a/secrets/hidden_service/vaultwarden +++ b/secrets/hidden_service/vaultwarden @@ -1,16 +1,14 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyByZGZP -NkJDNjFDU1BLTHlObEhyaVJudlFmRDVLeTBVTCtIRWY0QTdMQ1JNCjYwVS96UFZM -WDE2RDE3aGNmYVIwQTdoOFRmSnFjajhYSGxqY3M1SlFkaWcKLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIHNDaktVYTc0alNIdEgrTkFiTzlTUzNSOHNsM3pFS2tyQnZ2UWFu -b3hoaGMKbjhQb0p3UkRSZFFGK1hTOWhaOG5pbEg4VnpCdEU3U2dYWmVmV0NGWXFh -QQotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgeDZOUnBqdmJXak5WYVI2eWVhWnkvdm1n -WWZtVkxHYVFLR1pPYk85amtRQQpUU2psUS94RjFRSGVlV0NlaG8zYkxDbE52T0RL -cFIvRjlPb25HTm9lemhJCi0+IG5Sc0JfRGEtZ3JlYXNlCjdHanJFY29hSUVYOEd2 -YXBSbkJpU2p6OE55cnlYNmJxUE1JMy9uQlNWY2NCTmE5VnJ2UmVxVTVvWXhBR0U5 -OWEKd2gxUkVTYWJlQUhjVTZZbmhIbkVOK3RpTFJmOFpiK0NMcGdYdENTMQotLS0g -cjQ0RnJldDFjR1ZBV1YwamZiM1BrNUk3K0trcFZXQU1GLzQ0cUdRZWRBNAo3R537 -ZY67kqY4LsiXcv8QUO+ZmsKzXUIZstjin09FsdUcWIa0fUL8OfxgJPhp5CZlQ/dJ -lUAQDUy1BpzGaCavA07gOkkKqRyHOVEUTwczG5uHrNoYor3g4cNjPqEiT5d+MmWt -rBbD0aBfrL7f/DdIVOn268FHdj6F1o6nVOn7UA== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyB2dmQv +MU0zZkUveCtoMFkzdnU2dTQ0UVpaTjdhUUlnTFkyUi8xY1VYVEg4CjhhVFFJZUpK +M3ZENXk4WVpQazlTckVBV1pNWHhveFYveURmdllCRGt2b3cKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIG1pdGpPRmtXZ28weDFSMytEbU52STdpcVdBRm5XenRoTGRqbzNk +aEI5V2cKbjNRcERVSG1pRHg3VmkwbmpUK1ZVSS9uNjBjaFFSSS9iQTRVaisvWXI5 +TQotPiBDLWdyZWFzZSBSSzY/PzYqLAo2bCtUWFFwOTJiWFlrbUFFeGhFb0FSakpl +Y3Qzb29qVFA0RDlPeEI4VXpPM1VJVThjNk5MeTNNSjc2MVlGODVyCm1DeGkzL3I3 +SVFCZEZkV2FMNmtJU1hnRXhpRVBza2sKLS0tIGk0L3R0QVh6QkgrZXcxN3o0U2lB +K3ZHQnp3bWZORXZBUEJWMmVVam1ROVUKrSK7sPbla6jHMjFoKQ0YZRH+2mcnnw/y +CxWqeAx2eDTCTBlHTqqGPj2MdP24MddA0aTGSKrsrWeL65Dt4vGgGJFjcr+yLkw8 +hmJyuzlzatOyhR2ZPyCBjV0ETgJZ4xGQnWQ9kIK6DHF3T0ggmbQc+GFOy7ZIX8YP +NDZ+YXHHM/c= -----END AGE ENCRYPTED FILE----- diff --git a/secrets/nextcloud-admin-pass b/secrets/nextcloud-admin-pass index 4cff7ef..28d5fd1 100644 --- a/secrets/nextcloud-admin-pass +++ b/secrets/nextcloud-admin-pass @@ -1,14 +1,13 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBTeUs1 -Z2tRR2JlTm5QZDAxd3ZnWEZuM29yWm93c3dsTDNyOXd0allkRTI4CjhvbVViMnN1 -NVUyYXNJR2RUNVlBYzZycHc3RVNFZmZ4ODBVcEFRb2pBMDQKLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIGdEQk1HV1JTajJNTldvUitPcDBUNlZ6TjhpMkgvdDVqdEovVmow -WFJZUVUKbVYxNmwyMWx5Mk8xOWNPc3MzVFBjZEZ4OFpoK3BGVWxraXRkVDMrSUtQ -dwotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgVXUzYXZLN1g1bTY3R2dWV3hsQjJ6S0Fl -K1ZvSkx0dm03S3kzOVZFOFJENAplOWJLYld3NTdaTGhNN2h4dUd4MWhiS2tYak9C -WEJuRkt5aTBGM2JUcUhrCi0+IC8tZ3JlYXNlICI0TFE8eWIwIDtyJzgwZDNoICV4 -fWVKewozSi9GNU1iTmU0YXpqWUtTOVhsMENEYnViczdsV2xQdTRkeUNrQUNMV1pu -UTJUNzlzOVUrVFViaCtuL29ERFBDCnpYRUNNUlkrb21nMktqa1EKLS0tIGd5TjJX -VFpIanNPZC9SQ21ibzRkWFNrelh6MVVhcDA5V3NHUEY3U2pqdUUKbsyatvJfZ5uU -RbbvdrEW+qNdLxgFj/+1I/A2atBGH72wCk3g +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyB3anNI +YW0vRFNTeDVneGRKU1JKQ1BWWElYTkFYMTZZODl5MDUrUERCa2xNCnlTTVkzUVZj +QUNxSnRtR0NsSUdIUUlxbnFFK015Z0dRUys2Qy9RV1RrcmcKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIDVEcG9BQTRBOUtENGJKUzBySjJ2cWhnUVB3d0plcXpzTStCbzBQ +ejZzbW8KbzF4aE1vWFVoVGRDQVNucG4yNGRBYTREK2IwdUxUcEJhYmFVYW03Nk1z +VQotPiBLLyNsLWUtZ3JlYXNlIEwyYFwyWiFaCkVLKzdDYlp4NWJrSTF3cXIvd0k5 +ZTE2Znp4VW4vREZhUWxKamF0SzQzTStYTjlaRHJHbG91amFoY09WN0x3by8KMW40 +MEFHb3BrazVMUTNZc001ckpIYmhlTVVFT08xblp6WTlaZDNFOUdyY1J3bXg1NVd6 +K0Q1a1p3VlNCd3k5VAoKLS0tIDg3UFdxODdSaGMxSVFqRDlhQXVzSDlIdTg0OWN5 +QTVFQkRHVjRRU1Eva0UKukORLJlS6aPE9JjXEZ72EHsHymbRDNwCdsBCDjy3gioT +/uZm -----END AGE ENCRYPTED FILE----- diff --git a/secrets/prosody.env b/secrets/prosody.env index 0cb46a6..5d37cd0 100644 --- a/secrets/prosody.env +++ b/secrets/prosody.env @@ -1,14 +1,12 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBwQ24r -bjMxb3lwZjNDL0poeXl6UFpCZUNhMjcvZHRGT0ZMRmZOQ09UV0ZFClRpVUNFWkhj -UldQSHV6eklxd3I1ZGFSaW5NbTRTa1daVjVDTlF3cnJnT1kKLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIEt1dVR6WmkxYUpha05vbXRsWnhmRmNFUW1IRG1lN0RpS1N6cHJU -WTVwR2cKNGs4ejNPdDBEdXlhbUNmeVAwTEZ6dlpiaW0xSDMyTUFDMzl5M1FCYk02 -NAotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgNDYyNVlya1lEM1JMeWlLcHJUR1hMNTQy -a2FwcWlmK0FrQkdmdVBWbkZFMAprQVVjTk9iTFU1UytGWkZvZXB4WnhZUXdIV1JK -endYNXFkdFhSQ3Z0OGN3Ci0+IE1LIy1ncmVhc2UgJ2p3IHpdfl9JbyB3bHI4CjBv -UVI0YzVsQXVDR0VjeXJIVlBmU2lQWlBIYXFOZlJjamdhZDZvdzZYa1dQYjJkaUxT -dwotLS0gbWlnREJkUVdXZTV3K3RXK2t2M2JjSGh0MUJFZlQva24xbjdPTWpxTEV2 -bwqX5KLJXY4twZMD04gWzuOfwb/mb72SY0byQmV38ftYLmIGmqWRPLcF6bhkk9qi -8vzHkwBjaRrEo7Xx7pVs6LVS+s4= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBPTFFs +MXdVcktWQVRtaXIyTDdydWFGOVVnM0Rjd1BXVVRFRUs0RjhnUTBnCmVEN0RJVld6 +d3l3bjYwenJLNVFTcW10WFJIcmY5aEJXYmtSdllmY29jUkEKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIGJwVzJRZFZKenlLamtUZmwxaGhKdkwyalBaSURFbWRHdlFVUkEx +UEw1UncKeGUwbkVuUXlvdWRLR0lmY1RiL0dOcGpNamMzZi9iTHpzaWRYVkN6ajYx +OAotPiBATiUsJC0tZ3JlYXNlCnUzWHhwNzhYN3orQlkrakt2cG9SbUQzUjNxNUNR +VmRWb3E0YjZJNDF3N3JYRGwzci96eDNTTmtkbkppMgotLS0gUFVxbTNpTzVydWFI +OTd2VXp1Sk1PWlZ6LzhTcENCYnpnUDN3NklGQ2RCdwq/faixWhKpkRZDc12ZXGpF +oS1ZayltHZi8q/PM26UdForNr5TMTwwnGR1ojVkOVebGnvBnaEozAqcWvibObVXN +4v4= -----END AGE ENCRYPTED FILE----- diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 8e67503..2b6b304 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -4,9 +4,8 @@ let users = [user]; # Current host - old_system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMKxw1fDsIUUh3vWCD90LDgDMAG/NSVRg7QamUbknz5A root@distrust"; - new_system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEVvvjL4XXn6z0fOZnr1v0twoVBINi1FOES15JL/3vU4 root@distrust"; - systems = [old_system new_system]; + system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEVvvjL4XXn6z0fOZnr1v0twoVBINi1FOES15JL/3vU4 root@distrust"; + systems = [system]; all = users ++ systems; in { diff --git a/secrets/vaultwarden.env b/secrets/vaultwarden.env index ecf16b4..76bb5ce 100644 --- a/secrets/vaultwarden.env +++ b/secrets/vaultwarden.env @@ -1,14 +1,12 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBPSEJM -enIxY0hXdFhNOFV6dC9xcFdlaDN5MDhvMWd4VkZQUmJjWHF4Q3o4CnVVSGRrSE5K -SUpmY1V2Kzl6eW5jTkZDZGplMkhGTVluNjJmT2xSVmg2S28KLT4gc3NoLWVkMjU1 -MTkgYU8xbC9BIHdrYks4eWI1enpYdlIzK3hlT1RoV2N2ZXNoYVFFaWpXdmhNdFZk -RHphU28KSWFGM3F2T21QSFozNlROVi9jUHg4SmdWc1lLT0xyTTJxZmFmdlUrYTda -MAotPiBzc2gtZWQyNTUxOSB6Ym0rUFEgaVVLR2xLUTRYSGY4MFVFUTB0a0FJeUZJ -K1lLM2o0OHVxR0V1MmNKYW8wSQpqWGc0cUVrRWJKUkZsUDZ4bEJPbldBbHM3YWlY -OU5lVzdPQ2hDclo4NzJ3Ci0+IHR3cXJRZS1ncmVhc2UgaixNWCBlJGE7VDwKTURW -a2pnCi0tLSAvOHFZV1NlQ0xXNkZpOFdhZG9tSlBWRGhOeHBTdDV6cXhWRERZc2hw -b0VRCgTSkXJ5ptXpscF94DkqfaImpZnWqI09KzuFmEZ4BxpCtnHxDQ+6x2IId5Cu -T+c5kkiT87V5rFDFrnQ+3DPzz6erhXCWQZUeRNOz08GJpW2z05xs49tggdU15pj1 -9cptn8D/ZuBW+yigyZkT8TE= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9QUHhXdyBOZG9X +aVhOQUJJQURDZUhrdVBXNDZJcTVEZ2VuK0xPS3VNeHdCWUV0M240Ck8rNzY4cmVQ +Z3hCaUlTb1FDK2hmYkVaeTgvdXpYUE02YlpmUDNXd2U5aWcKLT4gc3NoLWVkMjU1 +MTkgemJtK1BRIGhlYTZOMUpMRzgwd0lsZWZBWUJHdlJSd2sraHpYNHRqVFFkenFY +cDZTbjAKWEJQTjZOeUlRYVZlS2MrdUlaVVZselZJSWlpdXhDNXFoNUpMVmxsdUMy +NAotPiBoLWdyZWFzZQpURko5Wml3SC9HMXlHdzdpVnlGV09tbzVnZkk0M3huditJ +ejAKLS0tIHFudisza1l6OWJ2bStEbHJnczBHbkYzTk5xc054YmxDWFBLUHJac2hC +dlkKSly02fgapT+VuOOiFr7IWRbWpVw1OY8/zEnhzld8ergKsoA0twu9ZNnYCd2a +lxzh6MC30RIFT+xZwiOv0fRGRllAt6IYqb3bu4JByg/zd4l8VruUVmS7HSEtlZY0 +2RgEQSU90A7qirUClqWPbw== -----END AGE ENCRYPTED FILE----- diff --git a/services/borg.nix b/services/borg.nix index a658d60..4939582 100644 --- a/services/borg.nix +++ b/services/borg.nix @@ -3,7 +3,7 @@ age.secrets."borg_pass".file = ../secrets/borg_pass; distrust.backups = { - borgRepository = ""; + borgRepository = "ssh://u506783@u506783.your-storagebox.de:23"; borgSSHKey = config.age.secrets."borg_ed25519".path; borgPassCommand = "cat ${config.age.secrets."borg_pass".path}"; }; diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix index 8b01d5e..5e7b44e 100644 --- a/system/hardware-configuration.nix +++ b/system/hardware-configuration.nix @@ -1,14 +1,9 @@ -{modulesPath, ...}: { - imports = [(modulesPath + "/profiles/qemu-guest.nix")]; - boot = { - loader.grub.device = "/dev/sda"; - initrd = { - availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; - kernelModules = ["nvme"]; - }; - }; - fileSystems."/" = { - device = "/dev/sda1"; - fsType = "ext4"; - }; +{ modulesPath, ... }: +{ + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; + boot.loader.grub.device = "/dev/sda"; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; + boot.initrd.kernelModules = [ "nvme" ]; + fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; + } diff --git a/system/networking.nix b/system/networking.nix index 82b6718..a4c41bf 100644 --- a/system/networking.nix +++ b/system/networking.nix @@ -1,14 +1,12 @@ -{lib, ...}: { +{ lib, ... }: { # This file was populated at runtime with the networking # details gathered from the active system. networking = { - nameservers = [ - "9.9.9.9" - "149.112.112.112" - "2620:fe::fe" - "2620:fe::9" - ]; - defaultGateway = "157.173.112.1"; + nameservers = [ "2a01:4ff:ff00::add:2" + "2a01:4ff:ff00::add:1" + "185.12.64.2" + ]; + defaultGateway = "172.31.1.1"; defaultGateway6 = { address = "fe80::1"; interface = "eth0"; @@ -18,38 +16,20 @@ interfaces = { eth0 = { ipv4.addresses = [ - { - address = "157.173.124.100"; - prefixLength = 20; - } + { address="95.217.161.66"; prefixLength=32; } ]; ipv6.addresses = [ - { - address = "2a02:c207:2288:2816::1"; - prefixLength = 64; - } - { - address = "fe80::250:56ff:fe5d:f07e"; - prefixLength = 64; - } - ]; - ipv4.routes = [ - { - address = "157.173.112.1"; - prefixLength = 32; - } - ]; - ipv6.routes = [ - { - address = "fe80::1"; - prefixLength = 128; - } + { address="2a01:4f9:c012:215b::1"; prefixLength=64; } +{ address="fe80::9000:6ff:feb6:58bb"; prefixLength=64; } ]; + ipv4.routes = [ { address = "172.31.1.1"; prefixLength = 32; } ]; + ipv6.routes = [ { address = "fe80::1"; prefixLength = 128; } ]; }; + }; }; services.udev.extraRules = '' - ATTR{address}=="00:50:56:5d:f0:7e", NAME="eth0" - + ATTR{address}=="92:00:06:b6:58:bb", NAME="eth0" + ''; }