Merge pull request #63 from extremeshok/dev

5.0.4

.travis.yml

@@ -0,0 +1,18 @@
+#language: shell
+
+cache:
+  directories:
+    - $HOME/.m2/repository
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install clamav-daemon -qq
+  - sudo freshclam
+  - sudo service clamav-daemon start
+
+#install:
+#  - sh -e .travis/ci-setup.sh
+
+script:
+  - sh -e .travis/ci-force.sh
+#  - sh -e .travis/ci-runtest.sh

.travis/ci-force.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo .. forced OK

README.md

@@ -77,7 +77,22 @@ Usage of free Linux Malware Detect clamav signatures: https://www.rfxn.com/proje
  - Enabled by default, no configuration required
 
 ## Change Log
-### Version 5.0.3 (updated 2016-03-27)
+### Version 5.0.4 (updated 2016-03-31)
+ - eXtremeSHOK.com Maintenance 
+ - Added/Updated OS configs: CentOS 7, FreeBSD, Slackware
+ - Added clamd_reload_opt to fix issues with centos7 conf
+ - Fix --remove-script should call remove_script() function by @IdahoPL
+ - Add OS specific settings to logrotate
+ - Increased default timeout values
+ - Attempt to Silence more output
+ - Create the log_file_path directory before we touch the file.
+ - Updated config file to remove the $work_dir varible from dir names
+ - Remove trailing / from directory names
+ - Initial support for Travis-Ci testing
+ - Fixed config option enable_logging -> logging_enabled
+ - Config updated to 56 due to changes
+
+### Version 5.0.3
  - eXtremeSHOK.com Maintenance 
  - Added OS configs: OpenSUSE, Archlinux, Gentoo, Raspbian, FreeBSD
  - Fixed config option enable_logging -> logging_enabled

config/master.conf

@@ -307,11 +307,12 @@ enable_random="yes"
 min_sleep_time="60"    # Default minimum is 60 seconds (1 minute).
 max_sleep_time="600"   # Default maximum is 600 seconds (10 minutes).
 
-# Set the clamd_restart_opt if the "reload_dbs" variable above is set
 # Command to do a full clamd service stop/start
-
 #clamd_restart_opt="service clamd restart"
 
+# Custom Command to fo a full clamd reload, this defaults to "clamdscan --reload" when not set
+#clamd_reload_opt="clamdscan --reload"
+
 # If running clamd in "LocalSocket" mode (*NOT* in TCP/IP mode), and
 # either "SOcket Cat" (socat) or the "IO::Socket::UNIX" perl module
 # are installed on the system, and you want to report whether clamd
@@ -325,26 +326,27 @@ max_sleep_time="600"   # Default maximum is 600 seconds (10 minutes).
 # Set rsync connection and data transfer timeout limits in seconds.
 # The defaults settings here are reasonable, only change if you are
 # experiencing timeout issues.
-rsync_connect_timeout="30"
-rsync_max_time="90"
+rsync_connect_timeout="60"
+rsync_max_time="180"
 
 # Set curl connection and data transfer timeout limits in seconds.
 # The defaults settings here are reasonable, only change if you are
 # experiencing timeout issues.
-curl_connect_timeout="30"
-curl_max_time="90"
+curl_connect_timeout="60"
+curl_max_time="180"
 
 # Set working directory paths (edit to meet your own needs). If these
 # directories do not exist, the script will attempt to create them.
+# Always located inside the work_dir, do not add /
 # Sub-directory names:
