kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

actually use the typed configuration in deployment

Browse source 
that change somehow slipped through the cracks previously
This commit is contained in:
Valentin Gagarin 2025-05-09 12:46:11 +02:00
parent df9ce821de
commit 5f66a034f3
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
deployment/default.nix
View file

@ -41,8 +41,11 @@ let
in
## Regular arguments of a NixOps4 deployment module.
{ providers, ... }:
{ config, providers, ... }:
let
cfg = config.deployment;
in
{
options = {
deployment = lib.mkOption {
@ -52,6 +55,7 @@ in
# XXX(@fricklerhandwerk):
# misusing this will produce obscure errors that will be truncated by NixOps4
type = lib.types.submodule ./options.nix;
default = panelConfig;
};
};
@ -116,7 +120,7 @@ in
{
garage-configuration = makeConfigurationResource garageConfigurationResource (
{ pkgs, ... }:
mkIf (panelConfig.mastodon.enable || panelConfig.peertube.enable || panelConfig.pixelfed.enable) {
mkIf (cfg.mastodon.enable || cfg.peertube.enable || cfg.pixelfed.enable) {
fediversity = {
inherit (panelConfig) domain;
garage.enable = true;
@ -129,14 +133,14 @@ in
mastodon-configuration = makeConfigurationResource mastodonConfigurationResource (
{ pkgs, ... }:
mkIf panelConfig.mastodon.enable {
mkIf cfg.mastodon.enable {
fediversity = {
inherit (panelConfig) domain;
inherit (cfg) domain;
temp.initialUser = {
inherit (panelConfig.initialUser) username email displayName;
inherit (cfg.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;
passwordFile = pkgs.writeText "password" cfg.initialUser.password;
};
mastodon = mastodonS3KeyConfig { inherit pkgs; } // {
@ -150,14 +154,14 @@ in
peertube-configuration = makeConfigurationResource peertubeConfigurationResource (
{ pkgs, ... }:
mkIf panelConfig.peertube.enable {
mkIf cfg.peertube.enable {
fediversity = {
inherit (panelConfig) domain;
inherit (cfg) domain;
temp.initialUser = {
inherit (panelConfig.initialUser) username email displayName;
inherit (cfg.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;
passwordFile = pkgs.writeText "password" cfg.initialUser.password;
};
peertube = peertubeS3KeyConfig { inherit pkgs; } // {
@ -173,14 +177,14 @@ in
pixelfed-configuration = makeConfigurationResource pixelfedConfigurationResource (
{ pkgs, ... }:
mkIf panelConfig.pixelfed.enable {
mkIf cfg.pixelfed.enable {
fediversity = {
inherit (panelConfig) domain;
inherit (cfg) domain;
temp.initialUser = {
inherit (panelConfig.initialUser) username email displayName;
inherit (cfg.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;
passwordFile = pkgs.writeText "password" cfg.initialUser.password;
};
pixelfed = pixelfedS3KeyConfig { inherit pkgs; } // {