From dfcfff53e162e531a4da6dec318ad2b596fe8dcf Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Thu, 12 Aug 2021 20:20:21 +0200
Subject: [PATCH] Fix backup path and remove variables.nix

---
 borgbackup.nix |  2 +-
 variables.nix  | 67 --------------------------------------------------
 2 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 variables.nix

diff --git a/borgbackup.nix b/borgbackup.nix
index 3b77297..f39789d 100644
--- a/borgbackup.nix
+++ b/borgbackup.nix
@@ -45,7 +45,7 @@ in
   };
   services.borgbackup.jobs.maildata = {
     readWritePaths = [ "/var/lib/borgbackup" ];
-    paths = "/srv/vmail";
+    paths = "/var/vmail";
     exclude = [  ];
     repo = "mail2@host01.hamburg.freifunk.net:maildata";
     prune.keep = {
diff --git a/variables.nix b/variables.nix
deleted file mode 100644
index 550dd00..0000000
--- a/variables.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  options = {
-    variables = lib.mkOption {
-      type = lib.types.attrs;
-      default = { };
-    };
-  };
-  config.variables = {
-    dovecotGroup = "dovecot2";
-    dovecotUser = "dovecot2";
-    dovecotAuthSocket = "/run/dovecot2/dovecot-auth";
-    dovecotLmtpSocket = "/run/dovecot2/dovecot-lmtp";
-    rspamdMilterSocket = "/run/rspamd/milter";
-    myFQDN = "${config.networking.hostName}.${config.networking.domain}";
-    pfadminDataDir = "/var/lib/postfixadmin";
-    pfaGroup = "pfadmin";
-    pfaPhpfpmHostPort = "127.0.0.1:9000";
-    pfaUser = "pfadmin";
-    pfaDomain = "pfa.${config.variables.myFQDN}";
-    roundcubeFQDN = config.variables.myFQDN;
-    roundcubeDataDir = "/var/lib/roundcube";
-    roundcubePhpfpmHostPort = "127.0.0.1:9001";
-    roundcubeUser = "roundcube";
-    roundcubeGroup = "roundcube";
-    useSSL = false;
-    vmailBaseDir = "/srv/vmail";
-    vmailGID = 10000;
-    vmailGroup = "vmail";
-    vmailUID = 10000;
-    vmailUser = "vmail";
-    postfixadminpkgCacheDir = "/var/cache/postfixadmin";
-    postfixadminpkg = (pkgs.callPackage ./pkg-postfixadmin.nix {
-      config = (pkgs.writeText "postfixadmin-config.local.php" ''
-        <?php
-        $CONF['configured'] = true;
-        $CONF['setup_password'] = '!';
-        $CONF['database_type'] = 'sqlite';
-        $CONF['database_name'] = '${config.variables.pfadminDataDir}/postfixadmin.db';
-        $CONF['password_expiration'] = 'NO';
-        $CONF['encrypt'] = 'dovecot:BLF-CRYPT';
-        $CONF['dovecotpw'] = "${pkgs.dovecot}/bin/doveadm pw";
-        $CONF['generate_password'] = 'YES';
-        $CONF['show_password'] = 'NO';
-        $CONF['quota'] = 'NO';
-        $CONF['fetchmail'] = 'NO';
-        $CONF['recipient_delimiter'] = "+";
-        $CONF['forgotten_user_password_reset'] = false;
-        $CONF['forgotten_admin_password_reset'] = false;
-        $CONF['aliases'] = '0';
-        $CONF['mailboxes'] = '0';
-        $CONF['default_aliases'] = array (
-          'abuse' => '${config.variables.mailAdmin}',
-          'hostmaster' => '${config.variables.mailAdmin}',
-          'postmaster' => '${config.variables.mailAdmin}',
-          'webmaster' => '${config.variables.mailAdmin}'
-        );
-        $CONF['footer_text'] = "";
-        $CONF['footer_link'] = "";
-        $CONF['page_size'] = '100000';
-        ?>
-      '');
-      cacheDir = config.variables.postfixadminpkgCacheDir;
-    } );
-  };
-}