update..

roles/common/files/a.mx/root/bin/monitoring/conf/check_webservice_load.conf

@@ -6,18 +6,97 @@
 #-----------------------------
 #---------------------------------------
 
-#LOGGING=true
-LOGGING=false
+
+# ---
+# - LOGGING
+# -
+# - This Parameter is now obsolete. If script is running in a terminal, then output ist verbose,
+# - the output will be verbos. If running as cronjob, output will only be written, if warnings or 
+# - errors occurs.
+# ---
+
+
+# - CONFLICTING_SCRIPTS
+# -
+# - The scripts listed here conflict with this script. If one of these scripts 
+# - is currently running, this script will be stopped.
+# -
+# - In addition to the script, a LOCK directory can also be specified which is 
+# - connected to it. 
+# - 
+# - If no fixed LOCK directory is connected to the script, set 
+# - this value to the constant 'CHECK_PROCESS_LIST'.
+# -
+# - If no value for the LOCK directory is given, the LOCK directory 
+# - '/tmp/<base-script_name>.LOCK' is assumed. 
+# - 
+# - 
+# - Example:
+# -    CONFLICTING_SCRIPTS="
+# -       /root/bin/monitoring/check_webservice_load.sh:CHECK_PROCESS_LIST
+# -       /root/bin/monitoring/check_remote_websites.sh
+# -    "
+# -
+# - Defaults to:
+# -    CONFLICTING_SCRIPTS="/root/bin/monitoring/check_local_webservice.sh:/tmp/check_local_webservice.LOCK"
+# -
+#CONFLICTING_SCRIPTS=""
+
 
 # - What to check
 # -
 check_load=true
 check_mysql=false
+check_mariadb=false
+
+# - PostgreSQL
+# -
+# - NOT useful, if more than one PostgreSQL instances are running!
+# -
+check_postgresql=true
+
 check_apache=true
+check_nginx=false
 check_php_fpm=true
+check_redis=false
 check_website=false
 
 
+# TIMEOUT_CHECK_WEBSITE
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_WEBSITE=10
+#
+#TIMEOUT_CHECK_WEBSITE=10
+
+# TIMEOUT_CHECK_PHP
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_PHP=10
+#
+#TIMEOUT_CHECK_PHP=10
+
+
+# - If service is not listen on 127.0.0.1/loclhost, curl check must
+# - be ommited
+# -
+# - Defaults to: ommit_curl_check_nginx=false
+# -
+#ommit_curl_check_nginx=false
+
+# - Is this a vserver guest machine?
+# -
+# - Not VSerber guest host does not support systemd!
+# -
+# - defaults to: vserver_guest=false
+# -
+#vserver_guest=false
+
+
 # - Additional Settings for check_mysql
 # -
 # - MySQL / MariaDB credentials
@@ -39,11 +118,47 @@ check_website=false
 # -    $ mysql --login-path=local ...
 # -
 # - Example
+# -    mysql_credential_args="-u root -S /run/mysqld/mysqld.sock"
 # -    mysql_credential_args="--login-path=local"
 # -    mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
 # -    mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
 # -
-mysql_credential_args="--login-path=local"
+# - defaults to: 
+# -    mysql_credential_args="--login-path=local"
+# -
+#mysql_credential_args="--login-path=local"
+
+
+# - Additional Settings for check_mariadb
+# -
+# - MariaDB credentials
+# -
+# - Giving password on command line is insecure an sind mysql 5.5
+# - you will get a warning doing so.
+# - 
+# - Reading username/password fro file ist also possible, using MySQL/MariaDB
+# - commandline parameter '--defaults-file'.
+# - 
+# - Since Mysql Version 5.6, you can read username/password from
+# - encrypted file.
+# -
+# -    Create (encrypted) option file:
+# -    $ mysql_config_editor set --login-path=local --socket=/tmp/mysql.sock  --user=root --password
+# -    $ Password:
+# -
+# -    Use of option file:
+# -    $ mysql --login-path=local ...
+# -
+# - Example
+# -    mariadb_credential_args="-u root -S /run/mysqld/mysqld.sock"
+# -    mariadb_credential_args="--login-path=local"
+# -    mariadb_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
+# -    mariadb_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
+# -
+# - defaults to empty string
+# -    mariadb_credential_args=""
+# -
+#mariadb_credential_args=""
 
 
 # - Additional Settings for check_php_fpm
@@ -62,7 +177,7 @@ curl_check_host=127.0.0.1
 # - Example:
 # -    php_versions="5.4 5.6 7.0 7.1"
 # -
