Merge pull request #73 from eqyiel/fix-sieve-variables

mail-server/users.nix: don't expand variables in sieve script
This commit is contained in:
Robin Raymond 2018-02-20 11:59:13 +01:00 committed by GitHub
commit 2ef04b2d9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -8,3 +8,4 @@ script:
cache: cache:
directories: directories:
- /nix/store - /nix/store
timeout: 600

View File

@ -50,7 +50,7 @@ let
chown "${name}:${vmailGroupName}" "/var/sieve/${name}" chown "${name}:${vmailGroupName}" "/var/sieve/${name}"
chmod 770 "/var/sieve/${name}" chmod 770 "/var/sieve/${name}"
fi fi
cat << EOF > "/var/sieve/${name}/default.sieve" cat << 'EOF' > "/var/sieve/${name}/default.sieve"
${sieveScript} ${sieveScript}
EOF EOF
chown "${name}:${vmailGroupName}" "/var/sieve/${name}/default.sieve" chown "${name}:${vmailGroupName}" "/var/sieve/${name}/default.sieve"