From 929cac8f503459ba2beb0ac0fa433dbf504c99f8 Mon Sep 17 00:00:00 2001
From: Ruben Maher <ruben@maher.fyi>
Date: Tue, 13 Feb 2018 10:10:30 +1030
Subject: [PATCH 1/2] mail-server/users.nix: don't expand variables in sieve
 script

---
 mail-server/users.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-server/users.nix b/mail-server/users.nix
index a2728f0..ef7d137 100644
--- a/mail-server/users.nix
+++ b/mail-server/users.nix
@@ -50,7 +50,7 @@ let
           chown "${name}:${vmailGroupName}" "/var/sieve/${name}"
           chmod 770 "/var/sieve/${name}"
         fi
-        cat << EOF > "/var/sieve/${name}/default.sieve"
+        cat << 'EOF' > "/var/sieve/${name}/default.sieve"
         ${sieveScript}
         EOF
         chown "${name}:${vmailGroupName}" "/var/sieve/${name}/default.sieve"

From 789af710ed9aafb287611959206c0aa4096360b6 Mon Sep 17 00:00:00 2001
From: Ruben Maher <ruben@maher.fyi>
Date: Tue, 20 Feb 2018 09:14:55 +1030
Subject: [PATCH 2/2] ci: increase cache timeout to 10 minutes

The default is 3, and this can lead to cache timeouts while saving the contents
of /nix/store.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f9aae7b..7167f5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,3 +8,4 @@ script:
 cache:
   directories:
       - /nix/store
+  timeout: 600