install_amavis.sh: SecuriteInfo was moved to ClamAV's Freshclam. Also get rid of trailling spaces.
This commit is contained in:
		| @@ -413,6 +413,85 @@ else | ||||
|    done | ||||
| fi | ||||
|  | ||||
|  | ||||
| echo "" | ||||
| echo -e "\033[32m--\033[m" | ||||
| echo "" | ||||
| echo "Use SecuriteInfo Signatures (https://www.securiteinfo.com)?" | ||||
| echo "" | ||||
| echo "Note: You have to sign up for an account. For a free account thats here:" | ||||
| echo "      https://www.securiteinfo.com/clients/customers/signup" | ||||
| echo "" | ||||
| if [[ -z "$_SECURITE_INFO_IN_USE" ]]; then | ||||
|    echononl "Load SecuriteInfo Singatures (yes/no): " | ||||
| else | ||||
|    if $_SECURITE_INFO_IN_USE ; then | ||||
|       echononl "Load SecuriteInfo Singatures [yes]: " | ||||
|    else | ||||
|       echononl "Load SecuriteInfo Singatures [no]: " | ||||
|    fi | ||||
| fi | ||||
| read _TMP_LOAD_SI | ||||
| _TMP_LOAD_SI=${_TMP_LOAD_SI,,} | ||||
| while [ "X$_TMP_LOAD_SI" != "Xyes" -a "X$_TMP_LOAD_SI" != "Xno" ]; do | ||||
|    if [[ -z "$_SECURITE_INFO_IN_USE" ]]; then | ||||
|       echononl "Wrong entry! (yes/no): " | ||||
|       read _TMP_LOAD_SI | ||||
|       _TMP_LOAD_SI=${_TMP_LOAD_SI,,} | ||||
|    else | ||||
|       if [ "X$_TMP_LOAD_SI" != "Xyes" -a "X$_TMP_LOAD_SI" != "Xno" ]; then | ||||
|          if [[ "X$_TMP_LOAD_SI" = "X" ]]; then | ||||
|             if $_SECURITE_INFO_IN_USE ; then | ||||
|                _TMP_LOAD_SI=yes | ||||
|             else | ||||
|                _TMP_LOAD_SI=no | ||||
|             fi | ||||
|          else | ||||
|             if $_SECURITE_INFO_IN_USE ; then | ||||
|                echononl "Wrong entry! [yes]: " | ||||
|             else | ||||
|                echononl "Wrong entry! [no]: " | ||||
|             fi | ||||
|             read _TMP_LOAD_SI | ||||
|          fi | ||||
|       fi | ||||
|    fi | ||||
| done | ||||
| if [[ "$_TMP_LOAD_SI" = "yes" ]] ; then | ||||
|    SECURITE_INFO_IN_USE=true | ||||
| else | ||||
|    SECURITE_INFO_IN_USE=false | ||||
| fi | ||||
|  | ||||
| if $SECURITE_INFO_IN_USE ; then | ||||
|    echo "" | ||||
|    echo -e "\033[32m--\033[m" | ||||
|    echo "" | ||||
|    echo "Insert SecuriteInfo Authorisation Signature" | ||||
|    echo "" | ||||
|    echo "" | ||||
|    SI_AUTHORISATION_SIGNATURE= | ||||
|    if [[ -n "$_SI_AUTHORISATION_SIGNATURE" ]] ; then | ||||
|       while [[ "X$SI_AUTHORISATION_SIGNATURE" = "X" ]]; do | ||||
|          echononl "SecuriteInfo Authorisation Signature [$(echo ${_SI_AUTHORISATION_SIGNATURE:0:4})..$(echo ${_SI_AUTHORISATION_SIGNATURE: -4})]: " | ||||
|          read SI_AUTHORISATION_SIGNATURE | ||||
|          if [[ "X$SI_AUTHORISATION_SIGNATURE" = "X" ]]; then | ||||
|                SI_AUTHORISATION_SIGNATURE=$_SI_AUTHORISATION_SIGNATURE | ||||
|             fi | ||||
|       done | ||||
|    else | ||||
|  | ||||
|       while [[ "X$SI_AUTHORISATION_SIGNATURE" = "X" ]]; do | ||||
|          echononl "SecuriteInfo Authorisation Signature: " | ||||
|          read SI_AUTHORISATION_SIGNATURE | ||||
|          if [[ "X$SI_AUTHORISATION_SIGNATURE" = "X" ]]; then | ||||
|             echo -e "\n\t\033[33m\033[1mSecuriteInfo Authorisation Signature is reqired\033[m\n" | ||||
|          fi | ||||
|       done | ||||
|    fi | ||||
| fi | ||||
|  | ||||
|  | ||||
| echo "" | ||||
| echo -e "\033[32m--\033[m" | ||||
| echo "" | ||||
| @@ -586,84 +665,6 @@ if $INSTALL_CLAMAV_UNOFFICIAL_SIGS ; then | ||||
|  | ||||
|    fi | ||||
|  | ||||
|  | ||||
|    echo ""  | ||||
|    echo -e "\033[32m--\033[m"  | ||||
|    echo ""  | ||||
|    echo "Load SecuriteInfo Signatures (https://www.securiteinfo.com)?"  | ||||
|    echo ""  | ||||
|    echo "Note: You have to sign up for an account. For a free account thats here:" | ||||
|    echo "      https://www.securiteinfo.com/clients/customers/signup" | ||||
|    echo ""  | ||||
|    if [[ -z "$_SECURITE_INFO_IN_USE" ]]; then | ||||
|       echononl "Load SecuriteInfo Singatures (yes/no): " | ||||
|    else | ||||
|       if $_SECURITE_INFO_IN_USE ; then | ||||
|          echononl "Load SecuriteInfo Singatures [yes]: " | ||||
|       else | ||||
|          echononl "Load SecuriteInfo Singatures [no]: " | ||||
|       fi | ||||
|    fi | ||||
|    read _TMP_LOAD_SI | ||||
|    _TMP_LOAD_SI=${_TMP_LOAD_SI,,} | ||||
|    while [ "X$_TMP_LOAD_SI" != "Xyes" -a "X$_TMP_LOAD_SI" != "Xno" ]; do | ||||
|       if [[ -z "$_SECURITE_INFO_IN_USE" ]]; then | ||||
|          echononl "Wrong entry! (yes/no): " | ||||
|          read _TMP_LOAD_SI | ||||
|          _TMP_LOAD_SI=${_TMP_LOAD_SI,,} | ||||
|       else | ||||
|          if [ "X$_TMP_LOAD_SI" != "Xyes" -a "X$_TMP_LOAD_SI" != "Xno" ]; then | ||||
|             if [[ "X$_TMP_LOAD_SI" = "X" ]]; then | ||||
|                if $_SECURITE_INFO_IN_USE ; then | ||||
|                   _TMP_LOAD_SI=yes | ||||
|                else | ||||
|                   _TMP_LOAD_SI=no | ||||
|                fi | ||||
|             else | ||||
|                if $_SECURITE_INFO_IN_USE ; then | ||||
|                   echononl "Wrong entry! [yes]: " | ||||
|                else | ||||
|                   echononl "Wrong entry! [no]: " | ||||
|                fi | ||||
|                read _TMP_LOAD_SI | ||||
|             fi | ||||
|          fi | ||||
|       fi | ||||
|    done | ||||
|    if [[ "$_TMP_LOAD_SI" = "yes" ]] ; then | ||||
|       SECURITE_INFO_IN_USE=true | ||||
|    else | ||||
|       SECURITE_INFO_IN_USE=false | ||||
|    fi | ||||
|  | ||||
|    if $SECURITE_INFO_IN_USE ; then | ||||
|       echo "" | ||||
|       echo -e "\033[32m--\033[m" | ||||
|       echo "" | ||||
|       echo "Insert SecuriteInfo Authorisation Signature" | ||||
|       echo "" | ||||
|       echo "" | ||||
|       SI_AUTHORISATION_SIGNATURE= | ||||
|       if [[ -n "$_SI_AUTHORISATION_SIGNATURE" ]] ; then | ||||
|          while [[ "X$SI_AUTHORISATION_SIGNATURE" = "X" ]]; do | ||||
|             echononl "SecuriteInfo Authorisation Signature [$(echo ${_SI_AUTHORISATION_SIGNATURE:0:4})..$(echo ${_SI_AUTHORISATION_SIGNATURE: -4})]: " | ||||
|             read SI_AUTHORISATION_SIGNATURE | ||||
|             if [[ "X$SI_AUTHORISATION_SIGNATURE" = "X" ]]; then | ||||
|                   SI_AUTHORISATION_SIGNATURE=$_SI_AUTHORISATION_SIGNATURE | ||||
|                fi | ||||
|          done | ||||
|       else | ||||
|  | ||||
|          while [[ "X$SI_AUTHORISATION_SIGNATURE" = "X" ]]; do | ||||
|             echononl "SecuriteInfo Authorisation Signature: " | ||||
|             read SI_AUTHORISATION_SIGNATURE | ||||
|             if [[ "X$SI_AUTHORISATION_SIGNATURE" = "X" ]]; then | ||||
|                echo -e "\n\t\033[33m\033[1mSecuriteInfo Authorisation Signature is reqired\033[m\n" | ||||
|             fi | ||||
|          done | ||||
|       fi | ||||
|    fi | ||||
|  | ||||
| fi | ||||
|  | ||||
|  | ||||
| @@ -3550,9 +3551,16 @@ if $INSTALL_CLAMAV_UNOFFICIAL_SIGS ; then | ||||
| # -------------------------------------- | ||||
| # --- Begin: User specific modifications | ||||
| # --- Inserted by install-script "$(basename "$0")" at $(date +"%Y-%m-%d %H:%M") | ||||
|  | ||||
| # - SecuriteInfo | ||||
| # - | ||||
| # - SecuriteInfo signatures are now directly integrated into ClamAV's Freshclam. | ||||
| # - | ||||
| # - We therefore disable them here. | ||||
| # - | ||||
| securiteinfo_enabled="no" | ||||
| EOF | ||||
|  | ||||
|    if $MALWARE_PATROL_IN_USE || $SECURITE_INFO_IN_USE ; then | ||||
|  | ||||
|    if $MALWARE_PATROL_IN_USE ; then | ||||
|  | ||||
| @@ -3586,29 +3594,23 @@ EOF | ||||
|             error "$(cat $tmp_err_msg)" | ||||
|          fi | ||||
|       fi | ||||
|       fi # if $MALWARE_PATROL_IN_USE | ||||
|  | ||||
|       if $SECURITE_INFO_IN_USE ; then | ||||
|    else | ||||
|       cat << EOF >> /etc/clamav-unofficial-sigs/user.conf 2> $tmp_err_msg | ||||
| # - SecuriteInfo | ||||
|  | ||||
| # - MalwarePatrol | ||||
| # - | ||||
| # -    type:     Gold | ||||
| # -    account:  ckubu@oopen.de | ||||
| # -    signatur: abb4ec6..46b59a4e | ||||
| # - Not in use | ||||
| # - | ||||
| # -    - ALT - | ||||
| # -    type:     professional | ||||
| # -    account:  oo@oopen.de | ||||
| # -    signatur: b0b7e94d..0c2e3a89 | ||||
| # - | ||||
| securiteinfo_authorisation_signature="$SI_AUTHORISATION_SIGNATURE" | ||||
| malwarepatrol_enabled="no" | ||||
| EOF | ||||
|       if [[ "$?" -ne 0 ]] ; then | ||||
|          installation_failed=true | ||||
|          error "$(cat $tmp_err_msg)" | ||||
|       fi | ||||
|       fi # if $SECURITE_INFO_IN_USE | ||||
|    fi #if $MALWARE_PATROL_IN_USE || $SECURITE_INFO_IN_USE | ||||
|  | ||||
|    fi #if $MALWARE_PATROL_IN_USE | ||||
|  | ||||
|    cat << EOF >> /etc/clamav-unofficial-sigs/user.conf 2> $tmp_err_msg | ||||
|  | ||||
| # - Disable  Yara-Rule set, because (some?) pgp mails where blocked. | ||||
|   | ||||
		Reference in New Issue
	
	Block a user