changeset 453:dc725b618258

Fix Amavis quarantine directory
author IBBoard <dev@ibboard.co.uk>
date Sun, 13 Aug 2023 15:25:01 +0100
parents 7222218a7098
children d0e7979c7e8c
files manifests/templates.pp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/manifests/templates.pp	Sun Aug 13 15:21:49 2023 +0100
+++ b/manifests/templates.pp	Sun Aug 13 15:25:01 2023 +0100
@@ -955,7 +955,7 @@
 		$amavis_config = '/etc/amavisd/amavisd.conf'
 		$amavis_rundir = '/var/run/amavisd'
 		$amavis_spooldir = '/var/spool/amavisd'
-		$amavis_quarantinedir = '$HOME_DIR/quarantine'
+		$amavis_quarantinedir = '$MYHOME/quarantine'
 		$amavis_service = 'amavisd'
 		# CentOS has a Clam service, but we call on demand (Ubuntu doesn't have a service)
 		service { 'clamd@amavisd':
@@ -969,7 +969,7 @@
 		$amavis_config = '/etc/amavis/conf.d/60-puppeted'
 		$amavis_rundir = '/var/run/amavis'
 		$amavis_spooldir = '/var/lib/amavis'
-		$amavis_quarantinedir = '$HOME_DIR/virusmails'
+		$amavis_quarantinedir = '$MYHOME/virusmails'
 		$amavis_service = 'amavis'
 	}
 	package { $spamassassin_deps: