diff --git a/conf/geoffray-levasseur.org/banahaw.conf.sh b/conf/geoffray-levasseur.org/banahaw.conf.sh index cb313a7..ac9776f 100644 --- a/conf/geoffray-levasseur.org/banahaw.conf.sh +++ b/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="" diff --git a/conf/geoffray-levasseur.org/labo.conf.sh b/conf/geoffray-levasseur.org/labo.conf.sh index 977e9b2..832347d 100644 --- a/conf/geoffray-levasseur.org/labo.conf.sh +++ b/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 ---------------------------- diff --git a/conf/geoffray-levasseur.org/natib.conf.sh b/conf/geoffray-levasseur.org/natib.conf.sh index 6788708..cfc1b9f 100644 --- a/conf/geoffray-levasseur.org/natib.conf.sh +++ b/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 ---------------------------- diff --git a/conf/includes/gl.conf.sh b/conf/includes/gl.conf.sh index c223ee1..e62da96 100644 --- a/conf/includes/gl.conf.sh +++ b/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 diff --git a/conf/includes/pkgsel.base.conf.sh b/conf/includes/pkgsel.base.conf.sh index e838e11..72bebd3 100644 --- a/conf/includes/pkgsel.base.conf.sh +++ b/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