8 files changed, 25 insertions, 27 deletions

diff --git a/systems/eldiron/base.nix b/systems/eldiron/base.nix
index 1f894a5..24e05fe 100644
--- a/systems/eldiron/base.nix
+++ b/systems/eldiron/base.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, php, name, secrets, ... }:
+{ config, pkgs, lib, ports, name, secrets, ... }:
 {
   # ssh-keyscan eldiron | nix-shell -p ssh-to-age --run ssh-to-age
   secrets.ageKeys = [ "age1dxr5lhvtnjssfaqpnf6qx80h8gfwkxg3tdf35m6n9wljmk7wadfs3kmahj" ];
@@ -28,9 +28,7 @@
     "nodejs-16.20.2" # for landing page building
   ];
 
-  nixpkgs.overlays = [
-    php.overlays.php
-  ];
+  nixpkgs.overlays = builtins.attrValues ports.overlays;
   powerManagement.cpuFreqGovernor = "powersave";
 
   security.acme.certs."${name}".postRun = builtins.concatStringsSep "\n" [
diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock
index 99a5c92..6611639 100644
--- a/systems/eldiron/flake.lock
+++ b/systems/eldiron/flake.lock
@@ -2141,7 +2141,7 @@
         "type": "path"
       }
     },
-    "private-php": {
+    "private-ports": {
       "inputs": {
         "flake-utils": "flake-utils_11",
         "nixpkgs": "nixpkgs_14",
@@ -2149,12 +2149,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -2496,7 +2496,7 @@
         "private-openldap": "private-openldap",
         "private-paste": "private-paste",
         "private-peertube": "private-peertube",
-        "private-php": "private-php",
+        "private-ports": "private-ports",
         "private-ssh": "private-ssh",
         "private-system": "private-system",
         "public-copanier": "public-copanier",
diff --git a/systems/eldiron/flake.nix b/systems/eldiron/flake.nix
index 790b638..c126d0b 100644
--- a/systems/eldiron/flake.nix
+++ b/systems/eldiron/flake.nix
@@ -27,7 +27,7 @@
 
     private-peertube.url = "path:../../flakes/private/peertube";
     private-buildbot.url = "path:../../flakes/private/buildbot";
-    private-php.url = "path:../../flakes/private/php";
+    private-ports.url = "path:../../flakes/private/ports";
     private-environment.url = "path:../../flakes/private/environment";
     private-openarc.url = "path:../../flakes/private/openarc";
     private-openldap.url = "path:../../flakes/private/openldap";
@@ -84,7 +84,7 @@
         openldap = private-openldap;
         monitoring = private-monitoring;
         peertube = private-peertube.packages.x86_64-linux;
-        php = private-php;
+        ports = private-ports;
       };
     };
 }
diff --git a/systems/monitoring-1/base.nix b/systems/monitoring-1/base.nix
index 2d8139e..6784ef8 100644
--- a/systems/monitoring-1/base.nix
+++ b/systems/monitoring-1/base.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, nixpkgs, php, secrets, ... }:
+{ config, pkgs, lib, nixpkgs, ports, secrets, ... }:
 {
   # ssh-keyscan monitoring-1 | nix-shell -p ssh-to-age --run ssh-to-age
   secrets.ageKeys = [ "age1dn4lzhgxusqrpjjnzm7w8ml39ptf326htuzmpqdqs2gg3wq7cqzqxuvx8k" ];
@@ -13,7 +13,7 @@
     ./status_engine.nix
   ];
 
-  nixpkgs.overlays = builtins.attrValues php.overlays;
+  nixpkgs.overlays = builtins.attrValues ports.overlays;
   nixpkgs.config.permittedInsecurePackages = [
     "python-2.7.18.6" # for nagios-cli
   ];
diff --git a/systems/monitoring-1/flake.lock b/systems/monitoring-1/flake.lock
index d4a2c8d..84d51bc 100644
--- a/systems/monitoring-1/flake.lock
+++ b/systems/monitoring-1/flake.lock
@@ -628,7 +628,7 @@
         "type": "github"
       }
     },
-    "php": {
+    "ports": {
       "inputs": {
         "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_6",
@@ -636,12 +636,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -656,7 +656,7 @@
         "my-lib": "my-lib",
         "myuids": "myuids",
         "nixpkgs": "nixpkgs_5",
-        "php": "php",
+        "ports": "ports",
         "secrets": "secrets_3",
         "system": "system"
       }
diff --git a/systems/monitoring-1/flake.nix b/systems/monitoring-1/flake.nix
index e97cb05..1833053 100644
--- a/systems/monitoring-1/flake.nix
+++ b/systems/monitoring-1/flake.nix
@@ -9,7 +9,7 @@
     chatons.url = "path:../../flakes/private/chatons";
     environment.url = "path:../../flakes/private/environment";
     system.url = "path:../../flakes/private/system";
-    php.url = "path:../../flakes/private/php";
+    ports.url = "path:../../flakes/private/ports";
 
     myuids.url = "path:../../flakes/myuids";
     secrets.url = "path:../../flakes/secrets";
@@ -39,7 +39,7 @@
       moduleArgs = {
         nixpkgs = inputs.nixpkgs;
         monitoring = inputs.monitoring;
-        php = inputs.php;
+        ports = inputs.ports;
       };
     };
 }
diff --git a/systems/quatresaisons/flake.lock b/systems/quatresaisons/flake.lock
index 6f2ccca..15c4f56 100644
--- a/systems/quatresaisons/flake.lock
+++ b/systems/quatresaisons/flake.lock
@@ -618,7 +618,7 @@
         "type": "github"
       }
     },
-    "php": {
+    "ports": {
       "inputs": {
         "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_6",
@@ -626,12 +626,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -645,7 +645,7 @@
         "my-lib": "my-lib",
         "myuids": "myuids_2",
         "nixpkgs": "nixpkgs_5",
-        "php": "php",
+        "ports": "ports",
         "secrets": "secrets_2",
         "system": "system"
       }
diff --git a/systems/quatresaisons/flake.nix b/systems/quatresaisons/flake.nix
index 8b269f6..a0e8ff7 100644
--- a/systems/quatresaisons/flake.nix
+++ b/systems/quatresaisons/flake.nix
@@ -6,7 +6,7 @@
 
     monitoring.url = "path:../../flakes/private/monitoring";
     environment.url = "path:../../flakes/private/environment";
-    php.url = "path:../../flakes/private/php";
+    ports.url = "path:../../flakes/private/ports";
     system.url = "path:../../flakes/private/system";
 
     myuids.url = "path:../../flakes/myuids";
@@ -41,7 +41,7 @@
       };
       moduleArgs = {
         monitoring = inputs.monitoring;
-        php = inputs.php;
+        ports = inputs.ports;
         landing-page = inputs.landing-page;
         pkgs-no-overlay = inputs.nixpkgs.legacyPackages.x86_64-linux;
       };