# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1708457337 0
# Node ID 117680ac22afa621194823328e4548b93f666695
# Parent  5930e9ac4ab91fef31b775efd460bcf31554ec7c
Amavis spool dir and add Tumblock to CSP headers

diff -r 5930e9ac4ab9 -r 117680ac22af manifests/templates.pp
--- a/manifests/templates.pp	Tue Feb 20 19:26:24 2024 +0000
+++ b/manifests/templates.pp	Tue Feb 20 19:28:57 2024 +0000
@@ -749,11 +749,11 @@
 			"report-uri" => "https://ibboard.report-uri.com/r/d/csp/enforce",
 			"default-src" => "'none'",
 			"img-src" => "'self' https://live.staticflickr.com/",
-			"script-src" => "'self'",
+			"script-src" => "'self' https://auth-server.herokuapp.com/proxy https://api.tumblr.com/",
 			"style-src" => "'self'",
 			"font-src" => "'self'",
 			"form-action" => "'self'",
-			"connect-src" => "'self'",
+			"connect-src" => "'self' https://api.tumblr.com/",
 		}
 	}
 	website::https::redir { 'mail.ibboard.co.uk':
@@ -964,7 +964,7 @@
 		$amavis_config = '/etc/amavisd/amavisd.conf'
 		$amavis_rundir = '/var/run/amavisd'
 		$amavis_spooldir = '/var/spool/amavisd'
-		$amavis_quarantinedir = '$MYHOME/quarantine'
+		$amavis_quarantinedir = '/var/spool/amavisd/quarantine'
 		$amavis_service = 'amavisd'
 		# CentOS has a Clam service, but we call on demand (Ubuntu doesn't have a service)
 		service { 'clamd@amavisd':
@@ -978,7 +978,7 @@
 		$amavis_config = '/etc/amavis/conf.d/60-puppeted'
 		$amavis_rundir = '/var/run/amavis'
 		$amavis_spooldir = '/var/lib/amavis'
-		$amavis_quarantinedir = '$MYHOME/virusmails'
+		$amavis_quarantinedir = '/var/spool/amavisd/quarantine'
 		$amavis_service = 'amavis'
 	}
 	package { $spamassassin_deps: