From cbec98ecf619c5c297b7d0cca8fef800a48475a8 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 1 Feb 2022 13:33:34 +0100 Subject: [PATCH] fix and clean out webserver --- .../versions.tmpl.nix | 20 ------------------ nix/os/modules/ddclient-ovh.nix | 2 +- nix/variables/passwords.crypt.nix | Bin 1770 -> 1799 bytes 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/nix/os/devices/srv0.home-ch.stefanjunker.de/versions.tmpl.nix b/nix/os/devices/srv0.home-ch.stefanjunker.de/versions.tmpl.nix index 54e205e..7f0ecc6 100644 --- a/nix/os/devices/srv0.home-ch.stefanjunker.de/versions.tmpl.nix +++ b/nix/os/devices/srv0.home-ch.stefanjunker.de/versions.tmpl.nix @@ -9,26 +9,6 @@ in { inherit nixpkgs; "channels-nixos-stable" = nixpkgs; - "channels-nixos-21.05" = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-21.05"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>"; - }; - "channels-nixos-20.03" = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-20.03"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.03 | awk '{ print $1 }' | tr -d '\n' -%>"; - }; - "channels-nixos-19.09" = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-19.09"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-19.09 | awk '{ print $1 }' | tr -d '\n' -%>"; - }; - "channels-nixos-unstable" = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-unstable"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-unstable | awk '{ print $1 }' | tr -d '\n' -%>"; - }; "nixpkgs-master" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; diff --git a/nix/os/modules/ddclient-ovh.nix b/nix/os/modules/ddclient-ovh.nix index add5428..9f54b79 100644 --- a/nix/os/modules/ddclient-ovh.nix +++ b/nix/os/modules/ddclient-ovh.nix @@ -25,7 +25,7 @@ in { domains = [ cfg.domain ]; use = "web"; inherit (passwords.dyndns.${cfg.domain}) username; - passwordFile = builtins.toFile "" passwords.dyndns.${cfg.domain}.password; + passwordFile = builtins.toFile passwords.dyndns._filename passwords.dyndns.${cfg.domain}.password; }; }; } diff --git a/nix/variables/passwords.crypt.nix b/nix/variables/passwords.crypt.nix index d5c101b45b51acead38c8a365c031a35c5e4dbb3..96617a15599aa49ee65e8c901ba3389f11f83a49 100644 GIT binary patch literal 1799 zcmZQ@_Y83kiVO&0m}PIIfB9o)w1W{x+XBy99!@{?m9*sUKK$b`DPc;&@`Hx=^tbw* znfF)1?T(m5eBcbmdrQ?D?N0u$?hP-^NvQYR^p8<#W$VhAi&6sV>>C0nJo?qnu)k5; zEv=%oo%hFwDTcon^3IZTJ(0iT7Wa*+mITv1PZ~^{8uA@~iuVMmBu*5bW>9E#=*S11 zngfYyyNdj0pYwVV{w~4c?9(Mo9nF{)C?wa$brnoPby5_O&@xs_&pL@@I>HijX^3~lb)3^SbFz=bB6?=ZDWt_+6 zlReW;OtZ<>kgqfsirTdOY`ELcBu=aO*>9>Z#s1XY=fCvX)EA8G3!_6KRAoFR%~mR@cXg_c~J$m!yKVxy}<%YX6J z0(_gZ--yngA+vm=R(j_Ii={T_bN1b7P!@|mJN;0(C-amb@-&UVbt>+?2{QvNuW)n=5WE1t1$xM|kiQD`7aD9{o z|KcPU!LE+~ualhPr%3s?Sp1Hkv*OtMw!MgDhB z!n$%N$N5RWuV~&07G1yL=E*vRR-uDOZY_)xJ!h%WERu8hBRB`{AzQuicFa{EDfsZdcC@aq4AGI)A7A(+yj(%Xd%h zx6UnMm_r`s{(H zx=b$S2;SYWBl(_p{)gwuAgGToT<^bdP$?9Uf!XN4<1H7h@Ene zYx4Vlh12IB+3(f6{9ts(*`f_g%N=!QJPKe6Je@te>g19aKNih0IR2dJ%z`tQcb|;d z$EI=c{fd^~%HhQ`%QOv6bZ+vOGm*AADl?1a?|PHX68~>Y)OgN0?@OP zZ%;kDGB!1J-pniCx2*oixNzwN&bY`O8j~KXJT14I!0*_qeOBY)oEd7ya@k+rI+sjX z(PeEghi%6FB|X}Pf0XN_=D%szeDw9p_SL4#we51gRypgP=rxXy{Ql}$|Jz;Cq{jJx`eaqQ+`;seVdN#(!z82fst+6OV_MOyz*JzIG;xdJr z$0`G6s~wBbHfK*c{^51BXhz@UdwM}z602*aX6?OyeoCa)$CB=ZW5VwGFZt!K_Om$X z&OCDcRmYOciHh+b?tND7pTQLJ*&(&enQ@__7U!|KTJ!4cog-OiwmW`;+u02c f5{sO3cKujf-`5;G>#g#SM~(S8jJIcS@M!=5bqjB; literal 1770 zcmZQ@_Y83kiVO&0*mG`{xzP?;d8h9)c#hw$`kq~v9xk$IhXq$${YBBulRq!~Jzw9} zUhVypT8(!v+*7$%$L_ep;CoAj+4uWr`E6%fQdah}M;+0hSHAP15QZ(m-qu}GrMZheZ<^iPbP_gH0RX724iRw4g@3_@&^gTO8jKSs94*`({ zJu{!j21@Zsaqn6Z;WjToZ}LC=IUUQJg>8#@s+9g%?OwfnQ~OHW^<-&x=y#ENq+T+K~1jl*4e zVA8dR=Rc%!6e_eR?Cnd8{&24FqtW?w+{XIbZ+=M1DM7 z7ub7p!H_ zlud?^jri=tf>%Ob{rcY5)WNgr^zK8_KYsr1yBBi6d&|zpJM+I^dYAAsncMsAyi2P# z?@Qg{b|U=l0gL}LPdm=r^>5w#Cu!-=+@3C;J8#?Wl{&qL>dJR-n7!@J_YJo4A_nKY z*6d09r0=}wBwODOwK*yLp=T!Cd%M7AwbUHz_%-d}xlbAlstaCL&67%6dGoW%(M1JS z1x_q;_r>i#RuS@i(Xal$M+DNIr0jJ1pM6)ihA-o-W3Sc6*N%k=W_@*k(oFuTPuEO4 z9bW_j2md5$HjB}cQSDm`%cR~8A0!F6h96L)xB0Gd@{ME^MIfA~-4^xui@zs`PE{ngpJ*23%#`${LlC|)O>2Pb2M z{zcqdT)g^T@z>zF8&0#8o$#CT_2ls@$^X`d*cCs%Y?=5()J88YOW)8eOlN!fiq)DG z-%~ryG~Vo(&$qnr@T3T*V1{MfKLj28V&-~AJ=5%4?=!_+@qclbql%{DpYuW`Pwf|W z@5}I*G=0?sv%oWV?=1f5xzyxh_LVJ%7xB+ED3Re|XPh)+mZYlxQZHG9(=WeQKXlps zqaf>HzhIBD+O1_5PRqP`8@EZd#p6eIC97#jF>B@wt%A+B^grG{t2bRbpmLhTzWuYS zYIlkyi|k`rwOil($(CGhNmMQG__K8ShIeIeP9z7% z7paOJbLY5l&UhU*Z<6A9-dYo6X4Q~ycAarvl3DAYNEZK`EEeM@ zs((YAI=vO*&R&V$>fV0hyo#gX()%6W%eb3NKR(U9SHZ9;HLs@N8}q8r8ET*BcR%12 zxDdMhmf4Xg-&x$7Ue7&HCGD2Larc+-$8P58I0G-a*DVJ>rm`%UD1Bpn?Oo55Yb|cS z)$RS~7xZSWHJ8(2o&WUJk4s0AN~&r-MBPEYR>wDoFlAwNYnZ~Ok6yHI=N2+&O1n@1|4jM*_=|l8)b4Bk2FZ$TB)q zaK883HtxrT2~RJ(7TPN~E!OpZTVdg_(l0E5$3ik=hSRJzxq?`q(3YEeT|I9ruO{Sg zXYb|R_Hc9jxs<~#ik1fjNzhSZCLqHS2H2mInOhWK`r`~ijz~U<;~b5%TDWCKhrnbx$ErCcQHOv zMeO!3_ipr*