-php_versions="8.1"
+php_versions="8.2"
 
 # - If PHP-FPM's ping.path setting does not match ping-$php_major_version,
 # - set the value given in your ping.path setting here. Give ping_path also

roles/common/files/c.mx/root/bin/monitoring/conf/check_webservice_load.conf

@@ -11,15 +11,43 @@
 # - LOGGING
 # -
 # - This Parameter is now obsolete. If script is running in a terminal, then output ist verbose,
-# - the output will be verbos. If running as cronjob, output will only be written, if warnings or 
+# - the output will be verbos. If running as cronjob, output will only be written, if warnings or
 # - errors occurs.
 # ---
 
 
+# - CONFLICTING_SCRIPTS
+# -
+# - The scripts listed here conflict with this script. If one of these scripts
+# - is currently running, this script will be stopped.
+# -
+# - In addition to the script, a LOCK directory can also be specified which is
+# - connected to it.
+# -
+# - If no fixed LOCK directory is connected to the script, set
+# - this value to the constant 'CHECK_PROCESS_LIST'.
+# -
+# - If no value for the LOCK directory is given, the LOCK directory
+# - '/tmp/<base-script_name>.LOCK' is assumed.
+# -
+# -
+# - Example:
+# -    CONFLICTING_SCRIPTS="
+# -       /root/bin/monitoring/check_webservice_load.sh:CHECK_PROCESS_LIST
+# -       /root/bin/monitoring/check_remote_websites.sh
+# -    "
+# -
+# - Defaults to:
+# -    CONFLICTING_SCRIPTS="/root/bin/monitoring/check_local_webservice.sh:/tmp/check_local_webservice.LOCK"
+# -
+#CONFLICTING_SCRIPTS=""
+
+
 # - What to check
 # -
 check_load=true
-check_mysql=true
+check_mysql=false
+check_mariadb=true
 
 # - PostgreSQL
 # -
@@ -33,6 +61,26 @@ check_php_fpm=true
 check_redis=false
 check_website=false
 
+
+# TIMEOUT_CHECK_WEBSITE
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_WEBSITE=10
+#
+#TIMEOUT_CHECK_WEBSITE=10
+
+# TIMEOUT_CHECK_PHP
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_PHP=10
+#
+#TIMEOUT_CHECK_PHP=10
+
+
 # - If service is not listen on 127.0.0.1/loclhost, curl check must
 # - be ommited
 # -
@@ -55,10 +103,10 @@ check_website=false
 # -
 # - Giving password on command line is insecure an sind mysql 5.5
 # - you will get a warning doing so.
-# - 
+# -
 # - Reading username/password fro file ist also possible, using MySQL/MariaDB
 # - commandline parameter '--defaults-file'.
-# - 
+# -
 # - Since Mysql Version 5.6, you can read username/password from
 # - encrypted file.
 # -
@@ -70,11 +118,48 @@ check_website=false
 # -    $ mysql --login-path=local ...
 # -
 # - Example
+# -    mysql_credential_args="-u root -S /run/mysqld/mysqld.sock"
 # -    mysql_credential_args="--login-path=local"
 # -    mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
 # -    mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
 # -
-mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf"
+# - defaults to:
+# -    mysql_credential_args="--login-path=local"
+# -
+#mysql_credential_args="--login-path=local"
+
+
+# - Additional Settings for check_mariadb
+# -
+# - MariaDB credentials
+# -
+# - Giving password on command line is insecure an sind mysql 5.5
+# - you will get a warning doing so.
+# -
+# - Reading username/password fro file ist also possible, using MySQL/MariaDB
+# - commandline parameter '--defaults-file'.
+# -
+# - Since Mysql Version 5.6, you can read username/password from
+# - encrypted file.
+# -
+# -    Create (encrypted) option file:
+# -    $ mysql_config_editor set --login-path=local --socket=/tmp/mysql.sock  --user=root --password
+# -    $ Password:
+# -
+# -    Use of option file:
+# -    $ mysql --login-path=local ...
+# -
+# - Example
+# -    mariadb_credential_args="-u root -S /run/mysqld/mysqld.sock"
+# -    mariadb_credential_args="--login-path=local"
+# -    mariadb_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
+# -    mariadb_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
+# -
+# - defaults to empty string
+# -    mariadb_credential_args=""
+# -
+#mariadb_credential_args=""
+mariadb_credential_args="-u root -S /run/mysqld/mysqld.sock"
 
 
 # - Additional Settings for check_php_fpm
