From 8f4ffd1d453163c757f4bd01b405bf06c2fac829 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 29 Oct 2022 13:04:17 +0200 Subject: [PATCH] miniflux: move into module --- nixos/gorgon/configuration.nix | 9 ------ nixos/modules/default.nix | 1 + nixos/modules/miniflux.nix | 39 +++++++++++++++++++++++++ nixos/modules/profiles/base.nix | 7 +++++ nixos/modules/profiles/laptop.nix | 1 + nixos/modules/profiles/server.nix | 1 + nixos/surgat/configuration.nix | 6 +--- secrets/agares-backup-passphrase.age | Bin 503 -> 449 bytes secrets/agares-backup-ssh-key.age | Bin 876 -> 757 bytes secrets/gorgon-backup-passphrase.age | 18 ++++++------ secrets/gorgon-backup-ssh-key.age | Bin 788 -> 772 bytes secrets/hydra-github-authorization.age | Bin 524 -> 592 bytes secrets/ifrit-backup-passphrase.age | Bin 408 -> 422 bytes secrets/ifrit-backup-ssh-key.age | Bin 903 -> 853 bytes secrets/miniflux-admin-credentials.age | 9 ++++++ secrets/pruflas-backup-passphrase.age | 17 ++++++----- secrets/pruflas-backup-ssh-key.age | Bin 872 -> 840 bytes secrets/pruflas-wg-hydra-key.age | 17 ++++++----- secrets/pruflas-wg0-key.age | 17 ++++++----- secrets/pruflas-wg0-preshared-key.age | 19 ++++++------ secrets/secrets.nix | 1 + secrets/surgat-backup-passphrase.age | 16 +++++----- secrets/surgat-backup-ssh-key.age | Bin 808 -> 873 bytes 23 files changed, 114 insertions(+), 64 deletions(-) create mode 100644 nixos/modules/miniflux.nix create mode 100644 nixos/modules/profiles/base.nix create mode 100644 secrets/miniflux-admin-credentials.age diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index cdc1854..9c5fe21 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -71,15 +71,6 @@ in ]; }; - services.miniflux = { - enable = true; - config = { - CLEANUP_FREQUENCY = "48"; - LISTEN_ADDR = "localhost:8080"; - }; - adminCredentialsFile = "/var/lib/miniflux/admin-credentials"; - }; - environment.systemPackages = with pkgs; [ chromium ghostscript diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 3928d3a..834470e 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -10,6 +10,7 @@ headphones = import ./headphones.nix; homepage = import ./homepage.nix; kanboard = import ./kanboard; + miniflux = import ./miniflux.nix; networking = import ./networking.nix; nix = import ./nix.nix; nixpkgs = import ./nixpkgs.nix; diff --git a/nixos/modules/miniflux.nix b/nixos/modules/miniflux.nix new file mode 100644 index 0000000..6afc735 --- /dev/null +++ b/nixos/modules/miniflux.nix @@ -0,0 +1,39 @@ +{ config, lib, ... }: +let + cfg = config.dadada.miniflux; + domain = "miniflux.${config.networking.domain}"; + adminCredentialsFile = "miniflux-admin-credentials"; +in +{ + + options.dadada.miniflux = { + enable = lib.mkEnableOption "Enable miniflux RSS aggregator"; + }; + + config = lib.mkIf cfg.enable { + services.miniflux = { + enable = true; + config = { + CLEANUP_FREQUENCY = "48"; + LISTEN_ADDR = "localhost:8080"; + }; + adminCredentialsFile = config.age.secrets.${adminCredentialsFile}.path; + }; + + services.nginx.virtualHosts.${domain} = { + enableACME = true; + forceSSL = true; + + locations."/".extraConfig = '' + proxy_pass http://localhost:8080/; + ''; + }; + + age.secrets.${adminCredentialsFile} = { + file = "${config.dadada.secrets.path}/${adminCredentialsFile}.age"; + owner = config.systemd.services.miniflux.serviceConfig.User; + group = "root"; + mode = "0700"; + }; + }; +} diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix new file mode 100644 index 0000000..146c443 --- /dev/null +++ b/nixos/modules/profiles/base.nix @@ -0,0 +1,7 @@ +{ config, ... }: +{ + security.acme = { + defaults.email = "d553a78d-0349-48db-9c20-5b27af3a1dfc@dadada.li"; + acceptTerms = true; + }; +} diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix index 8713a41..ad8a84c 100644 --- a/nixos/modules/profiles/laptop.nix +++ b/nixos/modules/profiles/laptop.nix @@ -6,6 +6,7 @@ with lib; { imports = [ ./backup.nix + ./base.nix ]; networking.domain = mkDefault "dadada.li"; diff --git a/nixos/modules/profiles/server.nix b/nixos/modules/profiles/server.nix index 2f34704..42740d0 100644 --- a/nixos/modules/profiles/server.nix +++ b/nixos/modules/profiles/server.nix @@ -6,6 +6,7 @@ with lib; { imports = [ ./backup.nix + ./base.nix ]; networking.domain = mkDefault "dadada.li"; diff --git a/nixos/surgat/configuration.nix b/nixos/surgat/configuration.nix index b0a4d6b..f80b215 100644 --- a/nixos/surgat/configuration.nix +++ b/nixos/surgat/configuration.nix @@ -41,6 +41,7 @@ in dadada.element.enable = true; dadada.gitea.enable = true; + dadada.miniflux.enable = true; dadada.weechat.enable = true; dadada.homePage.enable = true; dadada.share.enable = true; @@ -65,11 +66,6 @@ in ]; }; - security.acme = { - defaults.email = "d553a78d-0349-48db-9c20-5b27af3a1dfc@dadada.li"; - acceptTerms = true; - }; - # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.version = 2; diff --git a/secrets/agares-backup-passphrase.age b/secrets/agares-backup-passphrase.age index 0ce1af60a6d43b7f9df4c540c7404ed61bf1764e..c4e6b96c4a5e8db2dc17b983d88ed68626a71082 100644 GIT binary patch delta 415 zcmey)e2{s9PJM(|L3x&Gk(YBuNwRZ^xtX@Np;K14vtf3HpGihah*^4AUWQYFTe4?W zAXl)ti?)wfVWpdAiJwtLhPInql&h~%R9cW@rdfGWVopG~Z=|1#Q>A-mB$uw8LUD11 zZfc5=si~o*f`3VNPIkG1L6S?TZ>3XKzQ0jcU_f3vuAjMMaG+yQm_ewvc9CatN|IAWpZQFuH4{of8%V^ zOq105g4EI=6 z^MF*-cGdVZmIUVT|&Ku~gia)fJss$-^MuxC+5 zc5a4~U#VLtS89e|fk{?thk<@F z$hzvHpd!7R>PX%6qSVCVR0S)G7#9WK!T=R}g*>GgJ&inGlN9rc41ZHIKi@D&#w`6y+aGvxR*|$2kV%gFiN31w4F8^F-SfG3PIq!)oR>AX?Hy>2amtwda(RhFM zkK;D4tS%-nbLc#pdBCk~BWwEI_nKEy-D?E3m?AEwdDlyQl-${sD{*<1pkz~>cn`N3 z+m}yHc6)0cp17yKY_IPBjnWhSBF?x@v@i6Ok-PSw-G77Or8kb;M~>X#V{MSnUDtf3 zO2)MNwQM)%#f|H)&xxP)uA^v18Q+B-$y&vW2X3>P2TwXad)DlmFHQ6& delta 845 zcmey$`i5#{?Sz&l^PGN?RMWKFRkzrOrc7UIuMRsYTaiFo0 z371iJp-WVXe^7S1QD#(GQJTAHU}&(vuc51Xk!xsCagKjwdRVxBPI`%dAeXM4LUD11 zZfc5=si~o*f`3VNPIkFMT6#cAW^%e)o}qEJWlB<{SAB_Lgh8-TMYvCzi<41GcuA(Q zpMQ?Gsb#n;mqkWOfSY%@aZqM)q(OL&c3`4MX+)Y^MLk60<+36W0x%Lh>A3)NOQmPEKhgs z5`FW^ipYu_vkL8s#6pvT;4Bx{Tz!iGFOM?g#B?rQU0sFbg0gZ$m&^$BD8E$Cd|#)c zLc?GaXD8S4%4~DPa5Ix^cWn=UgLI3$YzwaX^_Nw)t!@o!lbSc%xHRs2)@h;XFUtNO z6WDe1()@(835%nzSn{QqOWtJcu)cm@`9Z$=@@bVxCq)WdO*j@5Jg|E^|NNWCuUbDi zY;-#_WKLf@)85suyXtm+d&m#o{^vP+WL8GS)$W>@%d+}v66wdq8V|K4YMS0Zn1DR6yyspnxu0B8|yod5s; diff --git a/secrets/gorgon-backup-passphrase.age b/secrets/gorgon-backup-passphrase.age index 1d64081..eebc180 100644 --- a/secrets/gorgon-backup-passphrase.age +++ b/secrets/gorgon-backup-passphrase.age @@ -1,10 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 0aOabg MxtQYFyYyErJW0Uaelu02iRAoksaVDsZD+55ADoNphE -pA0OKXbqXrNWwbc52exj22cbMsFVCjk6hwp7KeWYyyA --> ssh-ed25519 Otklkw c/v7Ux1D4FtdIa0fzoEkGJSH+/bexN1nJUfLg1Ym7lA -Bi1cIh9wjppaBSpTLh7HdpJX+ZcGOLDjxaDUJXbJ6+I --> s2,Qn0%_-grease pZM*A 1( -4W6WjHNho1bIzpd+IFh6fHQgo+3d5FK+RO5TOZw+T6A211bvOCoHG0LBZfpohqKy -Q6zFhrMxOtWTne8uvX5hm9yXV2+cd6EbxOuk ---- ZFD001UDd7ZmLNT8tG8ecnVIF0UgW0YQhh15dgUjVJI -X-KAs߿,u-KYoHV$Ba^]K:UMfw; +7.#J^' W GF \ No newline at end of file +-> ssh-ed25519 0aOabg 9925sO5KCINg9I0lFyD7I83Q/inYVtVvtzskAo0UnW4 +7WrwhYtGh4tGV1MOMN5Ok/1xqOy0mek2SOjC3gQvPOI +-> ssh-ed25519 Otklkw l+H64LT7yh+tXhBqxkI+C+U6/6boKV41YVay2cGLNX8 +nCsvh1IIFiQDeNjdkurHwxT0VEZt8yBkvQoYKacZB7g +-> SZr0-grease +AVV51s2iYes+DKhlYlNDzaXs7BPXaqwzjJLzMapEK31iuOs7mRKK +--- NlKhbaqBp78g2+PLSHhm4RE2CT40JFxEIpQCrNwAtsI +Cގ urY#(C {$q2{0;p}06h zH#Nn`)YQ;Y!M`LsC%ass#LvjgD=pEzFe}{CG}BQ(q~6cP*gw}P(mg68%qg=nDy_t+ zD$Ok|%q2IUE8R8Fv8>1?HQmh8I5ari*~rDEG{;TfHNY$|xHKf&E8Q!_(n32oGDqJR zWL=GJdQoa(ajHVRLRDm5VqjvXC0AydNrAaVX>e%1sefvuzG;@ek5^t=iF=Y?IhU@k zu7YoUMz&K?US3J2pG&4`a8`kSif2}6UZk;Op1Zb(Td9AtL7-`Frkk5tP$bukIvKWw zv37ej+2>tg2yx*xl&uuE?<;(qf1RCwkL7O#)9{$5GpDZUk_*_Q=6XuiTI;0Unouz( z!9_DQ&n@UXp>6BC#&M44r8CSORaXQ3w>zmVVbiF;8fX8~V7}$)8I!l3k+|uzNB&v) zqtYj}uF`H9NhW0nZyb~OVpYoYa`_9Pj^~SB+Ht3Df3&b2yltuuX6Ep7|U4hguGHvOyFCz<&LjmgU1 zlXd*I+3tH%!l^rVeo$H#A7j>|%wvDPOch(fzDLjOg?*3g4PM8fSsEttjt&9rEoOJ_ ztr9M(-DLA~tM%O(kM12W4(Bm>mGZfUUvc}KD<#|ACRz1zXtxH?)s{aMaGCvA@8KSg`D74Ge6n3J&{02c{0LjV8( delta 756 zcmZo+o5D6hr#>Rdz&Xt%DpQv+}F7x%`ZJKBG}R(GB3$HC@;~^($w7CJv2DHAj>4!Ai^@mwW_=v zWL>ImdQoa(ajHVTtAe7oLb`%Su`yRrWpaLMp-G8HWo1!tvZ;%HL3v`3Z(w$DX;H3u zs(E0&M@ddjpqXiIX&{%buC79OWpaU;Q&m}^qlcrjv5C2ln|pzOg^NdEvQu%6QL;&P zL3u<)QIJ=1q$ijB^Qs#&Z(h#0^?7SUeDpf!2O$QW$JYM(dGqqreOeKH-VN=se!ACW zWf(+7U0k{XG^;w0!f8kLTXWbTTMR3T~Sy z|5@|qH#wtynb+%YOY0fknO%9eBJIM(H3Ab{dHZgzt{yYzDyNy&AKL8$n5S(2@ZiwzTeG|CYX9c1XLvlS|i5p}06h zH#Nn`)YQ;Y!M`LsC%at1EVSG^!_(1MKg6KeGsM-xq~6f0*eoz2+%YIw+c3&3$jQ?` z!!^n?Io!#UD>UCJ#55>9zc8oJpfIT-KegB}Gu1h}uq?UEGtbp9G1$>OBD}IPJ2lr8 zWSy~wda7=EQEFmws)BcFR#jfUrp zc4%5sgj0H^S4Nq?w|ilvk3n)yzL|fZWp0i|NtL_1VXD8Eo4J3sMOA=twzsoqdWLp{ zMM_dmKvhIaIhU@ku0pn1x7o72Qe?aK^$%W6k7xZ`*FJwBgOil3SYXOb3>HO2b z9f?#Gej5tzVAoc#a47epNlUg8#YB6u(3}0MR$f AnE(I) delta 490 zcmcb>(!(-Ar{2xeGe6QIv(U&j-5{)7KiDrg)hXP?zdR{5IW5hj%Fr;xAUG!@D8x4_ zpUX7KEg&qjEHcR4$RNPPxHM2dS-a9CBs9V(GdM3JKOi~LvpC(!EF(1_n@iVDp}06h zH#Nn`)YQ;Y!M`LsC%arBKSkT8v^==XxS~)y$}-Zzqdqu1BHzn2s?5N=w5mKP&nYw@ z%C)E}BhfgSE3io0BtNa#H7~#*q}(}KJIg%SFsP(dKf=Pj(AXd~GB4Z9t;)r%%+S&V zWSw_Rnz?RzQEFmws)DX@kb*LoOKxb9L3((4Nl-+2USg7?pL3yhL3&oMU%q2@Za_|Y zhNo$Lq_KfTaFDr6V2Pi5N@Y|*X>edllzD}lNkF7~Fjum9sFPDxK#)_o0hg|>u0mRI zc~q6ZxvRcMd2y0qj)zH7QhHfHVwiJal}B1}N|j-Wk4tH#Qzdy69l)3z@%8ieSg<^rh&s+Vi i?5-4daGYFmq4!4BN8XE15Ba}6@zM8Cw!qTbICcQ4-LuvJ diff --git a/secrets/ifrit-backup-passphrase.age b/secrets/ifrit-backup-passphrase.age index 9caba1ae70b57a1b8a5a68a7c695a774c01820d6..1ab7e0e0c236d98439cfbec6f8ae505d60d2c79f 100644 GIT binary patch delta 387 zcmbQiyo`B*PQ7PnMVM2Nk42_?WLT7mNp@kNUxjhHi%WrFcvVHAsj*X)SBY_YP+5Mq z1y{IZMY&tHvs-XlhI4RoM3QT1m}8MgNwS%Hah9i1dSGO#xv9IOc5r@{Ku;5&$|@I2lkmvk zvJ{sZ=PLiQ@S@DDyeKYRU0sD-*PxPcM?#ov7bRmSg@C0MQBw;YDiMHwn1LHTd-kKKyZ?8c4mGk z$hw5wKsDX;qSVCVR0Zc~<7fr#WQ|%A%EVNkvWk>UeG`vx$25Q6vIyS_%Rt8r=d!F&E}6oK zOUk^TE&ac=>!7mJ@&6*rHm|;WrCUg`>94shp9;TNc~o}7;t%#OPgb9LyyN}+%&-uN S?Tc$(n|FBMjL%-G{}BLc9)Bv6G|JVvxT-K$-{0G#vdlOw&%GksFUh;8v^cxc zkt;0J$2hal+_F;J$hRmx-=efg-^0*detV;GXKG)^ zRYS9X7iuP#t~nGmK{l#ngI37=6`$%#F0h9FcUrRj*%^u3kJ8laHysIyD|*|^rrR9# z#Y={tH+s{LfJ2L#^<84FAKucmXVKhqO5VTi?#<%5?%Forz^wl0^M93-*4|jZqLoqN zTb#APcgf$6+J&vn(yc$uBWC(>OO7 zWL-$GpKf|lYGQG!f@49Rf^w<8iiUxvj)H}PVx6{~j(-}Ld3H{5M80K(t9hzng+ZdH zg@IhVFU zs6lCHxuJ7zg{4tmS!986wvVN=t9FQUUV(qOg|?TIxwm_WWtwklu1l_|euaB-sgHAh zvb$M$QgV))kujI4BbTnOu0onYQI2PtlT&fMd!@UZVNOzJaBy;NSW&TarI(?5L2gEH zNN%E$N1#EKb}?7-MyE$hb`&tC&S8|jon&15_qb=9$1P!n!(X!VF7Bw-e#ZZ!>RC6( z>c%VgME8q4SlZp86aD#z)Rj$-_e(W=6^zMS-e$7RH?O4RZJ>#~H}{;1iQBb#If9Fe zt+Z~{Up$bP;J&vw;=$|-RY_?_Qn@F&8idWTvG$)4xY#y4j9)1v$Ia@=2vFt<5xEI-TkVZ zUFEbwvca4`d+MC6`gbn$O|92`lxQ<&g}Xz)`LoW4CvVo@X*+)WSYUVGE0K%c5{C{6 zus(dYWs9os!T;+Pt|%#ThPF6{LJuYfsc>4c)$c>c5F*db}?_ zo$!B?v1nF{LqyY=NYQNH{dOM{9POE{1Hxu)aDREKPyeQ{)87SWPb;#_I`S{->6~@k zODzrD+k$3ZT|WI-=J@U_4;G!0lVo*Qne%>#Wpepvv6auA R7P+yOzY^Xc-Lp~95dd1tVPyaS diff --git a/secrets/miniflux-admin-credentials.age b/secrets/miniflux-admin-credentials.age new file mode 100644 index 0000000..7efca8c --- /dev/null +++ b/secrets/miniflux-admin-credentials.age @@ -0,0 +1,9 @@ +age-encryption.org/v1 +-> ssh-ed25519 jUOjpw HIvtQ2CaS+Ptl06tKVCwMzoi4UZm0GcNO+dJJjGZm3g +JZ68fxpbY55B2xMG+QG3yNYMMQgBxtTVMtHoXOqUlrQ +-> ssh-ed25519 Otklkw kUySbDgMFgWVEwL7rXs15FDISicEMH06qXIxudO/2jY +VbVX2/4wYojcWm/GKnZAP3uxQygcm6BcNO+iphqIos8 +-> o>]-grease d%oS;Ov l + +--- /LWxjPTlr/au9B1Kn6+apBZnTROxCqs8WKmtPINbDko +t/0c엝#Nߦ@\3i,53Avmrw*ҵ;$taMgƵa \ No newline at end of file diff --git a/secrets/pruflas-backup-passphrase.age b/secrets/pruflas-backup-passphrase.age index 482c190..8762e91 100644 --- a/secrets/pruflas-backup-passphrase.age +++ b/secrets/pruflas-backup-passphrase.age @@ -1,9 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 IXCPDQ VpRlsUErxZEZErq6I00VT68UmldZxwvNUNThtyHk018 -P73fCgVg9K9ZFdvl3Zrmm1GGcTlDLi5mfsEcHxCbcJk --> ssh-ed25519 Otklkw p06KPkqvFXvB07/yXkZmSzmzZASA2IJpNCY3hKqnUVo -e6O2NH4KVtqPQfew4++pprbcHANsvemybeqB9SEhEYI --> q%f1-grease dRH3(# Y)tQV [: \xNgmi4+ -QKbFPHhDVSUTqidH0FrlhCMqoKT/ySgPXSAMVEQYVl3aQbBvX6/4nUac ---- 8bt7MoQ9fprGESqngxXUiOdQvCdssgoiF4rUKj6BeS4 -qivUu5˰Ѣ+nlj2x49!0O~%t \ No newline at end of file +-> ssh-ed25519 IXCPDQ VbUG0IRip4izfPy6N+F2pqf6x4I+1sNCHBoXIFkeDgc +6GpwDE1gyZ0ZY1xwxXevfaKbBgxf3ejl5u7tAQy1po8 +-> ssh-ed25519 Otklkw Z5ijymE5Hxf5swuOk3ZMDnnCY58AJDW72Xvtm6PNSRQ +WfNQD1CQFjddq2HVFzVucYMggZpMFLFrIGhL5iVHFFU +-> 81Dzfax-grease zDYB +O0b1HCDGNbuzc8FB0dmmWCGsKn+XaJ0Evs6Fk/fUqnznZ3q0X5ROyNNvMaLhuW3c +V/q2AhaXNAnTpTr8/v+e +--- kkf90OQdUMEyJPyQNOVoQauX3RceUvD6eawbr4rYrow +Q|wWV G+*X['DPW3RX=SIE P U \ No newline at end of file diff --git a/secrets/pruflas-backup-ssh-key.age b/secrets/pruflas-backup-ssh-key.age index d8326b0e8e643a88d364b8622d3fe26431f76537..0d48b910e133ed6668737cec86ec46fe1ed99c3d 100644 GIT binary patch delta 809 zcmaFCc7kn!PQ7bZn1{1vo`G*vs%c)RQF>lPwo`$phlN{!yG5c$kXf#mNmP-siMw%j zHdj?tdS!O7sjFL(Wr2%jg-K*qda-d)ex*l>pHp5&c%{E_X;N5~rKMp+B$uw8LUD11 zZfc5=si~o*f`3VNPIkFMp^LU*g;S7=iG`z6K%P&&YkgR1YH(^ng>h(pMy`L9Uyf_3 zv#DWVN@|q_SEP1khHuYpfcVx*&&c}a)` z$hx|^G#e+S(hS}7qSVCVR0U^~DuuN40EHTbfC5#eT&~KBM8}|%F#k-qoV=>M5T|fs zlQggTGGp)TsKmmOyim)MSX^cMOmP+@+rgTcRIKEa!;>YWAQF0f=fB)>aouxa$K?3a8&h;sPAoLAe*f{x`KebJo%STzEso!5 z>eRz|+~?rMO=}n@{Skd){bbXUfNg@`O$%-ALLGO?bBD{NnpC-e(DtW G%V_}bR##R4 delta 841 zcmX@X_JVDKPJMAed5ED)ep*z7UzE3-aX?6rVMa!hM@o`wW=5`dzE4DXRDff6S-D|G zHdlseW{7rvS(H(FS#h~*R7HwOP*i@BySsCFP*P-7nzvI@W|c{1en_yTBbTn7LUD11 zZfc5=si~o*f`3VNPIkFMX_axZt5acda;`^aYIs>hP<=$IM`>Y3aClL^rFlhpkxNcl zhPi%}L12Y1mv(waQeL1}V40aokYARQNtHoFv5`fTdx)1uxM7NOMPQ(jmx+Isg;9Do z$htgj-Snc=#Nt#1r+AqT))w9Q{Bi zze=C_(v+-F!!+O2fDVlTr` zZDSLEOOvuF6Elk(=Zq4cw2&lkv%tiPyu?Dog7Uy9w=ma|AhS$A(+FpuEG{lxU0nr# zQ?7-|!0W9G@sxXRop_=afLMr&ohk3t1#= zJ9RJ6k>OAGtt+Z;w;VNP)-CGrT{+dgSEMlXoKZyW-6ye&rfps#%jxtt?RQbSP}2Ss zZN7JAwtCE0<(ayf-KL3dkgQQi4mU_oo?528?lfDo+M-}TPu8xgY+Lu491ag>8zfyY zW1py7&laEEx_!c@7Y_vv{%L#29PhRIy~M%N$CAEx7sO>qH%1bX-(+ ze$jO0>L;0h_n+JHYdKB0@%6?{eXfpUekno6k4{)M1S{R_7n+fTK-Et!;|+W+17o1N^T-PMc%Dgte+UAf^ujM)@oX1JXE(`Vb? zt!{9#7q1^@HX3jEW}!NL jTlB_hpQe=C?tPkgPx_{{*KLtqZ|ZL|EL?unRY3p%{ijbe diff --git a/secrets/pruflas-wg-hydra-key.age b/secrets/pruflas-wg-hydra-key.age index bd05039..48f69c7 100644 --- a/secrets/pruflas-wg-hydra-key.age +++ b/secrets/pruflas-wg-hydra-key.age @@ -1,9 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 IXCPDQ FRY6uw3eRrqUYZcnick1yxcSyEHuWkM6TMkOWPFuq0I -GLZMQFHoi4eJfbxz8kqECoj7ju0+scyNgWyILwGuJGw --> ssh-ed25519 Otklkw nznkiropYOdg3MMMEXmRn7GKkb4GycoNtKqsWwhGF3Q -77AEvdNpqQrppOm4ZQJAM4WPXtE+ekAufBSAMBO9oYY --> 26-grease Z Sz rY0V d\j0aR[ -f+yb ---- fluVV/qz+D6+MaIbIvzWCDWEhWHjC1TmgsD4FweilGQ -"S-p&YHfSHU9(}dncU$/y&U0v##!=Iad l \ No newline at end of file +-> ssh-ed25519 IXCPDQ uawIdwF9OtTw/T+fxwxkqdCRq64HL1UeMQnWK0u+Z3g +zEKpu/bdSapYM0piNoqiLNuUit1exx6ZIiXmsEDX8CE +-> ssh-ed25519 Otklkw ilkLObEIp+/4VfZM8Xt927xh6ZF/dBF+PInbyi6RZC4 +9t65163vGEnbApN4OQ639JNLrwEQHDH0nikou3jHlnc +-> 0FJN$-grease X!M kI~E|gX +mGoZVxbAOLq5LXGj9hPjMNLJxUZK4jpYa/wsyiVgkxTm09AUN3tmlYFjhDClpRfT +Id1zRQ1+ +--- slPVZ1Tqz9Vr2drSyuTarmm0Et9FvjAjsXvR2DSGRPk +E–;1ȉVJ lj@jA6v9ܷ0앯uYWh\yj}`# \ No newline at end of file diff --git a/secrets/pruflas-wg0-key.age b/secrets/pruflas-wg0-key.age index fdefc94..09d3f43 100644 --- a/secrets/pruflas-wg0-key.age +++ b/secrets/pruflas-wg0-key.age @@ -1,9 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 IXCPDQ yZsU7q89HVxP6Ldup2noEaGy5+SzFzuMtA4/+4mQfUU -w1cM4NXL+M9RjRjuYswEWYhtiWPgjlJEdwm9wQ9GF5Q --> ssh-ed25519 Otklkw O8jQnBDmaBnKLHU4nAIeRwkXE3ovdw7Y6vmZcmwqpUc -rM5wbfCSQhA0wxfRPVLB7dVl8L8aiB9eWhTX/ARV1YE --> pJ-grease ~4C{og l_ -pXTBa1xB/KJU5w ---- +w4Zc/+fVRky0Nzu0R9cc1MKAOgig1swtCLDrb6M4WM -_ LJ   pB$fӒxw}A6ޤ6P-{+E[FaW,…l& \ No newline at end of file +-> ssh-ed25519 IXCPDQ Qg6xQfJx/eBP+UkFRGoH/GJf4z8/DN4YVVZm58woLH4 +0VRw46oFMdPXyZZfuWSfWAwcprKKUj/O+8pURvrRdYg +-> ssh-ed25519 Otklkw y0cWlk4UO1NmKfTOVJF4z6QcKO96sLnw3NuuCNEZzC4 +3bvuqHug5Rsi69tM1kUnEDIZjJLsbqKt9UsEsQ36Xg4 +-> /-grease 5B 9m!v/n_ +Ye655SZ1lLXBsz3ST95H7SqG3+CYNpiF/X5jm8BoTkATh25f6011oYyzfja8DI9V +bDPP/4qtq1IaNtOarW4 +--- SF8+5srzcd3gzC0/pCC90QFIAyfX98B33/Vu6xAFVok +8Hފ3 ژ:?ߎ"6̔hgh-m4ĎXK`"Ù3mNY 'l\H$E \ No newline at end of file diff --git a/secrets/pruflas-wg0-preshared-key.age b/secrets/pruflas-wg0-preshared-key.age index 2756e64..37749a7 100644 --- a/secrets/pruflas-wg0-preshared-key.age +++ b/secrets/pruflas-wg0-preshared-key.age @@ -1,10 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 IXCPDQ Q0ETN6DFshfo+YouSf/YWX7u8otnnAqZr/Y7qxCRiTI -5LVB4bzpysObZJkmJJw2kgE57lZKs2XA8BVSwS7y/VM --> ssh-ed25519 Otklkw Lgo+x/ODCP6e3SHg2rZVNNLZkHCCT7YMC7MT0Fa4dHc -bX+Bja0SeGBzNQS3vUGj+GVDAYVTgyGQtPw5I0DWPdU --> 7&'U\;\-grease ot 7f'PU3CA -O2UHtKXSTN5TrfVh7ROQ8x9YLynOFvrxK+1kSW42hGbTstOdhBAlNfKMdiIM4Itn -k7Jshx6UTqa8dF8QIw2cme0jFkF8JUioj7uQuusGBG/WZg ---- Wau438nNnP4srJ16gRGC/9jUdCB6TjBgxc2kZVRsvn0 -fہm7\VhMem^?EkfP7hu]n+n.> ssh-ed25519 IXCPDQ 26Tx0J994O7tNFH/Du/0+aXIm2Piv/E3XR+3S6zi53E +/gQsKKxvXxGZ3Ij2SDlDwVQ7l+dP49OSXjGksd4jxs4 +-> ssh-ed25519 Otklkw TDSrNWf7714IaGoiCWVeUkzRvlL5GY6jPXdRFTEVkQY +IXWZf+V/3l1Z96pkepS7e26YAGxA5tXczBT19Ate0Qc +-> B2G_Mqi-grease C(c0D U|eF%E NI[cL Hcv>G;E; +tn4gxjXc36nwxhH/+27mr75yL/bEMtrzycrNseEDBa/spBI0zKX6Kaqvo002kJ0O +ZoBuqZtD0C7aSFuJnThgvEdoezY4+poRGc7qs9eM +--- 5nN5k3/r28YT65sq5yG32gU/l9C0Edq1LeBt+DTWvOY +h0u&b݅ 4ipq&A(YQ~Lܻ'E#) +O[}IܠO@ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index d10ec43..b236900 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -17,6 +17,7 @@ in "pruflas-wg0-preshared-key.age".publicKeys = [ systems.pruflas dadada ]; "pruflas-wg-hydra-key.age".publicKeys = [ systems.pruflas dadada ]; "hydra-github-authorization.age".publicKeys = [ systems.pruflas dadada ]; + "miniflux-admin-credentials.age".publicKeys = [ systems.surgat dadada ]; } // backupSecrets "gorgon" // backupSecrets "ifrit" // diff --git a/secrets/surgat-backup-passphrase.age b/secrets/surgat-backup-passphrase.age index b2ce621..420726b 100644 --- a/secrets/surgat-backup-passphrase.age +++ b/secrets/surgat-backup-passphrase.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 jUOjpw ikxbgvfWvYiUFTLNy5xUrKC8s1kgan3QIrETluUkmGU -Y5LQz7aPC4g88U0MkVAoir5CKWpekwJEVZJwdDfW4wk --> ssh-ed25519 Otklkw QBxsdqftDsU5+DEPH0zj3WSidosaoA6IepyNK+zw/mc -fbf7lsPi+AIcRBWwe82ZUlmXHsEbN58iV6/jjk7XIcQ --> qY<-grease A zw lCw -FJORgHmIMl1Lz71zMvlrCcSTfGb5QEwl6gv0Z3tMurt6gIGiXIs ---- DmTEAWa//clLZyqQlAF9mi7ypBdmhsNC/h9ptJc8m2I -|1 ͝%Hqyŝ"PZĶ[-깄_]y (Y \ No newline at end of file +-> ssh-ed25519 jUOjpw u4ifSfdgxQsYbHtedN+O6YYvTAcOfNgUdI9k6GwJ424 +iFE/eNTbfRhDvAZhfbEcqE8HwgWaaymw4SvoMDdjoCo +-> ssh-ed25519 Otklkw NSp+/vP+bTKUBhuqOO8+0fSpVZWybLCj55BXcKXcsCo +4nsPRCiW7jsPxdONrfYc+2Nn7IshzIanAJx8z7hGCCU +-> %)-grease ER#$IBufm=m*YGtLiQAL%ZUrtbQSy5qBB$uw8LUD11 zZfc5=si~o*f`3VNPIkFMdZd1MYJ^X6m`PoBq6|;dz;LIC&>{nq z5a*P7&&u%doJ_C6a^HZ6+{zT~QcLZsY;RA)?9iy9GRpv8BM-k&&k{4AvS2^13Payq zcdzgyPe*OHFxMPoZMOn_|AG>4gHX39m*8Myr(&0)$n?Zei@c1Ge9NQ^k4RrGU0q!T z6aN4w0?ik!k+GYfrRuFYFLlRtHw zTXxub`E_otoBgIjjN0E9DX)*2-M^?n(T|riy?3|8qR_)xVGsB3ayAGo+x5nhJ7I~t zVWevC`Gt(%?30h^d@K1L>Um`4x-H8sPaY1O6uxi&0p?3*EPg8Q;jwvVlWG}gr2;kdG?@@c-_C7xcqujijCI`WinebnJV z{;$6or}NC%k+i+$-pk+H!;@MaLVtM9nNYgpuKnin^rJBj^|y0O7~6iv&o$uEIHHkX zuz}CA{K)j0S&b`Vw6C39+jioQ`<@-~PA~T`IPbJdc$6)_cW&tEcMFW3Y2CbF#C81Y z%H>H3-x)Z+Ge3>Hvpx0KwJ)1Gi@sJ&_Fu1)EUEq>HnJu^Z2iM3qhC?0`l`EH{@>ft z=Ke8WQX}Qr^B>EjveiF3$Gcfs#5Qs)Vz?!wU3l)G`RAP0EVcB=En@esuU6w^53K!Y ns`!z6>XY=&wf+)ko~BjT9!*wud(C%2x_9D1qvaF7pScMDECgBZ delta 777 zcmaFKwt{VfPJOOVv88r|xp$(WWk6oJiE*)WerZavWr#s&mVaJiO0s8VzIKLrMM_#$ zGM8nkZ-sk$d0>8id1|`3epFUQSY=UKeuzb`Q>lfeo43AGUZGcNajIWhHkYoQLUD11 zZfc5=si~o*f`3VNPIkG1QB*);P`GD!SGs3XMrf8rRb_fqxMjMFf0BMsrL$$Ro2h=fUy{CslWRswwr6=|m~SB1 zx~g2=^rF`_im1`*MW}EiR+Tu%ytOfaH?Gv~r82ii`qhr!=Do zZ})l=v#6llf@Jp!?Fv&fZA;gD!=UV9Prs4~50k*maxPt6U4~xb< zgRsPs^c0`m%8*K5%SbPu>@uecmr(!Aywc#Ta;{mwGE{$`j$56@XV7Yzu zYVYqH{d?I-MW{2jNhJtO{T3;*{#(N_K>ozL6O zeqNLRhiw7(^gq7uwL4Dut#Wz z_ilU(xox(n+>2S^IJb?4o}i}a;+b-*-R5<)#pnyp;5=Jt(N-_^<@yaZO~!Vgi<}G8 zc62Z|Rn2PbU44jsdO**NC9czSpC{_Ro~5S2v@?S5cX@Tz>bVt1ont@7+=^$8Te8)~ zUN8P?ig3D+;9C9w*}97syw47qHX1JfmT0NBTtBMrXy4f%Jvz_V+zC15!LRdT^=;WQ X;WdKdvhU_E-)6RU`OKELOfA0wkb^!O