From c66889f58f0d4b8979431470a6e340309579cab8 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: Wed, 26 Feb 2025 13:20:59 +0100
Subject: [PATCH] Better naming of `makeMakeDeployment` arguments
---
deployment/default.nix | 16 ++++++++--------
infra/flake-part.nix | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/deployment/default.nix b/deployment/default.nix
index c98d5675..1fde7169 100644
--- a/deployment/default.nix
+++ b/deployment/default.nix
@@ -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 = {
diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index 969cb7d5..2088f390 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -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;
};