@@ -93,7 +178,7 @@ curl_check_host=127.0.0.1
 # - Example:
 # -    php_versions="5.4 5.6 7.0 7.1"
 # -
-php_versions="8.1"
+php_versions="8.2"
 
 # - If PHP-FPM's ping.path setting does not match ping-$php_major_version,
 # - set the value given in your ping.path setting here. Give ping_path also
@@ -161,7 +246,7 @@ php_version_of_working_url=''
 
 # - Notice:
 # - If single qoutes "'" not needed inside cleanup function, then use single quotes
-# - to enclose variable "cleanup_function". Then you don't have do masquerade any 
+# - to enclose variable "cleanup_function". Then you don't have do masquerade any
 # - sign inside.
 # -
 # - Otherwise use double quotes and masq any sign to prevent bash from interpreting.

roles/common/files/d.mx/root/bin/monitoring/conf/check_webservice_load.conf

@@ -16,15 +16,87 @@
 # ---
 
 
+# - CONFLICTING_SCRIPTS
+# -
+# - The scripts listed here conflict with this script. If one of these scripts 
+# - is currently running, this script will be stopped.
+# -
+# - In addition to the script, a LOCK directory can also be specified which is 
+# - connected to it. 
+# - 
+# - If no fixed LOCK directory is connected to the script, set 
+# - this value to the constant 'CHECK_PROCESS_LIST'.
+# -
+# - If no value for the LOCK directory is given, the LOCK directory 
+# - '/tmp/<base-script_name>.LOCK' is assumed. 
+# - 
+# - 
+# - Example:
+# -    CONFLICTING_SCRIPTS="
+# -       /root/bin/monitoring/check_webservice_load.sh:CHECK_PROCESS_LIST
+# -       /root/bin/monitoring/check_remote_websites.sh
+# -    "
+# -
+# - Defaults to:
+# -    CONFLICTING_SCRIPTS="/root/bin/monitoring/check_local_webservice.sh:/tmp/check_local_webservice.LOCK"
+# -
+#CONFLICTING_SCRIPTS=""
+
+
 # - What to check
 # -
 check_load=true
-check_mysql=true
+check_mysql=false
+check_mariadb=true
+
+# - PostgreSQL
+# -
+# - NOT useful, if more than one PostgreSQL instances are running!
+# -
+check_postgresql=true
+
 check_apache=true
+check_nginx=false
 check_php_fpm=false
+check_redis=false
 check_website=false
 
 
+# TIMEOUT_CHECK_WEBSITE
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_WEBSITE=10
+#
+#TIMEOUT_CHECK_WEBSITE=10
+
+# TIMEOUT_CHECK_PHP
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_PHP=10
+#
+#TIMEOUT_CHECK_PHP=10
+
+
+# - If service is not listen on 127.0.0.1/loclhost, curl check must
+# - be ommited
+# -
+# - Defaults to: ommit_curl_check_nginx=false
+# -
+#ommit_curl_check_nginx=false
+
+# - Is this a vserver guest machine?
+# -
+# - Not VSerber guest host does not support systemd!
+# -
+# - defaults to: vserver_guest=false
+# -
+#vserver_guest=false
+
+
 # - Additional Settings for check_mysql
 # -
 # - MySQL / MariaDB credentials
@@ -46,11 +118,47 @@ check_website=false
 # -    $ mysql --login-path=local ...
 # -
 # - Example
+# -    mysql_credential_args="-u root -S /run/mysqld/mysqld.sock"
 # -    mysql_credential_args="--login-path=local"
 # -    mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
 # -    mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
 # -
-mysql_credential_args="--login-path=local"
+# - defaults to: 
+# -    mysql_credential_args="--login-path=local"
+# -
+#mysql_credential_args="--login-path=local"
+
+
+# - Additional Settings for check_mariadb
+# -
+# - MariaDB credentials
+# -
+# - Giving password on command line is insecure an sind mysql 5.5
+# - you will get a warning doing so.
+# - 
+# - Reading username/password fro file ist also possible, using MySQL/MariaDB
+# - commandline parameter '--defaults-file'.
+# - 
+# - Since Mysql Version 5.6, you can read username/password from
+# - encrypted file.
+# -
+# -    Create (encrypted) option file:
+# -    $ mysql_config_editor set --login-path=local --socket=/tmp/mysql.sock  --user=root --password
+# -    $ Password:
+# -
+# -    Use of option file:
+# -    $ mysql --login-path=local ...
+# -
+# - Example
+# -    mariadb_credential_args="-u root -S /run/mysqld/mysqld.sock"
+# -    mariadb_credential_args="--login-path=local"
+# -    mariadb_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
+# -    mariadb_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
+# -
+# - defaults to empty string
+# -    mariadb_credential_args=""
+# -
+#mariadb_credential_args=""
 
 
 # - Additional Settings for check_php_fpm

