All stretch checks must be enabled for buster too

This commit is contained in:
Benoît S. 2019-07-05 15:22:30 +02:00
parent b493a13438
commit abd63fe248

View file

@ -163,7 +163,7 @@ check_dpkgwarning() {
test -e /etc/apt/apt.conf \ test -e /etc/apt/apt.conf \
&& failed "IS_DPKGWARNING" "/etc/apt/apt.conf is missing" && failed "IS_DPKGWARNING" "/etc/apt/apt.conf is missing"
fi fi
elif is_debian_stretch; then elif is_debian_stretch || is_debian_buster; then
test -e /etc/apt/apt.conf.d/z-evolinux.conf \ test -e /etc/apt/apt.conf.d/z-evolinux.conf \
|| failed "IS_DPKGWARNING" "/etc/apt/apt.conf.d/z-evolinux.conf is missing" || failed "IS_DPKGWARNING" "/etc/apt/apt.conf.d/z-evolinux.conf is missing"
fi fi
@ -228,12 +228,12 @@ check_aptitudeonly() {
fi fi
} }
check_aptitude() { check_aptitude() {
if is_debian_jessie || is_debian_stretch; then if is_debian_jessie || is_debian_stretch || is_debian_buster; then
test -e /usr/bin/aptitude && failed "IS_APTITUDE" test -e /usr/bin/aptitude && failed "IS_APTITUDE"
fi fi
} }
check_aptgetbak() { check_aptgetbak() {
if is_debian_jessie || is_debian_stretch; then if is_debian_jessie || is_debian_stretch || is_debian_buster; then
test -e /usr/bin/apt-get.bak && failed "IS_APTGETBAK" test -e /usr/bin/apt-get.bak && failed "IS_APTGETBAK"
fi fi
} }
@ -514,7 +514,7 @@ check_network_interfaces() {
} }
# Verify if all if are in auto # Verify if all if are in auto
check_autoif() { check_autoif() {
if is_debian_stretch; then if is_debian_stretch || is_debian_buster; then
interfaces=$(/sbin/ip address show up | grep "^[0-9]*:" | grep -E -v "(lo|vnet|docker|veth|tun|tap|macvtap)" | cut -d " " -f 2 | tr -d : | cut -d@ -f1 | tr "\n" " ") interfaces=$(/sbin/ip address show up | grep "^[0-9]*:" | grep -E -v "(lo|vnet|docker|veth|tun|tap|macvtap)" | cut -d " " -f 2 | tr -d : | cut -d@ -f1 | tr "\n" " ")
else else
interfaces=$(/sbin/ifconfig -s | tail -n +2 | grep -E -v "^(lo|vnet|docker|veth|tun|tap|macvtap)" | cut -d " " -f 1 |tr "\n" " ") interfaces=$(/sbin/ifconfig -s | tail -n +2 | grep -E -v "^(lo|vnet|docker|veth|tun|tap|macvtap)" | cut -d " " -f 1 |tr "\n" " ")
@ -727,7 +727,7 @@ check_tune2fs_m5() {
done done
} }
check_evolinuxsudogroup() { check_evolinuxsudogroup() {
if is_debian_stretch; then if is_debian_stretch || is_debian_buster; then
if grep -q "^evolinux-sudo:" /etc/group; then if grep -q "^evolinux-sudo:" /etc/group; then
grep -q '^%evolinux-sudo ALL=(ALL:ALL) ALL' /etc/sudoers.d/evolinux \ grep -q '^%evolinux-sudo ALL=(ALL:ALL) ALL' /etc/sudoers.d/evolinux \
|| failed "IS_EVOLINUXSUDOGROUP" || failed "IS_EVOLINUXSUDOGROUP"
@ -735,7 +735,7 @@ check_evolinuxsudogroup() {
fi fi
} }
check_userinadmgroup() { check_userinadmgroup() {
if is_debian_stretch; then if is_debian_stretch || is_debian_buster; then
users=$(grep "^evolinux-sudo:" /etc/group | awk -F: '{print $4}' | tr ',' ' ') users=$(grep "^evolinux-sudo:" /etc/group | awk -F: '{print $4}' | tr ',' ' ')
for user in $users; do for user in $users; do
if ! groups "$user" | grep -q adm; then if ! groups "$user" | grep -q adm; then
@ -746,15 +746,17 @@ check_userinadmgroup() {
fi fi
} }
check_apache2evolinuxconf() { check_apache2evolinuxconf() {
if is_debian_stretch && test -d /etc/apache2; then if is_debian_stretch || is_debian_buster; then
{ test -L /etc/apache2/conf-enabled/z-evolinux-defaults.conf \ if test -d /etc/apache2; then
&& test -L /etc/apache2/conf-enabled/zzz-evolinux-custom.conf \ { test -L /etc/apache2/conf-enabled/z-evolinux-defaults.conf \
&& test -f /etc/apache2/ipaddr_whitelist.conf; && test -L /etc/apache2/conf-enabled/zzz-evolinux-custom.conf \
} || failed "IS_APACHE2EVOLINUXCONF" && test -f /etc/apache2/ipaddr_whitelist.conf;
} || failed "IS_APACHE2EVOLINUXCONF"
fi
fi fi
} }
check_backportsconf() { check_backportsconf() {
if is_debian_stretch; then if is_debian_stretch || is_debian_buster; then
grep -qsE "^[^#].*backports" /etc/apt/sources.list \ grep -qsE "^[^#].*backports" /etc/apt/sources.list \
&& failed "IS_BACKPORTSCONF" "backports can't be in main sources list" && failed "IS_BACKPORTSCONF" "backports can't be in main sources list"
if grep -qsE "^[^#].*backports" /etc/apt/sources.list.d/*.list; then if grep -qsE "^[^#].*backports" /etc/apt/sources.list.d/*.list; then
@ -764,15 +766,19 @@ check_backportsconf() {
fi fi
} }
check_bind9munin() { check_bind9munin() {
if is_debian_stretch && is_installed bind9; then if is_debian_stretch || is_debian_buster; then
{ test -L /etc/munin/plugins/bind9 \ if is_installed bind9; then
&& test -e /etc/munin/plugin-conf.d/bind9; { test -L /etc/munin/plugins/bind9 \
} || failed "IS_BIND9MUNIN" && test -e /etc/munin/plugin-conf.d/bind9;
} || failed "IS_BIND9MUNIN"
fi
fi fi
} }
check_bind9logrotate() { check_bind9logrotate() {
if is_debian_stretch && is_installed bind9; then if is_debian_stretch || is_debian_buster; then
test -e /etc/logrotate.d/bind9 || failed "IS_BIND9LOGROTATE" if is_installed bind9; then
test -e /etc/logrotate.d/bind9 || failed "IS_BIND9LOGROTATE"
fi
fi fi
} }
check_broadcomfirmware() { check_broadcomfirmware() {
@ -803,7 +809,7 @@ check_hardwareraidtool() {
fi fi
} }
check_log2mailsystemdunit() { check_log2mailsystemdunit() {
if is_debian_stretch; then if is_debian_stretch || is_debian_buster; then
{ systemctl -q is-active log2mail.service \ { systemctl -q is-active log2mail.service \
&& test -f /etc/systemd/system/log2mail.service \ && test -f /etc/systemd/system/log2mail.service \
&& ! test -f /etc/init.d/log2mail; && ! test -f /etc/init.d/log2mail;
@ -816,7 +822,7 @@ check_listupgrade() {
} || failed "IS_LISTUPGRADE" } || failed "IS_LISTUPGRADE"
} }
check_mariadbevolinuxconf() { check_mariadbevolinuxconf() {
if is_debian_stretch; then if is_debian_stretch || is_debian_buster; then
if is_installed mariadb-server; then if is_installed mariadb-server; then
{ test -f /etc/mysql/mariadb.conf.d/z-evolinux-defaults.cnf \ { test -f /etc/mysql/mariadb.conf.d/z-evolinux-defaults.cnf \
&& test -f /etc/mysql/mariadb.conf.d/zzz-evolinux-custom.cnf; && test -f /etc/mysql/mariadb.conf.d/zzz-evolinux-custom.cnf;
@ -882,65 +888,78 @@ check_elastic_backup() {
fi fi
} }
check_mariadbsystemdunit() { check_mariadbsystemdunit() {
if is_debian_stretch && is_installed mariadb-server; then if is_debian_stretch || is_debian_buster; then
{ systemctl -q is-active mariadb.service \ if is_installed mariadb-server; then
&& test -f /etc/systemd/system/mariadb.service.d/evolinux.conf; if systemctl -q is-active mariadb.service; then
} || failed "IS_MARIADBSYSTEMDUNIT" test -f /etc/systemd/system/mariadb.service.d/evolinux.conf \
|| failed "IS_MARIADBSYSTEMDUNIT"
fi
fi
fi fi
} }
check_mysqlmunin() { check_mysqlmunin() {
if is_debian_stretch && is_installed mariadb-server; then if is_debian_stretch || is_debian_buster; then
for file in mysql_bytes mysql_queries mysql_slowqueries \ if is_installed mariadb-server; then
mysql_threads mysql_connections mysql_files_tables \ for file in mysql_bytes mysql_queries mysql_slowqueries \
mysql_innodb_bpool mysql_innodb_bpool_act mysql_innodb_io \ mysql_threads mysql_connections mysql_files_tables \
mysql_innodb_log mysql_innodb_rows mysql_innodb_semaphores \ mysql_innodb_bpool mysql_innodb_bpool_act mysql_innodb_io \
mysql_myisam_indexes mysql_qcache mysql_qcache_mem \ mysql_innodb_log mysql_innodb_rows mysql_innodb_semaphores \
mysql_sorts mysql_tmp_tables; do mysql_myisam_indexes mysql_qcache mysql_qcache_mem \
mysql_sorts mysql_tmp_tables; do
if [[ ! -L /etc/munin/plugins/$file ]]; then
failed "IS_MYSQLMUNIN" "Munin plugin '$file' is missing" if [[ ! -L /etc/munin/plugins/$file ]]; then
test "${VERBOSE}" = 1 || break failed "IS_MYSQLMUNIN" "Munin plugin '$file' is missing"
fi test "${VERBOSE}" = 1 || break
done fi
done
fi
fi fi
} }
check_mysqlnrpe() { check_mysqlnrpe() {
if is_debian_stretch && is_installed mariadb-server; then if is_debian_stretch || is_debian_buster; then
nagios_file=~nagios/.my.cnf if is_installed mariadb-server; then
nagios_file=~nagios/.my.cnf
if ! test -f ${nagios_file}; then if ! test -f ${nagios_file}; then
failed "IS_MYSQLNRPE" "${nagios_file} is missing" failed "IS_MYSQLNRPE" "${nagios_file} is missing"
elif [ "$(stat -c %U ${nagios_file})" != "nagios" ] \ elif [ "$(stat -c %U ${nagios_file})" != "nagios" ] \
|| [ "$(stat -c %a ${nagios_file})" != "600" ]; then || [ "$(stat -c %a ${nagios_file})" != "600" ]; then
failed "IS_MYSQLNRPE" "${nagios_file} has wrong permissions" failed "IS_MYSQLNRPE" "${nagios_file} has wrong permissions"
else else
grep -q -F "command[check_mysql]=/usr/lib/nagios/plugins/check_mysql" /etc/nagios/nrpe.d/evolix.cfg \ grep -q -F "command[check_mysql]=/usr/lib/nagios/plugins/check_mysql" /etc/nagios/nrpe.d/evolix.cfg \
|| failed "IS_MYSQLNRPE" "check_mysql is missing" || failed "IS_MYSQLNRPE" "check_mysql is missing"
fi
fi fi
fi fi
} }
check_phpevolinuxconf() { check_phpevolinuxconf() {
if is_debian_stretch && is_installed php; then if is_debian_stretch || is_debian_buster; then
{ test -f /etc/php/7.0/cli/conf.d/z-evolinux-defaults.ini \ if is_installed php; then
&& test -f /etc/php/7.0/cli/conf.d/zzz-evolinux-custom.ini; { test -f /etc/php/7.0/cli/conf.d/z-evolinux-defaults.ini \
} || failed "IS_PHPEVOLINUXCONF" && test -f /etc/php/7.0/cli/conf.d/zzz-evolinux-custom.ini
} || failed "IS_PHPEVOLINUXCONF"
fi
fi fi
} }
check_squidlogrotate() { check_squidlogrotate() {
if is_debian_stretch && is_installed squid; then if is_debian_stretch || is_debian_buster; then
grep -q monthly /etc/logrotate.d/squid || failed "IS_SQUIDLOGROTATE" if is_installed squid; then
grep -q monthly /etc/logrotate.d/squid \
|| failed "IS_SQUIDLOGROTATE"
fi
fi fi
} }
check_squidevolinuxconf() { check_squidevolinuxconf() {
if is_debian_stretch && is_installed squid; then if is_debian_stretch || is_debian_buster; then
{ grep -qs "^CONFIG=/etc/squid/evolinux-defaults.conf$" /etc/default/squid \ if is_installed squid; then
&& test -f /etc/squid/evolinux-defaults.conf \ { grep -qs "^CONFIG=/etc/squid/evolinux-defaults.conf$" /etc/default/squid \
&& test -f /etc/squid/evolinux-whitelist-defaults.conf \ && test -f /etc/squid/evolinux-defaults.conf \
&& test -f /etc/squid/evolinux-whitelist-custom.conf \ && test -f /etc/squid/evolinux-whitelist-defaults.conf \
&& test -f /etc/squid/evolinux-acl.conf \ && test -f /etc/squid/evolinux-whitelist-custom.conf \
&& test -f /etc/squid/evolinux-httpaccess.conf \ && test -f /etc/squid/evolinux-acl.conf \
&& test -f /etc/squid/evolinux-custom.conf; && test -f /etc/squid/evolinux-httpaccess.conf \
} || failed "IS_SQUIDEVOLINUXCONF" && test -f /etc/squid/evolinux-custom.conf;
} || failed "IS_SQUIDEVOLINUXCONF"
fi
fi fi
} }
check_duplicate_fs_label() { check_duplicate_fs_label() {
@ -1004,7 +1023,7 @@ check_apache_confenabled() {
# Starting from Jessie and Apache 2.4, /etc/apache2/conf.d/ # Starting from Jessie and Apache 2.4, /etc/apache2/conf.d/
# must be replaced by conf-available/ and config files symlinked # must be replaced by conf-available/ and config files symlinked
# to conf-enabled/ # to conf-enabled/
if is_debian_jessie || is_debian_stretch; then if is_debian_jessie || is_debian_stretch || is_debian_buster; then
if [ -f /etc/apache2/apache2.conf ]; then if [ -f /etc/apache2/apache2.conf ]; then
test -d /etc/apache2/conf.d/ && failed "IS_APACHE_CONFENABLED" test -d /etc/apache2/conf.d/ && failed "IS_APACHE_CONFENABLED"
grep -q 'Include conf.d' /etc/apache2/apache2.conf && failed "IS_APACHE_CONFENABLED" grep -q 'Include conf.d' /etc/apache2/apache2.conf && failed "IS_APACHE_CONFENABLED"
@ -1014,7 +1033,7 @@ check_apache_confenabled() {
check_meltdown_spectre() { check_meltdown_spectre() {
# For Stretch, detection is easy as the kernel use # For Stretch, detection is easy as the kernel use
# /sys/devices/system/cpu/vulnerabilities/ # /sys/devices/system/cpu/vulnerabilities/
if is_debian_stretch; then if is_debian_stretch || is_debian_buster; then
for vuln in meltdown spectre_v1 spectre_v2; do for vuln in meltdown spectre_v1 spectre_v2; do
test -f "/sys/devices/system/cpu/vulnerabilities/$vuln" \ test -f "/sys/devices/system/cpu/vulnerabilities/$vuln" \
|| failed "IS_MELTDOWN_SPECTRE" || failed "IS_MELTDOWN_SPECTRE"
@ -1073,7 +1092,7 @@ check_sshpermitrootno() {
fi fi
} }
check_evomaintenanceusers() { check_evomaintenanceusers() {
if is_debian_stretch; then if is_debian_stretch || is_debian_buster; then
users=$(getent group evolinux-sudo | cut -d':' -f4 | tr ',' ' ') users=$(getent group evolinux-sudo | cut -d':' -f4 | tr ',' ' ')
else else
if [ -f /etc/sudoers.d/evolinux ]; then if [ -f /etc/sudoers.d/evolinux ]; then