From f64d8bd393ceb296934c041fe046a57d34955965 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 3 May 2023 04:01:36 +0000 Subject: [PATCH] Update drone --- hosts/linode/git.nix | 2 +- secrets/drone.age | Bin 2545 -> 4620 bytes secrets/secrets.nix | 13 ++++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hosts/linode/git.nix b/hosts/linode/git.nix index ec1eb06..01f484e 100644 --- a/hosts/linode/git.nix +++ b/hosts/linode/git.nix @@ -99,7 +99,7 @@ in { "/run/agenix/drone" ]; extraOptions = [ "--pull=newer" ]; - image = "drone/drone:2.13"; + image = "drone/drone:2.17"; ports = [ "${ciPort}:80" ]; volumes = [ "${droneDir}:/data" ]; }; diff --git a/secrets/drone.age b/secrets/drone.age index 5fb5c5e85c12b593b84a4d6dc5a2e38abc1e13e4..9f28a0830c1da768a79169cc58870048af527a7a 100644 GIT binary patch literal 4620 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 literal 2545 zcmYk7Tj)Fm9mOT+;z&dwlKJxgOIiNczjNE&*-21$t~)b3GduSSg3fj4y0bg?nZ&n* zB74!y${>g$fEmQeC&{G+_WF%9o{30VsH`G^x*FZy!IWz9MC#qab3zmeA zP1ok7Cwf>wpNne5A|1VWBMYocxHz6sj401I-$RmxYVBz>_M*1x=OGTIPDh7wb7{=D zi@boYuOxSs>6{8*U)x9u?9D?R8e6i9U~((2p;Kd+^vXvl39P$@@kVu#7Xw1nHG>z2 ztBZ`)hZwOGhFd`mRRX*Vjd_92=TKO8tz|-KvA&#rZwj?ewI}GHF|-VpA-|hd(e266 zzNC1O4I;iu^%x5Pj_%rus+XET$c}h9@icxE$xP{LSkwu+3MR8DPeU!Up5f3_f9RD8 zbsB+AmTU!*YhXv_KGm36X?6+Y)f5CS0-skUyO7hCFX?mL(F4C9CqLb>1YwsQMF(EA z)k7y}r>z34Y)h(bWPi}bQ=OIB(QxJtZsDV~R87cOASxOcpn+N5$Xh}<0Hq3L!q=nUXzlkem<7VjuI^%)gt6htp%~&gXR@pXX zyl{6wuBV9R6R;r-i*dpNq0S)Ggm$xY)xP7itf;BXM#vaLoARk$>~Y_7^kd^(a8sdR z4+v+r#*#~VxGO>2|a#8k+nBW2Fur8M~$RZ)UttmW%&j-YH zY?3QEIqoGr5aV382#tZe$~;a)y+d11-G>^K3S(TsK;~{dHc7J#tAhffMAwQLLRG6m zJ_$=G!ZIVHQc=myON6`#41%Pjv{f>HcAz#kD**^)3U+!(RvmUVi|S@0Er&g2^vq0H z+ak1~J<6^~Y*VMFYL3?uY)8ew2GM@Ut=W7L1HOKVTubE;zn0Dmu)@HG2wgc~vvb8R zP?L$S+UteWvWd6pL|DtgGbFg2aMCGc-9Q0B68KXt#6~64ga92UQ(whkW40j&cC?I) z>YQI}0mkyP-a-AuR(=JiAS0NJ1QpcB!9;U&3zM>OGH1uAvQ@Ko95$8_u zX2F(PjGB1P6l5#~>xitQ4oM>;JSRZIk_t>#vDcy(S&fBabir2D3B-;0_z{Jm_JyIauh3#gWj9ND9YOMkXL_oJMBo7}(+V z-M|F)DG;ZOiaF;(`Gq1g)DGC|C1#H}5?u}*l*!Bd%EY?BFiPQBsT2D}fN(hBbw;_| zd(v1`)X3Lhsa2~ekow36awtBcSlrlxwct%-ia8ApiLF6n5yykonhRQp-j@MxIwT_- zOULhLz8*78>^Ivp zY6ljZYJjew;`=HPv<4T70ilHaLM5-L3L>0gZk*O%7ZYc6IzJ`n$li2X+3qs2o_9=T zAl+d>K%IkGC~(l4`I7Nk>ws<}Wwc<>GLQS{5bY9}IT`V^QZjB-WXC7fwA~kOCv4?F zsg};RBcK}SPD+5CJRDDRzN6PplC0B?6OdKt;`{S*n%5M)I|v&lF~Q8Hl!-r+rISV% zbk`dvbqOd78rQ58M+2Q0L;6y0KB4 zeD6KyjH|3`k_?mqGRxs&U6Lrdt@_;4YtJXJ-3Gst2Ufd%HufhWP&+a;5l`s zej}G=F;ANTD2w>eQ05_OOlscJ9_SQ|C%O^V--4l4V&&w?XH9;1Y4= zMuk1ht3y_{>&$39p`qNB$+`m&zBe7ahYnx)_3O9nKk(wmKlSEpJpTHt@Qr*Yz4FK3 zUH|NJkDczhyZP&#|FLep>j!tQ{&mM5iwLf8s;mBp-Jl{LyP)ho5{-d++wQUV0&V{NG==fq(Q5Z&bJZ?B!>F_@%eM z_>!wX^V83K`_|t-4E*wMKl$>z&p+_1XWsF?^}wU?H}1GE{$4(P`k}kt`Oa;m{|_#C J*LeBI{{?f8X)*u+ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 75c25a4..dba5232 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,18 +5,21 @@ let user = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDLQRq55JKqLifX+31kEXyuoB8gfM+5thAlgR7XLPvvdu6g2a5cCWyozQ1I2oGbPRfJtzcJ5ifM7Ii2PuqAj3MdYFLHBEDOhIpBBWme9Ts2YB9HJ4NorBvB4zEfJd0Q7k2MmylyeBOwdwGz3bVqPRDcJbxWFMDHqr33FEs6SXdfyAQ5SvhWGARI84qz8zUUdOp6M4e3aIGO3cx1gA+YzYQ4FbUtL8+m1NFO8VoNFMZBMf5q0iF/SgEu5bmGWUCePia6DvfeBFQ2/y4Y7WmOj980WE+JmFTkIvmGruMYeGI8FuDQ2JIIIcehddy9bQbPF4VlGnTFsHqJYVRUUWc+vH1cPNMn01oB8s27ogf9e1lyhIN+cZOgp/jDt4eXcO4Wr04uwj7CI6m+d8iMQOa5Jv0hmNgqqiwOMVBlKeo0FCxlovzwvn/Lia9WZ74JqM6JwLCD8SZ0oFgiSIHOTHrQhr7iaCmj7X/0ey7VR8FnCrpeAJpG+ELTfWGshF1d9QR2zW7u4EsXTDLiuOmdJ+/KxwMvjMcWdlg2+Qch6SwulTQRxWaED2IWJo+YiAql8eaiVXu/eZJGLoiskGFZnONoLrzIT4pSjakPlrSpn/M/GkP1pDpaMkr24OhJsGpJNEU3F1ZcOMqy2iJzIxlPmU8Xg0I/OrnbJplpaXeRCqnmouJUJhWkaPzawaVyW7dtvprLWcpQtUgTRet18WLyOrLKlq1jwvNRMTPKUJ2IFJMpk2pNEP6bdiUxyMa4vrRIEU2p1zsYSUJpCRLtccZ/i/+yAqwnTA2L5TdAORi9nD2uCdM/Ljz52V3A14QapS6oqcoWx2soWKgnsbVXoG8DxmUTpll77Ze9t7Y5216SMInWuOu0vstP8ZcgFmWsiBgIYIuLA58abWHMxgD251phYidua6R3Gtkf8J/kYqTR1P6eJF1bt5efEg7FD2aL1QQZsYJo3CRNz7yVe1XqMdPbfe2mFXQVF9TDX5x6r9Ir3d0KiEmTlBdByz8nSyPJ8IQxC58NT4LNVQs3p2XH2Zcf6B4JOBSmV4NNBnLseFobsxniWjkWwZigED/D2iu3OXuuhmskCbw0hKy2rBcKffaSNMioVqYIiYNfKlMlSvAacQKqc/1HCpqgX8PwAcSgNSLy4K7/gIrTHmjY+g+CH7onzatWzkLo+0vsZRa/D/qwhhK2CU2FeU07mhnWxWuzqpJuqVaAwDTaEforK7nQUtAOFAZZP6qGhIoqsynYt4THb+QORb3QYfaP0PVgQwXfVU5Q8eUQFZ8A+siPtOASFjDumsIbseB5VzkF+UhvdseJwkX2+4pVFu8eHFDyvArYsHeGK6fBcQGJFQc2jSs6doIP9HD9IO2R ghelling@unknown38BAF87CD102"; linode_user = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDUd5LQVl/spIfJ3mh/MERlCfSIHCh3jXnaNVnyHY2AVD2dFVgFX+Q+1adA64plXqXHEQVb3q2EMzVW14QAMP9VJspnODgpyMHwpxp6ZNUsZIH83RN8kauVHgW2LRDCZ4DLRzbqaeDm92rntapoUB74Vjto00AE3gWyGQp/v6BeAUhqE0J2p6T6xDgsuyJ+Tzm2YEUozFW8w8LSGDgaoTKzjq0WVkAo9rNaxGLr/ez8P3SUHgb2VSUrL1qrHE99KL8rravOjP0aQmGGWu/MOjgvh7icQuqYlBF6MHfxeSd7/FZApVNKzEXD9TKBg5IaCOjHH2GHnxthSC0mcjKmF2EVAXuWYDARqxmtIfV/9YdeECEFxzB6X+t6b3RYxA0/oa5Zt70WH2LILmc3U5EfiRf88x4WcsdmbcsKQ74/julgg7vYlTlndBxvl8Nd1IKd6ZD3nJBMMMKrDOYbME5r6x2VTzm/RQkpp+SHarCMXxjukhguYY3Iz9CTO2hdGaQ/41ftlOhpb3I1Gai9GymTPFDt9n3JCEVyQ1+a97ELVr+Ky1L3hMewE8nqZFIoXUB2RFMu2pD9GggDO2e6bXdN3SIHLL/8amoDK62iYgVEp1XBkzHJ7U6hhIYbkFji0KK8A7Cwg8+gOKdovycJIAWndHjaDcLmWDlBktqHIRQvLMTzE9f935faTcrSTpnrCLK/pR3f7ir7HGpD8lUug8m7DfxhH3am1Fz7uY9iNI1GLctexC7espXq/xEA/+j7JRVVKbpIubXcmJjNlKs6jOx849SpdWvLlnJpqo1PIjxE9ZDa7zlPSLMTKGTuY0ekKvvbuaOhcOBuYg1RfbdN1QIX5ba86U7giFMZb7wGh7Pbsy0PhFgO7ANgNZy81RKp45G8ozHLnXCj/qhstqjcEgUICDkT/CGnNkreu023kqOaix0nELBLwWBVM/5iWmKQZnpiBhHHDNJ3Q6DsCkIUdfOWZNCIRwGDPuV8uMOEHJIemg25Z282QqWUIfWzGOO1f0ylVmhTQooZIfjhyGXxKa6AV+/tAXQtkF5B1Z8rB5A3pYYLDmnY1E007sWpvm2L/HKV7cWUX7bkuS+qBXZyHxEn+cc6YvalJbDi5/bE5kFQudZFgKInwFiMLhX/8BpbgBUv+6MvvCn79o9qnoOnkI36A9bEOdQKpjwPdg9tkVWr0RotXfP62tIAQsxS05J7yxprC5Uitf+Bhp+Hph0tS/hyxTbN1h30vfdABouvQpcqbgUlp6psyTT17efeNbGcs9l4gkg4HOGpmF60alA1+PBZ1l7ba6bglp+CZoeA5qsCTmMxT5yLaWcEck/8WR3NHQqkER5ZyH1204Kci35kNon69y1/ greg@linode"; + users = [ user linode_user ]; + + everyone = systems ++ users; in { # Demo of how to create it - "matrix.age".publicKeys = [ linode user ]; + "matrix.age".publicKeys = everyone; # At the point where you want to use it, put # age.secrets.matrix.file = ../../secrets/matrix.age; # Then you can reference the file at /run/agenix/matrix - "nextcloudadmin.age".publicKeys = [ linode user ]; + "nextcloudadmin.age".publicKeys = everyone; - "drone.age".publicKeys = [ linode user ]; + "drone.age".publicKeys = everyone; - "3proxy.age".publicKeys = [ macca2 user ]; + "3proxy.age".publicKeys = everyone; - "dendrite.age".publicKeys = [ linode linode_user ]; + "dendrite.age".publicKeys = everyone; }