roles/common/files/ga-st-mail/root/bin/monitoring/conf/check_webservice_load.conf

@@ -11,15 +11,43 @@
 # - LOGGING
 # -
 # - This Parameter is now obsolete. If script is running in a terminal, then output ist verbose,
-# - the output will be verbos. If running as cronjob, output will only be written, if warnings or 
+# - the output will be verbos. If running as cronjob, output will only be written, if warnings or
 # - errors occurs.
 # ---
 
 
+# - CONFLICTING_SCRIPTS
+# -
+# - The scripts listed here conflict with this script. If one of these scripts
+# - is currently running, this script will be stopped.
+# -
+# - In addition to the script, a LOCK directory can also be specified which is
+# - connected to it.
+# -
+# - If no fixed LOCK directory is connected to the script, set
+# - this value to the constant 'CHECK_PROCESS_LIST'.
+# -
+# - If no value for the LOCK directory is given, the LOCK directory
+# - '/tmp/<base-script_name>.LOCK' is assumed.
+# -
+# -
+# - Example:
+# -    CONFLICTING_SCRIPTS="
+# -       /root/bin/monitoring/check_webservice_load.sh:CHECK_PROCESS_LIST
+# -       /root/bin/monitoring/check_remote_websites.sh
+# -    "
+# -
+# - Defaults to:
+# -    CONFLICTING_SCRIPTS="/root/bin/monitoring/check_local_webservice.sh:/tmp/check_local_webservice.LOCK"
+# -
+#CONFLICTING_SCRIPTS=""
+
+
 # - What to check
 # -
 check_load=true
 check_mysql=false
+check_mariadb=false
 
 # - PostgreSQL
 # -
@@ -33,6 +61,26 @@ check_php_fpm=true
 check_redis=false
 check_website=false
 
+
+# TIMEOUT_CHECK_WEBSITE
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_WEBSITE=10
+#
+#TIMEOUT_CHECK_WEBSITE=10
+
+# TIMEOUT_CHECK_PHP
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_PHP=10
+#
+#TIMEOUT_CHECK_PHP=10
+
+
 # - If service is not listen on 127.0.0.1/loclhost, curl check must
 # - be ommited
 # -
@@ -55,10 +103,10 @@ check_website=false
 # -
 # - Giving password on command line is insecure an sind mysql 5.5
 # - you will get a warning doing so.
-# - 
+# -
 # - Reading username/password fro file ist also possible, using MySQL/MariaDB
 # - commandline parameter '--defaults-file'.
-# - 
+# -
 # - Since Mysql Version 5.6, you can read username/password from
 # - encrypted file.
 # -
@@ -70,11 +118,47 @@ check_website=false
 # -    $ mysql --login-path=local ...
 # -
 # - Example
+# -    mysql_credential_args="-u root -S /run/mysqld/mysqld.sock"
 # -    mysql_credential_args="--login-path=local"
 # -    mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
 # -    mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
 # -
-mysql_credential_args=""
+# - defaults to:
+# -    mysql_credential_args="--login-path=local"
+# -
+#mysql_credential_args="--login-path=local"
+
+
+# - Additional Settings for check_mariadb
+# -
+# - MariaDB credentials
+# -
+# - Giving password on command line is insecure an sind mysql 5.5
+# - you will get a warning doing so.
+# -
+# - Reading username/password fro file ist also possible, using MySQL/MariaDB
+# - commandline parameter '--defaults-file'.
+# -
+# - Since Mysql Version 5.6, you can read username/password from
+# - encrypted file.
+# -
+# -    Create (encrypted) option file:
+# -    $ mysql_config_editor set --login-path=local --socket=/tmp/mysql.sock  --user=root --password
+# -    $ Password:
+# -
+# -    Use of option file:
+# -    $ mysql --login-path=local ...
+# -
+# - Example
+# -    mariadb_credential_args="-u root -S /run/mysqld/mysqld.sock"
+# -    mariadb_credential_args="--login-path=local"
+# -    mariadb_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
+# -    mariadb_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
+# -
+# - defaults to empty string
+# -    mariadb_credential_args=""
+# -
+#mariadb_credential_args=""
 
 
 # - Additional Settings for check_php_fpm
