From 5bc7f954bd6c007b4dfee8f26ca866f386247549 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, 20 Nov 2024 17:25:17 +0100
Subject: [PATCH] Consolidate config for vm02187

---
 infra/flake-part.nix                                  |  5 +----
 .../{hardware-configuration.nix => default.nix}       | 11 +++++++++++
 infra/vm02187/{configuration.nix => wiki.nix}         |  8 --------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename infra/vm02187/{hardware-configuration.nix => default.nix} (63%)
 rename infra/vm02187/{configuration.nix => wiki.nix} (93%)

diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index 8ead8c9..f98b35c 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -67,10 +67,7 @@
           };
           nixpkgs = inputs.nixpkgs;
           nixos.module = {
-            imports = [
-              ./vm02187/configuration.nix
-              ./vm02187/hardware-configuration.nix
-            ];
+            imports = [ ./vm02187 ];
           };
         };
       };
diff --git a/infra/vm02187/hardware-configuration.nix b/infra/vm02187/default.nix
similarity index 63%
rename from infra/vm02187/hardware-configuration.nix
rename to infra/vm02187/default.nix
index c95e55d..7b43b4c 100644
--- a/infra/vm02187/hardware-configuration.nix
+++ b/infra/vm02187/default.nix
@@ -1,4 +1,15 @@
 {
+  imports = [
+    ../common
+    ./wiki.nix
+  ];
+
+  procolix.vm = {
+    name = "vm02187";
+    ip4 = "185.206.232.187";
+    ip6 = "2a00:51c0:12:1201::187";
+  };
+
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/a46a9c46-e32b-4216-a4aa-8819b2cd0d49";
     fsType = "ext4";
diff --git a/infra/vm02187/configuration.nix b/infra/vm02187/wiki.nix
similarity index 93%
rename from infra/vm02187/configuration.nix
rename to infra/vm02187/wiki.nix
index 6aaf946..858790d 100644
--- a/infra/vm02187/configuration.nix
+++ b/infra/vm02187/wiki.nix
@@ -1,14 +1,6 @@
 { pkgs, ... }:
 
 {
-  imports = [ ../common ];
-
-  procolix.vm = {
-    name = "vm02187";
-    ip4 = "185.206.232.187";
-    ip6 = "2a00:51c0:12:1201::187";
-  };
-
   services.phpfpm.pools.mediawiki.phpOptions = ''
     upload_max_filesize = 1024M;
     post_max_size = 1024M;