-sanesecurity_dir="$work_dir/dbs-ss"        # Sanesecurity sub-directory
-securiteinfo_dir="$work_dir/dbs-si"        # SecuriteInfo sub-directory 
-linuxmalwaredetect_dir="$work_dir/dbs-lmd"      # Linux Malware Detect sub-directory 
-malwarepatrol_dir="$work_dir/dbs-mbl"      # MalwarePatrol sub-directory 
-yararules_dir="$work_dir/dbs-yara"      # Yara-Rules sub-directory 
-work_dir_configs="$work_dir/configs"   # Script configs sub-directory
-gpg_dir="$work_dir/gpg-key"      # Sanesecurity GPG Key sub-directory
-add_dir="$work_dir/dbs-add"      # User defined databases sub-directory
+sanesecurity_dir="dbs-ss"        # Sanesecurity sub-directory
+securiteinfo_dir="dbs-si"        # SecuriteInfo sub-directory 
+linuxmalwaredetect_dir="dbs-lmd"      # Linux Malware Detect sub-directory 
+malwarepatrol_dir="dbs-mbl"      # MalwarePatrol sub-directory 
+yararules_dir="dbs-yara"      # Yara-Rules sub-directory 
+work_dir_configs="configs"   # Script configs sub-directory
+gpg_dir="gpg-key"      # Sanesecurity GPG Key sub-directory
+add_dir="dbs-add"      # User defined databases sub-directory
 
 # If you would like to make a backup copy of the current running database
 # file before updating, leave the following variable set to "yes" and a
@@ -387,6 +389,6 @@ yararules_url="https://raw.githubusercontent.com/Yara-Rules/rules/master/"
 
 # ========================
 # do not edit
-config_version="55"
+config_version="56"
 
 # https://eXtremeSHOK.com ##############################################################

config/os.centos7.conf

@@ -22,14 +22,17 @@
 # Rename to os.conf to enable this file
 ################################################################################
 
-# RHEL/CentOS 7
+# RHEL/CentOS 7, using ClamAV packages from EPEL
+
 clam_user="clamupdate"
 clam_group="clamupdate"
 
 clam_dbs="/var/lib/clamav"
 
-clamd_pid="/var/run/clamav/clamd.pid"
+clamd_pid="/var/run/clamd.scan/clamd.pid"
 
 clamd_restart_opt="systemctl restart clamd@scan"
 
-#clamd_socket="/var/run/clamd.socket"
+#clamd_socket="/var/run/clamd.scan/clamd.sock"
+
+clamd_reload_opt="clamdscan --config-file=/etc/clamd.d/scan.conf --reload"

config/os.freebsd.conf

@@ -37,3 +37,6 @@ log_file_path="/var/log/clamav"
 clamd_restart_opt="service clamav-clamd reload"
 
 #clamd_socket="/var/run/clamav/clamd.sock"
+
+pkg_mgr="FreeBSD ports"
+pkg_rm="pkg remove"

config/os.slackware.conf

@@ -0,0 +1,37 @@
+# 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
+##################
+#
+# Script updates can be found at: https://github.com/extremeshok/clamav-unofficial-sigs
+# 
+# Originially based on: 
+# Script provide by Bill Landry (unofficialsigs@gmail.com).
+#
+# License: BSD (Berkeley Software Distribution)
+#
+##################
+#
+# NOT COMPATIBLE WITH VERSION 3.XX / 4.XX CONFIG 
+#
+################################################################################
+# SEE MASTER.CONF FOR CONFIG EXPLAINATIONS
+################################################################################
+# Rename to os.conf to enable this file
+################################################################################
+
+# Slackware
+
+clam_user="clamav"
+clam_group="clamav"
+
+#clam_dbs="/var/lib/clamav"
+clam_dbs="/usr/local/share/clamav"
+
+clamd_pid="/var/run/clamav/clamd.pid"
+
+clamd_restart_opt="service clamd restart"
+
+#clamd_socket="/var/run/clamav/clamd.socket"

logrotate.d/clamav-unofficial-sigs

@@ -20,8 +20,19 @@
      missingok
      notifempty
      compress
-# Redhat / CentOS 6
-     create 0644 clam clam
-# Debian / Ubuntu
+
+# UNCOMMENT the specific line for your OS
+
+## Debian / Ubuntu / Archlinux / Freebsd / Gentoo / Slackware / Raspbian
 #     create 0644 clamav clamav
+
+## Redhat / CentOS 6
+#     create 0644 clam clam
+
+## Redhat / CentOS 7
+#    create 0644 clamupdate clamupdate
+
+## OpenSUSE
+#    create 0644 vscan vscan
+
 }