@@ -93,7 +177,7 @@ curl_check_host=127.0.0.1
 # - Example:
 # -    php_versions="5.4 5.6 7.0 7.1"
 # -
-php_versions="8.1"
+php_versions="8.2"
 
 # - If PHP-FPM's ping.path setting does not match ping-$php_major_version,
 # - set the value given in your ping.path setting here. Give ping_path also
@@ -161,7 +245,7 @@ php_version_of_working_url=''
 
 # - Notice:
 # - If single qoutes "'" not needed inside cleanup function, then use single quotes
-# - to enclose variable "cleanup_function". Then you don't have do masquerade any 
+# - to enclose variable "cleanup_function". Then you don't have do masquerade any
 # - sign inside.
 # -
 # - Otherwise use double quotes and masq any sign to prevent bash from interpreting.

roles/common/files/mail.cadus/root/bin/monitoring/conf/check_webservice_load.conf

@@ -16,10 +16,38 @@
 # ---
 
 
+# - CONFLICTING_SCRIPTS
+# -
+# - The scripts listed here conflict with this script. If one of these scripts 
+# - is currently running, this script will be stopped.
+# -
+# - In addition to the script, a LOCK directory can also be specified which is 
+# - connected to it. 
+# - 
+# - If no fixed LOCK directory is connected to the script, set 
+# - this value to the constant 'CHECK_PROCESS_LIST'.
+# -
+# - If no value for the LOCK directory is given, the LOCK directory 
+# - '/tmp/<base-script_name>.LOCK' is assumed. 
+# - 
+# - 
+# - Example:
+# -    CONFLICTING_SCRIPTS="
+# -       /root/bin/monitoring/check_webservice_load.sh:CHECK_PROCESS_LIST
+# -       /root/bin/monitoring/check_remote_websites.sh
+# -    "
+# -
+# - Defaults to:
+# -    CONFLICTING_SCRIPTS="/root/bin/monitoring/check_local_webservice.sh:/tmp/check_local_webservice.LOCK"
+# -
+#CONFLICTING_SCRIPTS=""
+
+
 # - What to check
 # -
 check_load=true
-check_mysql=true
+check_mysql=false
+check_mariadb=true
 
 # - PostgreSQL
 # -
@@ -33,6 +61,26 @@ check_php_fpm=true
 check_redis=false
 check_website=false
 
+
+# TIMEOUT_CHECK_WEBSITE
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_WEBSITE=10
+#
+#TIMEOUT_CHECK_WEBSITE=10
+
+# TIMEOUT_CHECK_PHP
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_PHP=10
+#
+#TIMEOUT_CHECK_PHP=10
+
+
 # - If service is not listen on 127.0.0.1/loclhost, curl check must
 # - be ommited
 # -
@@ -70,11 +118,48 @@ check_website=false
 # -    $ mysql --login-path=local ...
 # -
 # - Example
+# -    mysql_credential_args="-u root -S /run/mysqld/mysqld.sock"
 # -    mysql_credential_args="--login-path=local"
 # -    mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
 # -    mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
 # -
-mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf"
+# - defaults to: 
+# -    mysql_credential_args="--login-path=local"
+# -
+#mysql_credential_args="--login-path=local"
+
+
+# - Additional Settings for check_mariadb
+# -
+# - MariaDB credentials
+# -
+# - Giving password on command line is insecure an sind mysql 5.5
+# - you will get a warning doing so.
+# - 
+# - Reading username/password fro file ist also possible, using MySQL/MariaDB
+# - commandline parameter '--defaults-file'.
+# - 
+# - Since Mysql Version 5.6, you can read username/password from
+# - encrypted file.
+# -
+# -    Create (encrypted) option file:
+# -    $ mysql_config_editor set --login-path=local --socket=/tmp/mysql.sock  --user=root --password
+# -    $ Password:
+# -
+# -    Use of option file:
+# -    $ mysql --login-path=local ...
+# -
+# - Example
+# -    mariadb_credential_args="-u root -S /run/mysqld/mysqld.sock"
+# -    mariadb_credential_args="--login-path=local"
+# -    mariadb_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
+# -    mariadb_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
+# -
+# - defaults to empty string
+# -    mariadb_credential_args=""
+# -
+#mariadb_credential_args=""
+mariadb_credential_args="-u root -S /run/mysqld/mysqld.sock"
 
 
 # - Additional Settings for check_php_fpm
@@ -93,7 +178,7 @@ curl_check_host=127.0.0.1
 # - Example:
 # -    php_versions="5.4 5.6 7.0 7.1"
 # -
