From 238587099b92027ad780053f0f6217ad88b61ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 2 Jan 2021 02:32:37 +0100
Subject: Move flake private file in common place

---
 flakes/openarc/flake.nix   |  2 +-
 flakes/openarc/private.nix | 35 -----------------------------------
 flakes/private/openarc.nix | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 flakes/openarc/private.nix
 create mode 100644 flakes/private/openarc.nix

(limited to 'flakes')

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
diff --git a/flakes/private/openarc.nix b/flakes/private/openarc.nix
new file mode 100644
index 0000000..5244ca9
--- /dev/null
+++ b/flakes/private/openarc.nix
@@ -0,0 +1,35 @@
+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
-- 
cgit v1.2.3