some checkmk installation adjustment

conf/geoffray-levasseur.org/banahaw.conf.sh

@@ -37,8 +37,8 @@ NET4_GW_eth0="192.168.1.230"
 NET4_NS_eth0="192.168.1.205 192.168.1.206"
 NET4_NS_SEARCH_eth0=$REALM
 
-NET4_MODE_eth2="static"
-NET4_IP_eth2="10.42.0.201/16"
+NET4_MODE_eth1="static"
+NET4_IP_eth1="10.42.0.201/16"
 
 IPV6_IFACES=""
 

conf/geoffray-levasseur.org/labo.conf.sh

@@ -31,7 +31,7 @@ WITH_LDAP_KERB=no
 REMOVE_USERS="fatal"
 
 # Network
-IPV4_IFACES="eth0 eth1 eth2"
+IPV4_IFACES="eth0 eth1"
 
 NET4_MODE_eth0="static"
 NET4_IP_eth0="192.168.1.207/24"
@@ -40,15 +40,15 @@ NET4_NS_eth0="192.168.1.205 192.168.1.206"
 NET4_NS_SEARCH_eth0=$REALM
 
 NET4_MODE_eth1="static"
-NET4_IP_eth1="10.0.254.207/16"
+NET4_IP_eth1="10.42.0.207/16"
 
-IPV6_IFACES="eth0"
+IPV6_IFACES=""
 
-NET6_MODE_eth0="static"
-NET6_IP_eth0="2a03:7220:8081:b301::cf/64"
-NET6_GW_eth0="2a03:7220:8081:b301::e6"
-NET6_NS_eth0="2a03:7220:8081:b301::cd 2a03:7220:8081:b301::ce"
-NET6_NS_SEARCH_eth0=$REALM
+#NET6_MODE_eth0="static"
+#NET6_IP_eth0="2a03:7220:8081:b301::cf/64"
+#NET6_GW_eth0="2a03:7220:8081:b301::e6"
+#NET6_NS_eth0="2a03:7220:8081:b301::cd 2a03:7220:8081:b301::ce"
+#NET6_NS_SEARCH_eth0=$REALM
 
 # Mode d'installation :
 # * dev : installe les paquets un par un avec apt (lent)
@@ -56,7 +56,7 @@ NET6_NS_SEARCH_eth0=$REALM
 INTALL_MODE=full
 
 # Paquets additionnels
-PKGSEL="$PKGSEL nsd"
+PKGSEL="$PKGSEL nsd ldnsutils haveged"
 
 # ------------------------------------------------------------------------------
 # -------------------------- Section modules d'init ----------------------------

conf/geoffray-levasseur.org/natib.conf.sh

@@ -40,9 +40,9 @@ NET4_NS_eth0="192.168.1.206 192.168.1.205"
 NET4_NS_SEARCH_eth0=$REALM
 
 NET4_MODE_eth1="static"
-NET4_IP_eth1="10.0.254.208/16"
+NET4_IP_eth1="10.42.0.208/16"
 
-IPV6_IFACES="eth0"
+IPV6_IFACES=""
 
 NET6_MODE_eth0="static"
 NET6_IP_eth0="2a03:7220:8081:b301::d0/64"
@@ -56,7 +56,7 @@ NET6_NS_SEARCH_eth0=$REALM
 INTALL_MODE=full
 
 # Paquets additionnels
-PKGSEL="$PKGSEL nsd"
+PKGSEL="$PKGSEL nsd ldnsutils haveged"
 
 # ------------------------------------------------------------------------------
 # -------------------------- Section modules d'init ----------------------------

conf/includes/gl.conf.sh

@@ -33,7 +33,7 @@ export SSHD_PERMITROOT_RANGE="192.168.1.0/24"
 
 # Check MK
 export MK_VERSION="2.2.0p21-1"
-export MK_URL="https://nagios.geoffray-levasseur.org/check_mk/check_mk/agents/check-mk-agent_${MK_VERSION}_all.deb"
+export MK_URL="http://192.168.1.201/check_mk/check_mk/agents/check-mk-agent_${MK_VERSION}_all.deb"
 export MK_SERVER_IP="192.168.1.201"
 
 # Samba

conf/includes/pkgsel.base.conf.sh

@@ -12,7 +12,7 @@ export PKGS_BASE="debconf-utils debhelper deborphan ethtool cpufrequtils \
     mailutils htop lsof ltrace strace bash-completion host dnsutils \
     sysstat ifstat iftop iotop mtr-tiny tcpdump mc pbzip2 pigz \
     xz-utils zip unzip plzip lzip ftp lftp bc dc dos2unix psmisc udunits-bin \
-    whois tmux screen debconf-doc dump figlet gawk gpm multitail neofetch nmap \
+    whois tmux screen debconf-doc dump figlet gawk multitail neofetch nmap \
     oping pv traceroute rsync tree git qemu-guest-agent ca-certificates"
 
 # Agregation of the package lists

modules/install_mkagent.sh

@@ -26,9 +26,9 @@ install_mkagent()
     tag_file /etc/xinetd.d/check_mk
     sed -i -e "s/@MK_SERVER_IP@/$MK_SERVER_IP/" /etc/xinetd.d/check_mk
 
-    mkdir -pv /usr/lib/check_mk_agent/plugins/28800
-    install_file cmk/mk_apt /usr/lib/check_mk_agent/plugins/28800/mk_apt
-    
+    mkdir -pv /usr/lib/check_mk_agent/plugins/7200
+    install_file cmk/mk_apt /usr/lib/check_mk_agent/plugins/7200/mk_apt
+
     # Cmk > 2.1, configure agent
     if [[ -e /var/lib/cmk-agent/cmk-agent-ctl.gz ]]; then
         gunzip /var/lib/cmk-agent/cmk-agent-ctl.gz
@@ -36,9 +36,8 @@ install_mkagent()
         scp -O $MK_SERVER_IP:/etc/check_mk/agentpwd /tmp/mk-pwd
         /var/lib/cmk-agent/cmk-agent-ctl register --hostname $HOSTNAME \
             --server $MK_SERVER_IP --site check_mk --user check_mk --password \
-            "$(read /etc/mk-pwd)"
+            "$(read /tmp/mk-pwd)"
     fi
-
     svc_restart xinetd
 }