-php_versions="8.1"
+php_versions="8.2"
 
 # - If PHP-FPM's ping.path setting does not match ping-$php_major_version,
 # - set the value given in your ping.path setting here. Give ping_path also

roles/common/files/mail.faire-mobilitaet/root/bin/monitoring/conf/check_webservice_load.conf

@@ -11,21 +11,49 @@
 # - LOGGING
 # -
 # - This Parameter is now obsolete. If script is running in a terminal, then output ist verbose,
-# - the output will be verbos. If running as cronjob, output will only be written, if warnings or 
+# - the output will be verbos. If running as cronjob, output will only be written, if warnings or
 # - errors occurs.
 # ---
 
 
+# - CONFLICTING_SCRIPTS
+# -
+# - The scripts listed here conflict with this script. If one of these scripts
+# - is currently running, this script will be stopped.
+# -
+# - In addition to the script, a LOCK directory can also be specified which is
+# - connected to it.
+# -
+# - If no fixed LOCK directory is connected to the script, set
+# - this value to the constant 'CHECK_PROCESS_LIST'.
+# -
+# - If no value for the LOCK directory is given, the LOCK directory
+# - '/tmp/<base-script_name>.LOCK' is assumed.
+# -
+# -
+# - Example:
+# -    CONFLICTING_SCRIPTS="
+# -       /root/bin/monitoring/check_webservice_load.sh:CHECK_PROCESS_LIST
+# -       /root/bin/monitoring/check_remote_websites.sh
+# -    "
+# -
+# - Defaults to:
+# -    CONFLICTING_SCRIPTS="/root/bin/monitoring/check_local_webservice.sh:/tmp/check_local_webservice.LOCK"
+# -
+#CONFLICTING_SCRIPTS=""
+
+
 # - What to check
 # -
 check_load=true
 check_mysql=false
+check_mariadb=false
 
 # - PostgreSQL
 # -
 # - NOT useful, if more than one PostgreSQL instances are running!
 # -
-check_postgresql=false
+check_postgresql=true
 
 check_apache=true
 check_nginx=false
@@ -33,6 +61,26 @@ check_php_fpm=true
 check_redis=false
 check_website=false
 
+
+# TIMEOUT_CHECK_WEBSITE
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_WEBSITE=10
+#
+#TIMEOUT_CHECK_WEBSITE=10
+
+# TIMEOUT_CHECK_PHP
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_PHP=10
+#
+#TIMEOUT_CHECK_PHP=10
+
+
 # - If service is not listen on 127.0.0.1/loclhost, curl check must
 # - be ommited
 # -
@@ -55,10 +103,10 @@ check_website=false
 # -
 # - Giving password on command line is insecure an sind mysql 5.5
 # - you will get a warning doing so.
-# - 
+# -
 # - Reading username/password fro file ist also possible, using MySQL/MariaDB
 # - commandline parameter '--defaults-file'.
-# - 
+# -
 # - Since Mysql Version 5.6, you can read username/password from
 # - encrypted file.
 # -
@@ -70,11 +118,47 @@ check_website=false
 # -    $ mysql --login-path=local ...
 # -
 # - Example
+# -    mysql_credential_args="-u root -S /run/mysqld/mysqld.sock"
 # -    mysql_credential_args="--login-path=local"
 # -    mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
 # -    mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
 # -
-mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
+# - defaults to:
+# -    mysql_credential_args="--login-path=local"
+# -
+#mysql_credential_args="--login-path=local"
+
+
+# - Additional Settings for check_mariadb
+# -
+# - MariaDB credentials
+# -
+# - Giving password on command line is insecure an sind mysql 5.5
+# - you will get a warning doing so.
+# -
+# - Reading username/password fro file ist also possible, using MySQL/MariaDB
+# - commandline parameter '--defaults-file'.
+# -
+# - Since Mysql Version 5.6, you can read username/password from
+# - encrypted file.
+# -
+# -    Create (encrypted) option file:
+# -    $ mysql_config_editor set --login-path=local --socket=/tmp/mysql.sock  --user=root --password
+# -    $ Password:
+# -
+# -    Use of option file:
+# -    $ mysql --login-path=local ...
+# -
+# - Example
+# -    mariadb_credential_args="-u root -S /run/mysqld/mysqld.sock"
+# -    mariadb_credential_args="--login-path=local"
+# -    mariadb_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
+# -    mariadb_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
+# -
+# - defaults to empty string
+# -    mariadb_credential_args=""
+# -
+#mariadb_credential_args=""
 
 
 # - Additional Settings for check_php_fpm
