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

Better naming of makeMakeDeployment arguments

Browse source
This commit is contained in:
Nicolas Jeannerod 2025-02-26 13:20:59 +01:00
parent cbed66c934
commit c66889f58f
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
2 changed files with 12 additions and 12 deletions

16
deployment/default.nix
View file

@ -20,10 +20,10 @@
##
## - Ultimately, we just want a pool of VMs, or even just a Proxmox.
## - Each machine is flagged for a certain use case until we control DNS.
garageResourceModule,
mastodonResourceModule,
peertubeResourceModule,
pixelfedResourceModule,
garageConfigurationResource,
mastodonConfigurationResource,
peertubeConfigurationResource,
pixelfedConfigurationResource,
}:
## From the hosting provider's perspective, the function is meant to be
@ -90,7 +90,7 @@ in
mkMerge [
(mkIf (enableMastodon || enablePeertube || enablePixelfed) {
garage-config = makeConfigurationResource garageResourceModule (
garage-configuration = makeConfigurationResource garageConfigurationResource (
{ pkgs, ... }:
{
fediversity = {
@ -105,7 +105,7 @@ in
})
(mkIf enableMastodon {
mastodon-config = makeConfigurationResource mastodonResourceModule (
mastodon-configuration = makeConfigurationResource mastodonConfigurationResource (
{ pkgs, ... }:
{
fediversity = {
@ -121,7 +121,7 @@ in
})
(mkIf enablePeertube {
peertube-config = makeConfigurationResource peertubeResourceModule (
peertube-configuration = makeConfigurationResource peertubeConfigurationResource (
{ pkgs, ... }:
{
fediversity = {
@ -139,7 +139,7 @@ in
})
(mkIf enablePixelfed {
pixelfed-config = makeConfigurationResource pixelfedResourceModule (
pixelfed-configuration = makeConfigurationResource pixelfedConfigurationResource (
{ pkgs, ... }:
{
fediversity = {

8
infra/flake-part.nix
View file

@ -60,19 +60,19 @@ let
inherit (self.nixosModules) fediversity;
}
{
garageResourceModule = makeResourceModule {
garageConfigurationResource = makeResourceModule {
vmName = "test01";
isTestVm = true;
};
mastodonResourceModule = makeResourceModule {
mastodonConfigurationResource = makeResourceModule {
vmName = "test02";
isTestVm = true;
};
peertubeResourceModule = makeResourceModule {
peertubeConfigurationResource = makeResourceModule {
vmName = "test03";
isTestVm = true;
};
pixelfedResourceModule = makeResourceModule {
pixelfedConfigurationResource = makeResourceModule {
vmName = "test04";
isTestVm = true;
};