reconfigure arayat

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

@@ -41,7 +41,7 @@ NET4_NS_eth0="192.168.1.205 192.168.1.206"
 NET4_NS_SEARCH_eth0=$REALM
 
 NET4_MODE_eth1="static"
-NET4_IP_eth1="192.168.74.220/24"
+NET4_IP_eth1="192.168.74.100/24"
 
 NET4_MODE_eth2="static"
 NET4_IP_eth2="10.42.250.100/16"
@@ -63,7 +63,7 @@ NET6_IP_eth1="2a03:7220:8081:b34a::dc/64"
 INTALL_MODE=full
 
 # Paquets additionnels
-PKGSEL="$PKGSEL iptables fail2ban curl"
+PKGSEL="$PKGSEL iptables curl"
 
 # ------------------------------------------------------------------------------
 # -------------------------- Section modules d'init ----------------------------

conf/includes/gl.conf.sh

@@ -34,12 +34,12 @@ export SHARED_HOME="false"
 export SSHD_PERMITROOT_RANGE="192.168.1.0/24"
 
 # Check MK
-export MK_VERSION="2.4.0p12-1"
+#export MK_VERSION="2.4.0p12-1" #shoud be autodetected now
 export MK_SERVER_IP="192.168.1.201"
 export MK_SITE="check_mk"
-export MK_URL="http://$MK_SERVER_IP/$MK_SITE/check_mk/agents/check-mk-agent_${MK_VERSION}_all.deb"
+export MK_URL="http://$MK_SERVER_IP/$MK_SITE/check_mk/agents/check-mk-agent_latest_all.deb"
 export MK_SECRET="file:/share/services/gestparc/mk_secret"
-
+export MK_USER="cmk-agent"
 
 # Samba
 export SMBSRV="silay.$REALM"

modules/install_mkagent.sh

@@ -58,7 +58,7 @@ get_checkmk_version_from_server()
                 | grep -E '^2\.[0-9]+(\.[0-9]+)?p?[0-9]*$' \
                 | grep -vE '\.[0-9]{3,}' \
                 | head -n1)
-            [[ -n "$v" ]] && { printf '%s-1' "$v"; return 0; }
+            [[ -n "$v" ]] && { printf '%s' "$v"; return 0; }
         fi
     done
 
@@ -80,7 +80,7 @@ install_mkagent()
             prnt I "Detected Check_MK version: $mkver — building fallback URL"
             # replace the literal 'latest' token in MK_URL with the detected version
             local fallback_url
-            fallback_url="${MK_URL/latest/$mkver}"
+            fallback_url="${MK_URL/latest/$mkver-1}"
             prnt I "Trying fallback URL: $fallback_url"
             if ! wget -q "$fallback_url" -O "$debfile"; then
                 prnt E "Fallback download with version $mkver failed."