import the regular way, fixing error: attribute 'age' missing

comment fediversity.eu option as its subdomains named after our services are used for production instances
08d109cc82/services/fediversity/sharedOptions.nix (L44)
2025-03-17 15:13:23 +01:00 · 2025-03-17 15:13:23 +01:00 · 2025-03-17 15:13:23 +01:00 · 2025-03-17 15:13:23 +01:00 · 2025-03-17 15:13:23 +01:00 · 2025-03-17 15:13:23 +01:00
8 changed files with 68 additions and 66 deletions
--- a/keys/systems/fedi201.pub
+++ b/keys/systems/fedi201.pub
@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKBpnV6zzgdJN5pjw2oWryneE6kZ5rQ343Ut4ed12Cm9 root@fedi201
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhSlUo7L/TjoAILfLv/BDxlBT+rGudh9VoK50Uiu2lZ root@fedi201
--- a/secrets/forgejo-database-password.age
+++ b/secrets/forgejo-database-password.age
@ -1,17 +1,18 @@
 age-encryption.org/v1
-> ssh-ed25519 Jpc21A JzLWMEH98I5/A8O55mKUMy5zo2kg3Qk8SfXnHvkjwT4
+-> ssh-ed25519 Jpc21A aY4iHQUrjmuTgBkIwG3vg8XBK458PWXpiZ5E/m/UHnU
-8f7zDHSp3AHoAQy0dVWMa1TurCBLnsHNtbNjaD++7ow
+VCuYTllN1tW5RzIigPiN+p/W5uI3Urh0J3IpLXDL1H4
-> ssh-ed25519 BAs8QA eCD3saYXdv1bjAoQghmyVqHjMBu/o2lWgu7grk1vgRs
+-> ssh-ed25519 BAs8QA pP6PTq+vp+fP1oOv3ep4dWspwANxj9DSS94t0a+1Q1o
-//pOnkzqQTK3xmeCjruo46ju2X136KEt6DpsegMouFQ
+tpqUnXqp/wmfXFMe2iXRRda+JmW5ZgypduKOS8meCJw
-> ssh-ed25519 ofQnlg ePjq7GmM36qaGxcJ0qnW8FdKDjwlXtFqOBK8OgWY3Co
+-> ssh-ed25519 ofQnlg om0geQk3YR3+WXsPdIC46wL02M57Qror6MD/PynrTAs
-gVmsDP9rMcQD/B6BpNhCn+avdgjhyyohNUXlatXpXo0
+Yj5xcXf203kW70SndVBBagh62yAn0T41lzg3ReD1kEs
-> ssh-ed25519 COspvA lrQB/NEmMUR2RWxfRzE2iTDkjMYsrIaiKn8thxZR+RA
+-> ssh-ed25519 COspvA bvBwdWb0kO89Myw3u2heNwd/4vN1+4tiWjNyoF3t+hM
-MU23Z28v+cNk2VxpAYaYoFb53js2Zr9/KAM9uMe6+EA
+eCX26mAJy8stuYrRijqicgODAlyKt3zjeZchCkBpfOI
-> ssh-ed25519 2XrTgw z1ixx5dYCNbgw6wWV45b4wn69X/5/4MzesTomWa4WB4
+-> ssh-ed25519 2XrTgw wQMvYCYmw4Iql/EmUSW5HG0fz4POn/VIZrMsL5vuUBc
-eNSlP6+nUW9rpsGyzqOEQ+7IVpGeU3UcZpyfB9XT2/4
+RaDLMF7OadInlWbQ70/5gpQ4tpwae8i74hu5Wftf6Yg
-> ssh-ed25519 1MUEqQ c6ps9RB6Dw9JtR0+4eB1NDx44uUes8YjLrY7RCpD0jg
+-> ssh-ed25519 1MUEqQ ygipOVN6+Z09bfMZFdHRT8Wx+H4Ml0YM0w0vrUANugA
-GwVRqR5t07ctbWhwH76T+SAe2Y6Vv1uY/AHkzd/gw/c
+XvtQMpD+iEpEKGwPVcq9mAftfaRlOJXTXUdcqyvVn9w
-> ssh-ed25519 Fa25Dw jTqtV2RWsXBH4zgWAYr9tBGC/BbXKBvr3uyL8IgmI1o
+-> ssh-ed25519 Fa25Dw qc7z4aL3dHjoOTdPBVm4q6V458BuTGLMekP5Hlk0bk0
-qBirnzIpi9hB61xwyS+5U6XBobAquEJrV3cleDtG8/4
+kZuabCaiH7DBhO8mDta8AXUxH65Cpm8u9P9ntw8A5pI
--- j/vJgDV+47UmKokdvztXntBIhCLEyUm2aYoGJ2WMKbU
+--- zpGb6Td6MdLKxE3mkK1a7JqBH77th6045mcdGIsNth0
-¢¹ŽÀi‹±ËQõf §¥ÐÅ·DN§àB"—ÍvsëB6PùQžorF‡<46>Å
+ÿr*"DQÏÛ-©·í½`ÀU¯…µŠ`ËÒ¹Æu{<7B>ªC<C2AA>]‹GZ(p
 Ü×Uf‰
