From 0c414738e12c07ec5bcddb6102653c90a956a287 Mon Sep 17 00:00:00 2001
From: Robin Raymond <robin@robinraymond.de>
Date: Sun, 3 Sep 2017 15:56:36 +0200
Subject: [PATCH] fix merge bug in systemd

---
 mail-server/script/create_certificate | 16 ++++++++++++++++
 mail-server/systemd.nix               | 23 ++++-------------------
 2 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 mail-server/script/create_certificate

diff --git a/mail-server/script/create_certificate b/mail-server/script/create_certificate
new file mode 100644
index 0000000..d69301c
--- /dev/null
+++ b/mail-server/script/create_certificate
@@ -0,0 +1,16 @@
+# Create certificates if they do not exist yet
+dir="${cfg.certificateDirectory}"
+fqdn="${cfg.hostPrefix}.${cfg.domain}"
+case $fqdn in /*) fqdn=$(cat "$fqdn");; esac
+key="''${dir}/key-${cfg.domain}.pem";
+cert="''${dir}/cert-${cfg.domain}.pem";
+
+if [ ! -f "''${key}" ] || [ ! -f "''${cert}" ]
+then
+  mkdir -p "${cfg.certificateDirectory}"
+  (umask 077; "${pkgs.openssl}/bin/openssl" genrsa -out "''${key}" 2048) &&
+      "${pkgs.openssl}/bin/openssl" req -new -key "''${key}" -x509 -subj "/CN=''${fqdn}" \
+              -days 3650 -out "''${cert}"
+fi
+
+# vim: set filetype=sh
diff --git a/mail-server/systemd.nix b/mail-server/systemd.nix
index 9cae899..5ebf3ee 100644
--- a/mail-server/systemd.nix
+++ b/mail-server/systemd.nix
@@ -20,22 +20,7 @@ let
   cfg = config.mailserver;
 
   create_certificate = if cfg.certificateScheme == 2 then
-        ''
-          # Create certificates if they do not exist yet
-          dir="${cfg.certificateDirectory}"
-          fqdn="${cfg.hostPrefix}.${cfg.domain}"
-          case $fqdn in /*) fqdn=$(cat "$fqdn");; esac
-          key="''${dir}/key-${cfg.domain}.pem";
-          cert="''${dir}/cert-${cfg.domain}.pem";
-
-          if [ ! -f "''${key}" ] || [ ! -f "''${cert}" ]
-          then
-              mkdir -p "${cfg.certificateDirectory}"
-              (umask 077; "${pkgs.openssl}/bin/openssl" genrsa -out "''${key}" 2048) &&
-                  "${pkgs.openssl}/bin/openssl" req -new -key "''${key}" -x509 -subj "/CN=''${fqdn}" \
-                          -days 3650 -out "''${cert}"
-          fi
-        ''
+        builtins.readFile ./script/create_certificate
         else "";
 
   dkim_key = "${cfg.dkimKeyDirectory}/${cfg.dkimSelector}.private";
@@ -67,9 +52,9 @@ in
       ''
       # Create mail directory and set permissions. See
       # <http://wiki2.dovecot.org/SharedMailboxes/Permissions>.
-      mkdir -p "${mail_dir}"
-      chgrp "${vmail_group_name}" "${mail_dir}"
-      chmod 02770 "${mail_dir}"
+      mkdir -p "${mailDirectory}"
+      chgrp "${vmailGroupName}" "${mailDirectory}"
+      chmod 02770 "${mailDirectory}"
 
         ${create_certificate}
       '';