Merge branch 'master' into mysql_detect_mysqldump

1 files changed, 63 insertions, 29 deletions

diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index 4021c104..dcf778bc 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -5,27 +5,63 @@ set -e
 
 export DEBIAN_FRONTEND=noninteractive
 
-apt-get update
-apt-get -y install software-properties-common
-if [ $(lsb_release -is) = "Debian" ]; then
-  apt-add-repository non-free
-  apt-get update
+source /etc/os-release
+
+if [ ${ID} = "debian" ]; then
+        if [ -f /etc/apt/sources.list.d/debian.sources  ]; then
+                sed "s/main/non-free contrib/g" /etc/apt/sources.list.d/debian.sources > /etc/apt/sources.list.d/debian-nonfree.sources
+        else
+                apt-get update
+                apt-get -y install software-properties-common
+                apt-add-repository non-free
+        fi
 fi
-apt-get -y install perl autotools-dev libdbi-dev libldap2-dev libpq-dev libradcli-dev libnet-snmp-perl procps
-apt-get -y install libdbi0-dev libdbd-sqlite3 libssl-dev dnsutils snmp-mibs-downloader libsnmp-perl snmpd
-apt-get -y install fping snmp netcat-openbsd smbclient vsftpd apache2 ssl-cert postfix libhttp-daemon-ssl-perl
-apt-get -y install libdbd-sybase-perl libnet-dns-perl
-apt-get -y install slapd ldap-utils
-apt-get -y install gcc make autoconf automake gettext
-apt-get -y install faketime
-apt-get -y install libmonitoring-plugin-perl
-apt-get -y install libcurl4-openssl-dev
-apt-get -y install liburiparser-dev
-apt-get -y install squid
-apt-get -y install openssh-server
-apt-get -y install mariadb-server mariadb-client libmariadb-dev
-apt-get -y install cron iputils-ping
-apt-get -y install iproute2
+apt-get update
+apt-get -y install perl \
+        autotools-dev \
+        libdbi-dev \
+        libldap2-dev \
+        libpq-dev \
+        libradcli-dev \
+        libnet-snmp-perl \
+        procps \
+        libdbi0-dev \
+        libdbd-sqlite3 \
+        libssl-dev \
+        dnsutils \
+        snmp-mibs-downloader \
+        libsnmp-perl \
+        snmpd \
+        fping \
+        snmp \
+        netcat-openbsd \
+        smbclient \
+        vsftpd \
+        apache2 \
+        ssl-cert \
+        postfix \
+        libhttp-daemon-ssl-perl \
+        libdbd-sybase-perl \
+        libnet-dns-perl \
+        slapd \
+        ldap-utils \
+        gcc \
+        make \
+        autoconf \
+        automake \
+        gettext \
+        faketime \
+        libmonitoring-plugin-perl \
+        libcurl4-openssl-dev \
+        liburiparser-dev \
+        squid \
+        openssh-server \
+        mariadb-server \
+        mariadb-client \
+        libmariadb-dev \
+        cron \
+        iputils-ping \
+        iproute2
 
 # remove ipv6 interface from hosts
 if [ $(ip addr show | grep "inet6 ::1" | wc -l) -eq "0" ]; then
@@ -37,7 +73,6 @@ ip addr show
 
 cat /etc/hosts
 
-
 # apache
 a2enmod ssl
 a2ensite default-ssl
@@ -53,7 +88,7 @@ cp tools/squid.conf /etc/squid/squid.conf
 service squid start
 
 # mariadb
-service mariadb start
+service mariadb start || service mysql start
 mysql -e "create database IF NOT EXISTS test;" -uroot
 
 # ldap
@@ -73,12 +108,7 @@ ssh -tt localhost </dev/null >/dev/null 2>/dev/null &
 disown %1
 
 # snmpd
-for DIR in /usr/share/snmp/mibs /usr/share/mibs; do
-    rm -f $DIR/ietf/SNMPv2-PDU \
-          $DIR/ietf/IPSEC-SPD-MIB \
-          $DIR/ietf/IPATM-IPMC-MIB \
-          $DIR/iana/IANA-IPPM-METRICS-REGISTRY-MIB
-done
+service snmpd stop
 mkdir -p /var/lib/snmp/mib_indexes
 sed -e 's/^agentaddress.*/agentaddress 127.0.0.1/' -i /etc/snmp/snmpd.conf
 service snmpd start
@@ -86,7 +116,11 @@ service snmpd start
 # start cron, will be used by check_nagios
 cron
 
-# start postfix
+# postfix
+cat <<EOD >> /etc/postfix/master.cf
+smtps     inet  n       -       n       -       -       smtpd
+  -o smtpd_tls_wrappermode=yes
+EOD
 service postfix start
 
 # start ftpd