--- a/secrets/forgejo-email-password.age
+++ b/secrets/forgejo-email-password.age
@ -1,17 +1,18 @@
 age-encryption.org/v1
-> ssh-ed25519 Jpc21A l6Xwv4JBlTeRTC7RgjxY9gDrCk96atMUH/62P+u55Qs
+-> ssh-ed25519 Jpc21A ExqTXUYWuoVsdKwuWzCD72NctIpGvAF4QknTU04he2M
-CrYsLZgDFAiR8up87lhGZqsbAEZtOXG+l5IzLh2uaqg
+rN48eYUwPJtTc/UBpB79FayC0W2UnrKdjFTdWKShtc0
-> ssh-ed25519 BAs8QA lgtmfoc4vKfRpI/XbIS258BMyIB4mTdquEx/Kxm5OTI
+-> ssh-ed25519 BAs8QA xODgENkmP/KjT6IGiMW3cBkdrY+o5rbAGywY7Fx99EY
-3gQL8Rnqc7JfqsRmKYU3rD0cWMKdnIeVXbY3eFM07RU
+DNAlVBdObTlgeVhKYtzPv46RCtn7zNm1aURWBOpBXEs
-> ssh-ed25519 ofQnlg 0vwuCrduMLjssA3CK3gfVPMSPYKO9cF7HH1JF/oJv18
+-> ssh-ed25519 ofQnlg cEM500igumTfcCWWCH55z22Pp8QqLcqmjTD5e1lp1T0
-2KrZgQmpvw/tNDJrDArinnbEjopkkmuG8s7t6klBXcQ
+oKBWnaFpaFiEGf51fPqObAkRfRE4gywjQrYGB9kygUs
-> ssh-ed25519 COspvA NT+/h2KsiZN2XbaWAlrTlDwyAPmHWrwgr6f0uhSbEGs
+-> ssh-ed25519 COspvA gQbazYgzv8oBeND0VtZ3P241kZM9klO2qysjkc20CFQ
-QpoAd+69VYrZwAC0LwDm1m/zfslVgzxpVFihQWDcqzE
+nW558CrEvtuUEpLo6EUeUTVK6EVUXbNZwP4+GLVVH3A
-> ssh-ed25519 2XrTgw QoJ/74FOqYFxHJYXJEkyzbGY0xptSjorNvnyUS1p6zk
+-> ssh-ed25519 2XrTgw QlyQRFaRkniJ4BrJEVEP5muS+POPdKSmpS5u4ORiRTc
-0sJ2F6IFuTrRvXO5ND1QL4CZ2lr1BAU3iQffC6Uc3h4
+/UeO72Y/U9aml3S2s9wE9HUIXPoR+6GDSXF+PT141Qg
-> ssh-ed25519 1MUEqQ xxgEUIhvWN/ZfRMGfu3fKQ+fWM5WSz8OexXPm6jaXDk
+-> ssh-ed25519 1MUEqQ oMz1Cq68FuE1jm63H2Rfr/WqhkCeJ2SQrVtk88FBYGo
-RXe0JMZ0sYMdQvrbi+zAs9F3d98ocRFnsSGUuUWccRk
+ou2ZRPuGTlLxsV/DhXoRUhqaQq9Ub+1ZdOcqqazrBZM
-> ssh-ed25519 Fa25Dw tw4sqQcO86Gh0FGUD+O3bJ+8OcaN5rm8R6qocXvDbRg
+-> ssh-ed25519 Fa25Dw USp87LMAo6HfD6gHdA+lrRlwHzKtMwXGjELImsQ7onk
-7hiWa4qznHTV45kvC7ucj7j7FbPrqYK5OcCcByrcSxg
+g8GvPArugT7KIdpgpfWjHFUNyXgL9rRuymQg/RIiQJw
--- kvZDYq5n/OXu7xe2Kf5vGN0zosl9fgH4CAf3K0Tq3U4
+--- 6oCFkdV4DmaxMe7lDoDSKgtCKySGqVqrbDv8aRa/h/o
-¤D!´Ój]2ï‹ÝƒT+•
ÃUó¬æcgÝoP”‰ ˆF.Þ¿_vbÕÓÔdª9
+»W)Eí¨{ä™b¹žÑrÛ›¶
 à3OVx)ö¶QéÈ¬6‰b¶¶O·O¸Ü—ÇÈ‘%Ë
--- a/secrets/forgejo-runner-token.age
+++ b/secrets/forgejo-runner-token.age
--- a/secrets/panel-secret-key.age
+++ b/secrets/panel-secret-key.age
@ -1,17 +1,17 @@
 age-encryption.org/v1
-> ssh-ed25519 Jpc21A fBhVzGFs61K63QtA8RdOuuGfHFjMe/Dp0M6TXGLGWDU
+-> ssh-ed25519 Jpc21A jzJ5wTSLBsJ0DxelUDsT7BxM9qc73hPsCvB/1R3qGC4
-qppnUZ+LQCXhuMCFMYv2D2CkmEfjb7mpmJufIeVjjaM
+5giHjKIjnBVmn4NAtGLSIgKQGts9kOc+EPS6AKugn1s
-> ssh-ed25519 BAs8QA PNicZCWLkbvM4ih77/F4z6FzHomL9EsJCuSCjbdRTwA
+-> ssh-ed25519 BAs8QA J/y7P+A4z1iETfzta1UBf2AnKOD5lFTuGRo7EjWF4Qw
-qIpTl/v7Xl08qBB//dFeW9qQiZg10YrYLnfyQrgDRfQ
+zUBV+byTPL2kbKS6ZCbu8mk9Lp/fq1iF2Sii0XHxB5I
-> ssh-ed25519 ofQnlg 9/vSN3V25ysXBOvS4UJQEzm0734zqO0gXjhgzX63tTs
+-> ssh-ed25519 ofQnlg w1RFmJnfOSpKu9tiVvPy3WdLVGO1vUdPW1exb+M7xEM
-AH9Q1lWr+RgICfW3h+D2SgCTFr+azI0x3J3eFnaz/XA
+jk6/yzZMJCvzW1/5T+DKze+PxduLcWDrBGcVN6k5Vfo
-> ssh-ed25519 COspvA IB1nWOMaVZVcvEog6UaqCak2fcKxIUN2yXvvRSTDxGw
+-> ssh-ed25519 COspvA DEBQL0y8GQpdib3WUkj1a/FVLVF8aMAZ77MdxLqJkVE
-Ti7JuBgU6phlI+oXfDDvx42dRu95kTwesRUKu4QsXZ4
+V96fUeVJD3v2/V1H5GLo5YIKlIU7fuyYBr7F48gzJ60
-> ssh-ed25519 2XrTgw 7S9ZhJvUFMw9tDCc0HvkRsRqjvmn47GFGVg/jkxIy1I
+-> ssh-ed25519 2XrTgw ixdrdSfgH9Ch1Y4aflWP1QG6khhKN8mD1jFyOXhDTyA
-cj27gqqihSZG3Jcab9h9FyNJ1J8FjlUiyVlDot+sbWQ
+Kd8QfZ1IqWqiaAY4C8+J/AE6vqIRNAZtU6jbIjRYvCA
-> ssh-ed25519 1MUEqQ l9mVTLD9rZXisBEz0sU2AdFNrJQ/+zuFTiIod5R/HCI
+-> ssh-ed25519 1MUEqQ Mwda57DHcYYsBJr0L6q9IcO4xyr6NvfTlXyRK/sfjWk
-2q3csSEvMW5vtzqGHYTtZ1nZ0J1vT23bjhuj9HTsdWk
+WX2CsIJBJL1Q9ZMsLzLS2s2L1b+7Mm0WXF+PqRVh1p4
-> ssh-ed25519 kXy85Q BCrDvkPZLvx2Kvgapa3BT+AmpS6Fa5kpkgBnRVso2BE
+-> ssh-ed25519 ChtTUw trZu9wftz3Hjd2xTKf8TYM9oLpNBcwQX47Pfi/cetjE
-ZBi+x/2ilJIzhzGipdZQJoGOjSqCuAttsqCDVFlYJ8Y
+5F1McxV1iLHyIVYdPDeR2twB5aq1fz9g/nrjAF5ys2w
--- iWtseKyfUMBkQTUl9QzwXXLQcodEJeZt1Wuj5sR18yY
+--- 7p/n8TyrrtmVay+dPSX+bdlEqzFByuWk/6FyKFKh758
-+2,ｴ	ﾟ恝Jrﾒｨ>ｱ<7F>z?ﾎi<EFBE8E><69>ｪ<EFBFBD>x<EFBFBD>0z<30>ﾔ智ﾒ劬呱^ｩﾈｺ食･濤礫+1｣ｧ<EFBDA3>
+I€BãUÕ3M:Æ¶,²<>‡¿?nª‹-{ü7Ðhý3²#7Œ§ãö'Ôg”~L&ƒ)˜=<3D>bB:9hËA¿TOSÄ
--- a/secrets/wiki-basicauth-htpasswd.age
+++ b/secrets/wiki-basicauth-htpasswd.age
@ -1,18 +1,18 @@
 age-encryption.org/v1
-> ssh-ed25519 Jpc21A BfHJN3vILbsfY91kEjSQ+STrn6vQfn83Fx3cBCNshRQ
+-> ssh-ed25519 Jpc21A vsNSibhHXdlRVArHkFqPy2vapvpo+lfs6QNESfZHk0c
-0O8GJYfF8WFS4Xsgj5v1cly4JP1MgSN40OgRdW/i0rA
+ArMZEQCONAIGQwyEh/QkJ3m5Bnru2/A1fQdJNtPraII
-> ssh-ed25519 BAs8QA Ue0NLMpmZDSTGvwZ8lhzes7pcmit9F6uwzeT4XhiwC0
+-> ssh-ed25519 BAs8QA 7vfPIUymPXpfX7vhUyNVqBmTllXgJ99gCSHOgWH66HA
-jsvvuOW344i8GR4B139SX0LwTqzKQEgBvsy8oRppqBU
+gaueu0eHyqY+VAkNIzPb/aLQ1VG13kSpth2tJfhK7sU
-> ssh-ed25519 ofQnlg 9iSMQeTJn1OUqTF+M2sHpp69lblb8E6TVbgZs7vgD2U
+-> ssh-ed25519 ofQnlg iaJY3mcaKyLjTAqNVnzyivIVRwXxxFzP0ru35s/TU3Q
-uMQI1gTTMvYW7ea9xBAln118JEeNvv3nqbq32zJoat8
+mfKliFvPT+hEOpOPtkdR/UEmEadXZGpQ8+iWg+S/Q8c
-> ssh-ed25519 COspvA YxCyfe0li23JoI2q4XFVUx4vrWApLwSnJD31PHXuPBg
+-> ssh-ed25519 COspvA +LC5rnZIS2R5DA3mIyeo2hR45mcBwNUjRS051qN+q2w
-8xuT9+W2mnTag9tm6F6LXzHkIh2Nou/8lgxd64OpvWk
+yLYl5g8o29ApSCn+H4Df8P8y+eFv2Hbj6b/nHrzFMdA
-> ssh-ed25519 2XrTgw jEzw0A9Wd1b1Zoryzp/W/QZ6bd99E7sySnr/W2xcnDs
+-> ssh-ed25519 2XrTgw dG9hmRFpaCBgaoHIkWmJM1Ls/mBqnV5gueGjCTEmRE0
-IyMrojJ3AChS6lhj599caNM+02i16qtpc6cocln14b4
+YkIQDWAwpr3pjjFozGEa3+4+WqJan0KQzUeYNxRjUPc
-> ssh-ed25519 1MUEqQ haiI/5EkuTZ2YHxsqSVlqfM0VVR24DIDrMS3RmXwAhU
+-> ssh-ed25519 1MUEqQ 0Mtf2NGpVP3TYuFGrTPyQM+h6PjpgJNwW9amz1w7h0w
-qVIAvLp2qG4A3f3OKUqAKqH1eOicJz54nfblPSUKrSw
+J8RM+vl/e8JifUP3dqwH5L9AUqu24pALv6wqxaNhy3g
-> ssh-ed25519 dgBsjw /vCnznu73U99onCWcM0aQlW0azscyUe4BB2kKeZvtHs
+-> ssh-ed25519 dgBsjw 9Y1n4J8E5T022V8QCApLykKoX56Zto8eLiy5KZvPuR4
-MPnvXR/WVsl/tJ1YPoc7nk2Ls2x9bbtJdNp3CQTuuWI
+3piVQigR7rFry43YTTHmXkBSDIAFa/ife1Vuq6/3ubk
--- OzkqKlw4xu3McMk20orQN0h+VPYfUUSDC+DsgRU1tSw
+--- 5Mr3Xe9RF1mneoWBno4SVkNqHx76EilFG0UvsHbqRQo
-ü^@ÃmŽÚé`B˜³#{¡Ÿ‚ GUu´‹|¹Á œ¡ rÚïjb¥:Ô“d²ù]	GØÎ©¦ú²-«Â–MÁ³ŸÜálÙ3mÌí)½š@¢—±e?¯ªêe¤üZ
+çì&mu°.ÄåNêäã:%œ…<C593>žPî	]`L<<3C>Î	ìÜñÅ]÷ÏÂe/T(s"a×Å<C397>™’½-ýû$M’A¿%LÄÉœv‘
-Y}ÿ!fÐ
+óm‹”‡@+9£¼¿÷%oa/¹K*³å&
--- a/secrets/wiki-password.age
+++ b/secrets/wiki-password.age
--- a/secrets/wiki-smtp-password.age
+++ b/secrets/wiki-smtp-password.age
Author	SHA1	Message	Date
Kiara Grouwstra	f50ee049f2	import the regular way, fixing `error: attribute 'age' missing`	2025-03-17 15:13:23 +01:00
Kiara Grouwstra	e872b3fde0	comment fediversity.eu option as its subdomains named after our services are used for production instances `08d109cc82/services/fediversity/sharedOptions.nix (L44)`	2025-03-17 15:13:23 +01:00
Kiara Grouwstra	42a0a798e7	pass in dummy initialUser to trigger orchestration from the panel	2025-03-17 15:13:23 +01:00
Kiara Grouwstra	98b3947a8e	default form to .net as .eu subdomains are used for live services	2025-03-17 15:13:23 +01:00
Kiara Grouwstra	7c5259181f	add openssh to devshell, as seemingly needed to trigger nixops4 by flake in django	2025-03-17 15:13:23 +01:00
Kiara Grouwstra	782bbc4d8e	move from documenting to automating configurable-impure-env	2025-03-17 15:13:23 +01:00
Kiara Grouwstra	2a8ae9d320	pass flake path as inputs.self.outPath?	2025-03-17 15:13:23 +01:00
lois	5355e57378	WIP: change env to environment	2025-03-17 15:13:23 +01:00
Kiara Grouwstra	76ff180ca7	use imputs over self	2025-03-17 15:13:23 +01:00
Kiara Grouwstra	ae08673c1b	pass `self` thru in flake	2025-03-17 15:13:23 +01:00
lois	e86712beec	Remove addding nixpkgs (did not fix the issue)	2025-03-17 15:13:23 +01:00
lois	cc5101063b	Pass REPO_DIR implicitly	2025-03-17 15:13:23 +01:00
Kiara Grouwstra	6bc3016585	add NIX_DIR	2025-03-17 15:13:23 +01:00
lois	fcbbce0405	Convert configuration form to json WIP: Get nix in scope	2025-03-17 15:13:23 +01:00
Kiara Grouwstra	1411136f75	WIP: trigger nixops from panel Closes #76. Note I had not yet manage to successfully test this. Manually trying the parameterized NixOps4 I tried using the following command, tho I had yet to get this to work as well: ```sh DEPLOYMENT='{"domain": "fediversity.net", "mastodon": {"enable": false}, "pixelfed": {"enable": true}, "peertube": {"enable": false}}' nix develop --extra-experimental-features "configurable-impure-env" --command nixops4 apply test ``` (or rather, I used a hardcoded Nix here so as to make it not use Lix.) So far this had failed for me with: ``` the following units failed: acme-mastodon.web.garage.fediversity.net.service ... nixops4 error: Failed to create resource garage-configuration ```	2025-03-17 15:13:23 +01:00
`@ -1 +1 @@`
	`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKBpnV6zzgdJN5pjw2oWryneE6kZ5rQ343Ut4ed12Cm9 root@fedi201`	`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhSlUo7L/TjoAILfLv/BDxlBT+rGudh9VoK50Uiu2lZ root@fedi201`