Add host identifier options and use manual configured setting in function

This commit is contained in:
Michael Boelen 2018-02-16 19:29:08 +01:00
parent 1f80c000cc
commit 5e9253e8f4
No known key found for this signature in database
GPG Key ID: 26141F77A09D7F04
2 changed files with 15 additions and 1 deletions

View File

@ -417,6 +417,12 @@ ssl-certificate-paths=/etc/apache2:/etc/dovecot:/etc/httpd:/etc/letsencrypt:/etc
# This is useful for ephemeral systems which are short-lived.
#allow-auto-purge=yes
# Sometimes it might be useful to override the host identifiers.
# Use only hexadecimal values (0-9, a-f), with 40 and 64 characters in length.
#
#hostid=40-char-hash
#hostid2=64-char-hash
# Proxy settings
# Protocol (http, https, socks5)
#proxy-protocol=https

View File

@ -804,11 +804,17 @@
# Name : GetHostID()
# Description : Create an unique id for the system
#
# Returns : Nothing
# Returns : optional value
# Usage : GetHostID
################################################################################
GetHostID() {
if [ ! -z "${HOSTID}" -a ! -z "${HOSTID2}" ]; then
Debug "Skipping creation of host identifiers, as they are already configured (via profile)"
return 1
fi
FIND=""
# Avoid some hashes (empty, only zeros)
BLACKLISTED_HASHES="6ef1338f520d075957424741d7ed35ab5966ae97 adc83b19e793491b1c6ea0fd8b46cd9f32e592fc"
@ -1104,6 +1110,8 @@
# Show an exception if no HostID could be created, to ensure each system (and scan) has one
if [ "${HOSTID}" = "" ]; then
ReportException "GetHostID" "No unique host identifier could be created."
elif [ ! -z "${HOSTID2}" ]; then
return 0
fi
}