Jgreen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/85211


Change subject: puppetize clamd.conf
......................................................................

puppetize clamd.conf

Change-Id: Idb16a59d7782ad0bbf89e24743aad3e2d24df85d
---
A files/clamd.conf
M manifests/mail.pp
2 files changed, 70 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/85211/1

diff --git a/files/clamd.conf b/files/clamd.conf
new file mode 100644
index 0000000..5649e55
--- /dev/null
+++ b/files/clamd.conf
@@ -0,0 +1,61 @@
+#Automatically Generated by clamav-base postinst
+#To reconfigure clamd run #dpkg-reconfigure clamav-base
+#Please read /usr/share/doc/clamav-base/README.Debian.gz for details
+LocalSocket /var/run/clamav/clamd.ctl
+FixStaleSocket true
+LocalSocketGroup clamav
+LocalSocketMode 666
+# TemporaryDirectory is not set to its default /tmp here to make overriding
+# the default with environment variables TMPDIR/TMP/TEMP possible
+User clamav
+AllowSupplementaryGroups true
+ScanMail true
+ScanArchive true
+ArchiveBlockEncrypted false
+MaxDirectoryRecursion 15
+FollowDirectorySymlinks false
+FollowFileSymlinks false
+ReadTimeout 180
+MaxThreads 12
+MaxConnectionQueueLength 15
+LogSyslog false
+LogFacility LOG_LOCAL6
+LogClean false
+LogVerbose false
+PidFile /var/run/clamav/clamd.pid
+DatabaseDirectory /var/lib/clamav
+SelfCheck 3600
+Foreground false
+Debug false
+ScanPE true
+ScanOLE2 true
+ScanHTML true
+DetectBrokenExecutables false
+ExitOnOOM false
+LeaveTemporaryFiles false
+AlgorithmicDetection true
+ScanELF true
+IdleTimeout 30
+PhishingSignatures true
+PhishingScanURLs true
+PhishingAlwaysBlockSSLMismatch false
+PhishingAlwaysBlockCloak false
+DetectPUA false
+ScanPartialMessages false
+HeuristicScanPrecedence false
+StructuredDataDetection false
+CommandReadTimeout 5
+SendBufTimeout 200
+MaxQueue 100
+ExtendedDetectionInfo true
+OLE2BlockMacros false
+StreamMaxLength 25M
+LogFile /var/log/clamav/clamav.log
+LogTime true
+LogFileUnlock false
+LogFileMaxSize 0
+Bytecode true
+BytecodeSecurity TrustSigned
+BytecodeTimeout 60000
+OfficialDatabaseOnly false
+CrossFilesystems true
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 84f002c..c127038 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -278,6 +278,15 @@
                # this takes several minutes to run
        }
 
+       file {
+               "/etc/clamav/clamd.conf":
+                       require => Package["clamav-daemon"],
+                       owner => root,
+                       group => root,
+                       mode => 0444
+                       source => "puppet:///files/clamav/clamd.conf";
+       }
+
        service { "clamd":
                require => [ File["/etc/clamav/clamd.conf"], 
Package["clamav-daemon"] ],
                subscribe => [ File["/etc/clamav/clamd.conf"] ],

-- 
To view, visit https://gerrit.wikimedia.org/r/85211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb16a59d7782ad0bbf89e24743aad3e2d24df85d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <jgr...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to