From 4db91bd0b7667a60e3567bf039c29e71fbc0fec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?=
<nicolas.jeannerod@moduscreate.com>
Date: Fri, 28 Feb 2025 10:56:34 +0100
Subject: [PATCH] Transmit initial user from JSON to services
---
deployment/default.nix | 21 +++++++++++++++++++++
infra/test-machines/configuration.json | 8 +++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/deployment/default.nix b/deployment/default.nix
index 7c7d89c6..032cb3e6 100644
--- a/deployment/default.nix
+++ b/deployment/default.nix
@@ -124,6 +124,13 @@ in
{
fediversity = {
inherit (panelConfig) domain;
+ temp.initialUser = {
+ inherit (panelConfig.initialUser) username email displayName;
+ # FIXME: disgusting, but nvm, this is going to be replaced by
+ # proper central authentication at some point
+ passwordFile = pkgs.writeText "password" panelConfig.initialUser.password;
+ };
+
mastodon = mastodonS3KeyConfig { inherit pkgs; } // {
enable = true;
};
@@ -140,6 +147,13 @@ in
{
fediversity = {
inherit (panelConfig) domain;
+ temp.initialUser = {
+ inherit (panelConfig.initialUser) username email displayName;
+ # FIXME: disgusting, but nvm, this is going to be replaced by
+ # proper central authentication at some point
+ passwordFile = pkgs.writeText "password" panelConfig.initialUser.password;
+ };
+
peertube = peertubeS3KeyConfig { inherit pkgs; } // {
enable = true;
## NOTE: Only ever used for testing anyway.
@@ -158,6 +172,13 @@ in
{
fediversity = {
inherit (panelConfig) domain;
+ temp.initialUser = {
+ inherit (panelConfig.initialUser) username email displayName;
+ # FIXME: disgusting, but nvm, this is going to be replaced by
+ # proper central authentication at some point
+ passwordFile = pkgs.writeText "password" panelConfig.initialUser.password;
+ };
+
pixelfed = pixelfedS3KeyConfig { inherit pkgs; } // {
enable = true;
};
diff --git a/infra/test-machines/configuration.json b/infra/test-machines/configuration.json
index 133b7a70..975b48d1 100644
--- a/infra/test-machines/configuration.json
+++ b/infra/test-machines/configuration.json
@@ -2,5 +2,11 @@
"domain": "abundos.eu",
"mastodon": { "enable": false },
"peertube": { "enable": false },
- "pixelfed": { "enable": false }
+ "pixelfed": { "enable": false },
+ "initialUser": {
+ "displayName": "Testy McTestface",
+ "username": "test",
+ "password": "testtest",
+ "email": "test@test.com"
+ }
}