@@ -93,7 +177,7 @@ curl_check_host=127.0.0.1
 # - Example:
 # -    php_versions="5.4 5.6 7.0 7.1"
 # -
-php_versions="8.1"
+php_versions="8.2"
 
 # - If PHP-FPM's ping.path setting does not match ping-$php_major_version,
 # - set the value given in your ping.path setting here. Give ping_path also
@@ -161,7 +245,7 @@ php_version_of_working_url=''
 
 # - Notice:
 # - If single qoutes "'" not needed inside cleanup function, then use single quotes
-# - to enclose variable "cleanup_function". Then you don't have do masquerade any 
+# - to enclose variable "cleanup_function". Then you don't have do masquerade any
 # - sign inside.
 # -
 # - Otherwise use double quotes and masq any sign to prevent bash from interpreting.

roles/common/files/mailserver/etc/postfix/smtpd_milter_map

@@ -0,0 +1,23 @@
+# Disable Milters for local clients.
+#127.0.0.0/8                      DISABLE
+#192.168.0.0/16                   DISABLE
+#172.16.0.0/12                    DISABLE
+#::/64                            DISABLE
+
+# Disable Milters for b.mx.oopen.de
+162.55.82.73                     DISABLE
+2a01:4f8:271:1266::73            DISABLE
+
+# Disable Milters for d.mx.oopen.de
+95.217.204.227                   DISABLE
+2a01:4f9:4a:47e5::227            DISABLE
+
+# Disable Milters for lists.mx.warenform.de
+83.223.86.78                     DISABLE
+2a01:30:0:13:223:35ff:fef5:84b6  DISABLE
+
+# Disable Milters for lists36.net
+192.68.11.82                     DISABLE
+2001:678:a40:3000::82            DISABLE
+
+

roles/common/files/mx.warenform/root/bin/monitoring/conf/check_webservice_load.conf

@@ -11,30 +11,102 @@
 # - LOGGING
 # -
 # - This Parameter is now obsolete. If script is running in a terminal, then output ist verbose,
-# - the output will be verbos. If running as cronjob, output will only be written, if warnings or 
+# - the output will be verbos. If running as cronjob, output will only be written, if warnings or
 # - errors occurs.
 # ---
 
 
+# - CONFLICTING_SCRIPTS
+# -
+# - The scripts listed here conflict with this script. If one of these scripts
+# - is currently running, this script will be stopped.
+# -
+# - In addition to the script, a LOCK directory can also be specified which is
+# - connected to it.
+# -
+# - If no fixed LOCK directory is connected to the script, set
+# - this value to the constant 'CHECK_PROCESS_LIST'.
+# -
+# - If no value for the LOCK directory is given, the LOCK directory
+# - '/tmp/<base-script_name>.LOCK' is assumed.
+# -
+# -
+# - Example:
+# -    CONFLICTING_SCRIPTS="
+# -       /root/bin/monitoring/check_webservice_load.sh:CHECK_PROCESS_LIST
+# -       /root/bin/monitoring/check_remote_websites.sh
+# -    "
+# -
+# - Defaults to:
+# -    CONFLICTING_SCRIPTS="/root/bin/monitoring/check_local_webservice.sh:/tmp/check_local_webservice.LOCK"
+# -
+#CONFLICTING_SCRIPTS=""
+
+
 # - What to check
 # -
 check_load=true
 check_mysql=false
+check_mariadb=false
+
+# - PostgreSQL
+# -
+# - NOT useful, if more than one PostgreSQL instances are running!
+# -
+check_postgresql=true
+
 check_apache=true
+check_nginx=false
 check_php_fpm=true
+check_redis=false
 check_website=false
 
 
+# TIMEOUT_CHECK_WEBSITE
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_WEBSITE=10
+#
+#TIMEOUT_CHECK_WEBSITE=10
+
+# TIMEOUT_CHECK_PHP
+#
+# Maximum time in seconds that you allow for the response from the webserver.
+#
+# Defaults to:
+#     TIMEOUT_CHECK_PHP=10
+#
+#TIMEOUT_CHECK_PHP=10
+
+
+# - If service is not listen on 127.0.0.1/loclhost, curl check must
+# - be ommited
+# -
+# - Defaults to: ommit_curl_check_nginx=false
+# -
+#ommit_curl_check_nginx=false
+
+# - Is this a vserver guest machine?
+# -
+# - Not VSerber guest host does not support systemd!
+# -
+# - defaults to: vserver_guest=false
+# -
+#vserver_guest=false
+
+
 # - Additional Settings for check_mysql
 # -
 # - MySQL / MariaDB credentials
 # -
 # - Giving password on command line is insecure an sind mysql 5.5
 # - you will get a warning doing so.
