config changes for latest clamav-unofficial-sigs 7.2.5 (#46)

* config changes for latest clamav-unofficial-sigs 7.2.5

* update to new /etc/clamav-unofficial-sigs path in README

* update makefile for pathes, and os.conf for restart option removal

* change path in test/share as per makefile changes

* changes in pathes

---------

Co-authored-by: diroots <diroots@e.email>

Author: diroots

Makefile

@@ -113,7 +113,7 @@ init_ldap: init_openldap init_redis
 		-v "`pwd`/test/share/postfix/custom.conf":/var/mail/postfix/custom.conf \
 		-v "`pwd`/test/share/postfix/sender_access":/var/mail/postfix/sender_access \
 		-v "`pwd`/test/share/dovecot/conf.d":/var/mail/dovecot/conf.d \
-		-v "`pwd`/test/share/clamav/unofficial-sigs/user.conf":/var/mail/clamav-unofficial-sigs/user.conf \
+		-v "`pwd`/test/share/clamav-unofficial-sigs/user.conf":/var/mail/clamav-unofficial-sigs/user.conf \
 		-h mail.domain.tld \
 		-t $(NAME)
 
@@ -194,7 +194,7 @@ init_ldap2: init_openldap init_redis
 		-v "`pwd`/test/share/postfix/custom.conf":/var/mail/postfix/custom.conf \
 		-v "`pwd`/test/share/postfix/sender_access":/var/mail/postfix/sender_access \
 		-v "`pwd`/test/share/dovecot/conf.d":/var/mail/dovecot/conf.d \
-		-v "`pwd`/test/share/clamav/unofficial-sigs/user.conf":/var/mail/clamav-unofficial-sigs/user.conf \
+		-v "`pwd`/test/share/clamav-unofficial-sigs/user.conf":/var/mail/clamav-unofficial-sigs/user.conf \
 		-h mail.domain.tld \
 		-t $(NAME)
 fixtures_ldap2:
@@ -236,7 +236,7 @@ init_default: init_redis init_mariadb
 		-v "`pwd`/test/share/postfix/custom.conf":/var/mail/postfix/custom.conf \
 		-v "`pwd`/test/share/postfix/sender_access":/var/mail/postfix/sender_access \
 		-v "`pwd`/test/share/dovecot/conf.d":/var/mail/dovecot/conf.d \
-		-v "`pwd`/test/share/clamav/unofficial-sigs/user.conf":/var/mail/clamav-unofficial-sigs/user.conf \
+		-v "`pwd`/test/share/clamav-unofficial-sigs/user.conf":/var/mail/clamav-unofficial-sigs/user.conf \
 		-h mail.domain.tld \
 		-t $(NAME)
 
@@ -425,7 +425,7 @@ init_sieve: init_redis init_mariadb
 		-v "`pwd`/test/share/postfix/custom.conf":/var/mail/postfix/custom.conf \
 		-v "`pwd`/test/share/postfix/sender_access":/var/mail/postfix/sender_access \
 		-v "`pwd`/test/share/dovecot/conf.d":/var/mail/dovecot/conf.d \
-		-v "`pwd`/test/share/clamav/unofficial-sigs/user.conf":/var/mail/clamav-unofficial-sigs/user.conf \
+		-v "`pwd`/test/share/clamav-unofficial-sigs/user.conf":/var/mail/clamav-unofficial-sigs/user.conf \
 		-h mail.domain.tld \
 		-t $(NAME)
 

README.md

@@ -675,8 +675,7 @@ Readme: https://github.com/extremeshok/clamav-unofficial-sigs
 
 #### Enable clamav-unofficial-sigs
 
-Create your `user.conf` file under `/mnt/docker/mail/clamav-unofficial-sigs` directory to configure clamav-unofficial-sigs updater. This file override the default configuration specified in [os.conf](https://github.com/mailserver2/mailserver/blob/master/rootfs/etc/clamav/unofficial-sigs/os.conf) and [master.conf](https://github.com/mailserver2/mailserver/blob/master/rootfs/etc/clamav/unofficial-sigs/master.conf). Don't forget, once you have completed the configuration of this file, set the value of `user_configuration_complete` to `yes` otherwise the script will not be able to execute.
-As [Yara rules are broken with Clamav = 0.100](https://github.com/extremeshok/clamav-unofficial-sigs/issues/203), we disable Yara rules for now.
+Create your `user.conf` file under `/mnt/docker/mail/clamav-unofficial-sigs` directory to configure clamav-unofficial-sigs updater. This file override the default configuration specified in [os.conf](https://github.com/mailserver2/mailserver/blob/master/rootfs/etc/clamav-unofficial-sigs/os.conf) and [master.conf](https://github.com/mailserver2/mailserver/blob/master/rootfs/etc/clamav-unofficial-sigs/master.conf). Don't forget, once you have completed the configuration of this file, set the value of `user_configuration_complete` to `yes` otherwise the script will not be able to execute.
 
 ```ini
 # /mnt/docker/mail/clamav-unofficial-sigs/user.conf
@@ -711,9 +710,12 @@ As [Yara rules are broken with Clamav = 0.100](https://github.com/extremeshok/cl
 # - 6. Enter the authorization signature into the config securiteinfo_authorisation_signature: replacing YOUR-SIGNATURE-NUMBER with your authorization signature from the link
 # securiteinfo_authorisation_signature="YOUR-SIGNATURE-NUMBER"
 
-# We disable Yara rules for now because they are broken with Clamav releases > 0.100
-yararulesproject_enabled="no"
-enable_yararules="no"
+# We enable Yara rules as they are now working with Clamav releases > 0.100
+yararulesproject_enabled="yes"
+enable_yararules="yes"
+
+# We enable interserver sigs
+interserver_enabled="yes"
 
 # After you have completed the configuration of this file, set the value to "yes"
 user_configuration_complete="yes"

…s/etc/clamav/unofficial-sigs/master.conf …s/etc/clamav-unofficial-sigs/master.confrootfs/etc/clamav/unofficial-sigs/master.conf renamed to rootfs/etc/clamav-unofficial-sigs/master.conf rootfs/etc/clamav/unofficial-sigs/master.conf renamed to rootfs/etc/clamav-unofficial-sigs/master.conf

@@ -0,0 +1,39 @@
+# This file contains os configuration settings for clamav-unofficial-sigs.sh
+###################
+# This is property of eXtremeSHOK.com
+# You are free to use, modify and distribute, however you may not remove this notice.
+# Copyright (c) Adrian Jon Kriel :: admin@extremeshok.com
+# License: BSD (Berkeley Software Distribution)
+##################
+#
+# Script updates can be found at: https://github.com/extremeshok/clamav-unofficial-sigs
+#
+##################
+#
+# NOT COMPATIBLE WITH VERSION 3.XX / 4.XX CONFIG
+#
+################################################################################
+# SEE MASTER.CONF FOR CONFIG EXPLANATIONS
+################################################################################
+# Rename to os.conf to enable this file
+################################################################################
+
+# Debian 9+ (stretch, buster)
+
+clam_user="clamav"
+clam_group="clamav"
+
+logrotate_group="adm"
+
+clam_dbs="/var/lib/clamav"
+
+clamd_pid="/run/clamav/clamd.pid"
+
+clamd_reload_opt="s6-svc -2 /services/clamd"
+# this is in case the needed/expected keyword is now restart and not reload
+clamd_restart_opt="s6-svc -2 /services/clamd"
+
+# this is enabled here https://github.com/mailserver2/mailserver/blob/master/rootfs/etc/clamav/unofficial-sigs/os.conf#L6
+clamd_socket="/run/clamav/clamd.ctl"
+
+# https://eXtremeSHOK.com ######################################################