Move flake private file in common place

2 files changed, 1 insertions, 36 deletions

diff --git a/flakes/openarc/flake.nix b/flakes/openarc/flake.nix
index e2b771a..d313f8e 100644
--- a/flakes/openarc/flake.nix
+++ b/flakes/openarc/flake.nix
@@ -75,7 +75,7 @@
           };
         };
     }) // {
-      nixosModules = (if builtins.pathExists ./private.nix then import ./private.nix nixpkgs else {});
+      nixosModules = (if builtins.pathExists ../private/openarc.nix then import ../private/openarc.nix nixpkgs else {});
       nixosModule = { config, lib, pkgs, ... }:
         let
           cfg = config.services.openarc;
diff --git a/flakes/openarc/private.nix b/flakes/openarc/private.nix
deleted file mode 100644
index 5244ca9..0000000
--- a/flakes/openarc/private.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgs:
-let
-  cfg = name': { config, lib, pkgs, name, ... }: lib.mkIf (name == name') {
-    services.openarc = {
-      enable = true;
-      user = "opendkim";
-      socket = "local:${config.myServices.mail.milters.sockets.openarc}";
-      group = config.services.postfix.group;
-      configFile = pkgs.writeText "openarc.conf" ''
-        AuthservID              mail.immae.eu
-        Domain                  mail.immae.eu
-        KeyFile                 ${config.secrets.fullPaths."opendkim/eldiron.private"}
-        Mode                    sv
-        Selector                eldiron
-        SoftwareHeader          yes
-        Syslog                  Yes
-        '';
-    };
-    systemd.services.openarc.serviceConfig.Slice = "mail.slice";
-    systemd.services.openarc.postStart = lib.optionalString
-          (lib.strings.hasPrefix "local:" config.services.openarc.socket) ''
-      while [ ! -S ${lib.strings.removePrefix "local:" config.services.openarc.socket} ]; do
-        sleep 0.5
-      done
-      chmod g+w ${lib.strings.removePrefix "local:" config.services.openarc.socket}
-      '';
-    services.filesWatcher.openarc = {
-      restart = true;
-      paths = [
-        config.secrets.fullPaths."opendkim/eldiron.private"
-      ];
-    };
-  };
-in
-  pkgs.lib.genAttrs ["eldiron" "backup-2"] cfg