-# - 
+# -
 # - Reading username/password fro file ist also possible, using MySQL/MariaDB
 # - commandline parameter '--defaults-file'.
-# - 
+# -
 # - Since Mysql Version 5.6, you can read username/password from
 # - encrypted file.
 # -
@@ -46,11 +118,47 @@ check_website=false
 # -    $ mysql --login-path=local ...
 # -
 # - Example
+# -    mysql_credential_args="-u root -S /run/mysqld/mysqld.sock"
 # -    mysql_credential_args="--login-path=local"
 # -    mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
 # -    mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
 # -
-mysql_credential_args=""
+# - defaults to:
+# -    mysql_credential_args="--login-path=local"
+# -
+#mysql_credential_args="--login-path=local"
+
+
+# - Additional Settings for check_mariadb
+# -
+# - MariaDB credentials
+# -
+# - Giving password on command line is insecure an sind mysql 5.5
+# - you will get a warning doing so.
+# -
+# - Reading username/password fro file ist also possible, using MySQL/MariaDB
+# - commandline parameter '--defaults-file'.
+# -
+# - Since Mysql Version 5.6, you can read username/password from
+# - encrypted file.
+# -
+# -    Create (encrypted) option file:
+# -    $ mysql_config_editor set --login-path=local --socket=/tmp/mysql.sock  --user=root --password
+# -    $ Password:
+# -
+# -    Use of option file:
+# -    $ mysql --login-path=local ...
+# -
+# - Example
+# -    mariadb_credential_args="-u root -S /run/mysqld/mysqld.sock"
+# -    mariadb_credential_args="--login-path=local"
+# -    mariadb_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
+# -    mariadb_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
+# -
+# - defaults to empty string
+# -    mariadb_credential_args=""
+# -
+#mariadb_credential_args=""
 
 
 # - Additional Settings for check_php_fpm
@@ -69,7 +177,7 @@ curl_check_host=127.0.0.1
 # - Example:
 # -    php_versions="5.4 5.6 7.0 7.1"
 # -
-php_versions="8.1"
+php_versions="8.2"
 
 # - If PHP-FPM's ping.path setting does not match ping-$php_major_version,
 # - set the value given in your ping.path setting here. Give ping_path also
@@ -137,7 +245,7 @@ php_version_of_working_url=''
 
 # - Notice:
 # - If single qoutes "'" not needed inside cleanup function, then use single quotes
-# - to enclose variable "cleanup_function". Then you don't have do masquerade any 
+# - to enclose variable "cleanup_function". Then you don't have do masquerade any
 # - sign inside.
 # -
 # - Otherwise use double quotes and masq any sign to prevent bash from interpreting.

roles/common/templates/usr/local/src/mailsystem/conf/install_postfixadmin.conf.j2

@@ -223,11 +223,17 @@ POSTFIX_DB_TYPE="mysql"
 # -
 # - Note:
 # - Dont't use 'localhost' if your MySQL socket is NOT
-# - located at '/var/run/mysqld/mysqld.sock'
+# - located at '/run/mysqld/mysqld.sock'
 # - 
-# - Defaults to 'unix:/tmp/mysql.sock'
+# - Defaults to:
+# -      'unix:/tmp/mysql.sock'if this socket exists at intsall time 
+# -      'unix:/run/mysqld/mysqld.sock' othwerwise
 # -
+{% if (postfix_db_host is defined) and postfix_db_host and "MySQL" == postfix_db_type %}
+POSTFIX_DB_HOST_MYSQL="{{ postfix_db_host }}"
+{% else %}
 #POSTFIX_DB_HOST_MYSQL=""
+{% endif %}
 
 # - Host/Socket of Postfix Database (PostgeSQL)
 # -
@@ -236,7 +242,7 @@ POSTFIX_DB_TYPE="mysql"
 # -
 # - Defaults to '/run/postgresql'
 # -
-{% if (postfix_db_host is defined) and postfix_db_host %}
+{% if (postfix_db_host is defined) and postfix_db_host and "PostgreSQL" == postfix_db_type %}
 POSTFIX_DB_HOST_PGSQL="{{ postfix_db_host }}"
 {% else %}
 #POSTFIX_DB_HOST_PGSQL=""