From 092dd214c11f0ba68cd73c958f0f6b857db7ef86 Mon Sep 17 00:00:00 2001 From: fatalerrors Date: Fri, 20 Sep 2024 16:36:58 +0200 Subject: [PATCH 1/6] latukan conf change --- conf/geoffray-levasseur.org/latukan.conf.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/geoffray-levasseur.org/latukan.conf.sh b/conf/geoffray-levasseur.org/latukan.conf.sh index 9fb8bcd..b691c07 100644 --- a/conf/geoffray-levasseur.org/latukan.conf.sh +++ b/conf/geoffray-levasseur.org/latukan.conf.sh @@ -33,16 +33,16 @@ REMOVE_USERS= # Network IPV4_IFACES="ens18 ens19" -NET4_MODE_eth0="static" -NET4_IP_eth0="192.168.1.235/24" -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_ens18="static" +NET4_IP_ens18="192.168.1.235/24" +NET4_GW_ens18="192.168.1.230" +NET4_NS_ens18="192.168.1.205 192.168.1.206" +NET4_NS_SEARCH_ens18=$REALM -NET4_MODE_eth1="static" -NET4_IP_eth1="10.0.254.235/16" +NET4_MODE_ens19="static" +NET4_IP_ens19="10.42.250.30/24" -IPV6_IFACES="eth0" +IPV6_IFACES="ens18" NET6_MODE_eth0="static" NET6_IP_eth0="2a03:7220:8081:b301::eb/64" From 574b57001e9374ae2c7283940e77912584458318 Mon Sep 17 00:00:00 2001 From: fatalerrors Date: Fri, 20 Sep 2024 16:38:26 +0200 Subject: [PATCH 2/6] bugfix on install_mkagent and patch_snmp --- modules/install_mkagent.sh | 5 +++-- modules/patch_snmp.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/install_mkagent.sh b/modules/install_mkagent.sh index 095baa3..9391889 100644 --- a/modules/install_mkagent.sh +++ b/modules/install_mkagent.sh @@ -12,8 +12,8 @@ # * MK_PORT: Port check_mk agent will use to communicate with server # ------------------------------------------------------------------------------ -export VER_install_mkagent="0.0.6" -export DEP_install_mkagent="upgrade_dist install_pkg" +export VER_install_mkagent="0.0.7" +export DEP_install_mkagent="upgrade_dist" install_mkagent() { @@ -34,6 +34,7 @@ install_mkagent() gunzip /var/lib/cmk-agent/cmk-agent-ctl.gz chmod +x /var/lib/cmk-agent/cmk-agent-ctl scp -O $MK_SERVER_IP:/etc/check_mk/agentpwd /tmp/mk-pwd + sleep 1 # Some execution of cmk-agent-ctl have failed with file not found without that line /var/lib/cmk-agent/cmk-agent-ctl register --hostname $HOSTNAME \ --server $MK_SERVER_IP --site check_mk --user check_mk --password \ "$(read /tmp/mk-pwd)" diff --git a/modules/patch_snmp.sh b/modules/patch_snmp.sh index 6a3cc30..b2629f8 100644 --- a/modules/patch_snmp.sh +++ b/modules/patch_snmp.sh @@ -8,8 +8,8 @@ # https://opensource.org/licenses/BSD-3-Clause # ------------------------------------------------------------------------------ -export VER_patch_snmp="0.1.2" -export DEP_patch_snmp="install_pkg" +export VER_patch_snmp="0.1.3" +export DEP_patch_snmp="" patch_snmp() { From 66dd6f28432ae0d660034800138ae48d48d9c086 Mon Sep 17 00:00:00 2001 From: fatalerrors Date: Fri, 20 Sep 2024 17:04:06 +0200 Subject: [PATCH 3/6] updated check_mk version --- conf/includes/gl.conf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/includes/gl.conf.sh b/conf/includes/gl.conf.sh index e62da96..ccfed3a 100644 --- a/conf/includes/gl.conf.sh +++ b/conf/includes/gl.conf.sh @@ -32,7 +32,7 @@ export SHARED_HOME="false" export SSHD_PERMITROOT_RANGE="192.168.1.0/24" # Check MK -export MK_VERSION="2.2.0p21-1" +export MK_VERSION="2.3.0p15-1" 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" From b244ad8ef367f1303ba607544de8ca37abb1d8fd Mon Sep 17 00:00:00 2001 From: fatalerrors Date: Fri, 20 Sep 2024 18:08:47 +0200 Subject: [PATCH 4/6] fixed conf on latukan --- conf/geoffray-levasseur.org/latukan.conf.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/geoffray-levasseur.org/latukan.conf.sh b/conf/geoffray-levasseur.org/latukan.conf.sh index b691c07..888bf70 100644 --- a/conf/geoffray-levasseur.org/latukan.conf.sh +++ b/conf/geoffray-levasseur.org/latukan.conf.sh @@ -44,11 +44,11 @@ NET4_IP_ens19="10.42.250.30/24" IPV6_IFACES="ens18" -NET6_MODE_eth0="static" -NET6_IP_eth0="2a03:7220:8081:b301::eb/64" -NET6_GW_eth0="2a03:7220:8081:b301::e7" -NET6_NS_eth0="2a03:7220:8081:b301::cd 2a03:7220:8081:b301::ce" -NET6_NS_SEARCH_eth0=$REALM +NET6_MODE_ens18="static" +NET6_IP_ens18="2a03:7220:8081:b301::1e/64" +NET6_GW_ens18="2a03:7220:8081:b301::e7" +NET6_NS_ens18="2a03:7220:8081:b301::cd 2a03:7220:8081:b301::ce" +NET6_NS_SEARCH_ens18=$REALM # Mode d'installation : From 7ed72e1c7009e357ca4f68033d85eedde0b13154 Mon Sep 17 00:00:00 2001 From: fatalerrors Date: Fri, 20 Sep 2024 18:53:56 +0200 Subject: [PATCH 5/6] long ago, upgrade_dist was required, not any more some module unmaintained marked obsolete --- modules/authnz.sh | 2 +- modules/conf_ceph.sh | 4 ++-- modules/conf_disks.sh | 2 +- modules/conf_mail.sh | 2 +- modules/conf_ssh.sh | 2 +- modules/conf_syslog.sh | 1 + modules/create_vm.sh | 2 +- modules/install_desktop.sh | 2 +- modules/install_mkagent.sh | 2 +- modules/select_system_proxy.sh | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/authnz.sh b/modules/authnz.sh index 81ea03d..01405b5 100644 --- a/modules/authnz.sh +++ b/modules/authnz.sh @@ -21,7 +21,7 @@ # ------------------------------------------------------------------------------ export VER_authnz="0.2.2" -export DEP_authnz="upgrade_dist" +export DEP_authnz="" # Users (from Ldap) add_remote_user() diff --git a/modules/conf_ceph.sh b/modules/conf_ceph.sh index 5507a13..ea63a95 100644 --- a/modules/conf_ceph.sh +++ b/modules/conf_ceph.sh @@ -16,12 +16,12 @@ # ------------------------------------------------------------------------------ export VER_conf_ceph="0.0.5" -export DEP_conf_ceph="upgrade_dist" +export DEP_conf_ceph="" conf_ceph() { # Create mount point directories - echo "Creating mount points" + prnt I "Creating mount points" mkdir -pv /srv/ceph/share mkdir -pv /share diff --git a/modules/conf_disks.sh b/modules/conf_disks.sh index 004fab5..ff6589d 100644 --- a/modules/conf_disks.sh +++ b/modules/conf_disks.sh @@ -16,7 +16,7 @@ # * CALCDRV: Target drives, preferably through ID. # ------------------------------------------------------------------------------ -export VER_conf_disks="0.0.9" +export VER_conf_disks="0.0.9-obsolete" export DEP_conf_disks="upgrade_dist" # ------------------------------------------------------------------------------ diff --git a/modules/conf_mail.sh b/modules/conf_mail.sh index e03c19f..8a67c7c 100644 --- a/modules/conf_mail.sh +++ b/modules/conf_mail.sh @@ -14,7 +14,7 @@ # ------------------------------------------------------------------------------ export VER_conf_mail="0.0.8" -export DEP_conf_mail="upgrade_dist" +export DEP_conf_mail="" conf_mail() { diff --git a/modules/conf_ssh.sh b/modules/conf_ssh.sh index 48b9740..71ede66 100644 --- a/modules/conf_ssh.sh +++ b/modules/conf_ssh.sh @@ -12,7 +12,7 @@ # ------------------------------------------------------------------------------ export VER_conf_ssh="0.1.4" -export DEP_conf_ssh="upgrade_dist" +export DEP_conf_ssh="" conf_ssh() { diff --git a/modules/conf_syslog.sh b/modules/conf_syslog.sh index 8afd9cf..be67739 100644 --- a/modules/conf_syslog.sh +++ b/modules/conf_syslog.sh @@ -15,6 +15,7 @@ export VER_conf_syslog="0.0.5" conf_syslog() { + pkginst rsyslog local syslogconf=/etc/rsyslog.conf prnt I "Configuring rsyslog..." backup_dist $syslogconf diff --git a/modules/create_vm.sh b/modules/create_vm.sh index a21085a..775b673 100644 --- a/modules/create_vm.sh +++ b/modules/create_vm.sh @@ -11,7 +11,7 @@ # To be defined # ------------------------------------------------------------------------------ -export VER_create_vm="0.0.2" +export VER_create_vm="0.0.2-obsolete" export DEP_create_vm="upgrade_dist install_pkg" create_vm() diff --git a/modules/install_desktop.sh b/modules/install_desktop.sh index 6bbe837..80b10e8 100644 --- a/modules/install_desktop.sh +++ b/modules/install_desktop.sh @@ -16,7 +16,7 @@ # ------------------------------------------------------------------------------ export VER_install_desktop="0.0.5" -export DEP_install_desktop="upgrade_dist" +export DEP_install_desktop="" install_desktop() { diff --git a/modules/install_mkagent.sh b/modules/install_mkagent.sh index 9391889..d663093 100644 --- a/modules/install_mkagent.sh +++ b/modules/install_mkagent.sh @@ -13,7 +13,7 @@ # ------------------------------------------------------------------------------ export VER_install_mkagent="0.0.7" -export DEP_install_mkagent="upgrade_dist" +export DEP_install_mkagent="" install_mkagent() { diff --git a/modules/select_system_proxy.sh b/modules/select_system_proxy.sh index abdca16..74fbd43 100644 --- a/modules/select_system_proxy.sh +++ b/modules/select_system_proxy.sh @@ -9,7 +9,7 @@ # ------------------------------------------------------------------------------ export VER_select_system_proxy="0.0.5" -export DEP_select_system_proxy="upgrade_dist" +export DEP_select_system_proxy="" select_system_proxy() { From 81d7f68a1934b78bc5fa13c5a3b9655574ade286 Mon Sep 17 00:00:00 2001 From: fatalerrors Date: Fri, 20 Sep 2024 19:05:29 +0200 Subject: [PATCH 6/6] cleaned debian and devuan repository mess --- repo/common/pkgman/debian_10.list | 15 ++++++++++----- repo/common/pkgman/debian_11.list | 24 +++++++----------------- repo/common/pkgman/debian_12.list | 10 ++++++++++ repo/common/pkgman/devuan_3.list | 4 ++-- repo/common/pkgman/devuan_4.list | 4 ++-- repo/common/pkgman/devuan_5.list | 14 +++++++------- 6 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 repo/common/pkgman/debian_12.list diff --git a/repo/common/pkgman/debian_10.list b/repo/common/pkgman/debian_10.list index cd792be..abe115f 100644 --- a/repo/common/pkgman/debian_10.list +++ b/repo/common/pkgman/debian_10.list @@ -1,5 +1,10 @@ - # Basic Debian Buster repositories - - deb http://deb.debian.org/debian buster main - deb http://deb.debian.org/debian buster-updates main - deb http://deb.debian.org/debian-security buster/updates main +# Basic Debian Buster repositories + +deb http://deb.debian.org/debian buster main contrib non-free +deb-src http://deb.debian.org/debian buster main contrib non-free + +deb http://deb.debian.org/debian buster-updates main contrib non-free +deb-src http://deb.debian.org/debian buster-updates main contrib non-free + +deb http://deb.debian.org/debian-security buster/updates main contrib non-free +deb-src http://deb.debian.org/debian-security buster/updates main contrib non-free diff --git a/repo/common/pkgman/debian_11.list b/repo/common/pkgman/debian_11.list index 3bb4760..dbcd2a6 100644 --- a/repo/common/pkgman/debian_11.list +++ b/repo/common/pkgman/debian_11.list @@ -1,20 +1,10 @@ -# deb cdrom:[Debian GNU/Linux 11.0.0 _Bullseye_ - Official amd64 NETINST 20210814-10:07]/ bullseye main +# Basic debian Bullseye reop -#deb cdrom:[Debian GNU/Linux 11.0.0 _Bullseye_ - Official amd64 NETINST 20210814-10:07]/ bullseye main +deb http://debian.univ-tlse2.fr/debian/ bullseye main contrib non-free +deb-src http://debian.univ-tlse2.fr/debian/ bullseye main contrib non-free -deb http://debian.univ-tlse2.fr/debian/ bullseye main contrib -deb-src http://debian.univ-tlse2.fr/debian/ bullseye main contrib +deb http://security.debian.org/debian-security bullseye-security main contrib non-free +deb-src http://security.debian.org/debian-security bullseye-security main contrib non-free -deb http://security.debian.org/debian-security bullseye-security main contrib -deb-src http://security.debian.org/debian-security bullseye-security main contrib - -# bullseye-updates, to get updates before a point release is made; -# see https://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_updates_and_backports -deb http://debian.univ-tlse2.fr/debian/ bullseye-updates main contrib -deb-src http://debian.univ-tlse2.fr/debian/ bullseye-updates main contrib - -# This system was installed using small removable media -# (e.g. netinst, live or single CD). The matching "deb cdrom" -# entries were disabled at the end of the installation process. -# For information about how to configure apt package sources, -# see the sources.list(5) manual. +deb http://debian.univ-tlse2.fr/debian/ bullseye-updates main contrib non-free +deb-src http://debian.univ-tlse2.fr/debian/ bullseye-updates main contrib non-free diff --git a/repo/common/pkgman/debian_12.list b/repo/common/pkgman/debian_12.list new file mode 100644 index 0000000..d16712a --- /dev/null +++ b/repo/common/pkgman/debian_12.list @@ -0,0 +1,10 @@ +# Basic Debian Bookworm repo + +deb http://debian.univ-tlse2.fr/debian/ bookworm main contrib non-free non-free-firmware +deb-src http://debian.univ-tlse2.fr/debian/ bookworm main contrib non-free non-free-firmware + +deb http://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware +deb-src http://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware + +deb http://debian.univ-tlse2.fr/debian/ bookworm-updates main contrib non-free non-free-firmware +deb-src http://debian.univ-tlse2.fr/debian/ bookworm-updates main contrib non-free non-free-firmware diff --git a/repo/common/pkgman/devuan_3.list b/repo/common/pkgman/devuan_3.list index 2e5b5ee..bc93f58 100644 --- a/repo/common/pkgman/devuan_3.list +++ b/repo/common/pkgman/devuan_3.list @@ -5,5 +5,5 @@ deb-src http://fr.deb.devuan.org/merged beowulf main contrib non-free deb http://fr.deb.devuan.org/merged beowulf-updates main contrib non-free deb-src http://fr.deb.devuan.org/merged beowulf-updates main contrib non-free -deb http://fr.deb.devuan.org/merged beowulf-backports main contrib non-free -deb-src http://fr.deb.devuan.org/merged beowulf-backports main contrib non-free +deb http://fr.deb.devuan.org/merged beowulf-security main contrib non-free +deb-src http://fr.deb.devuan.org/merged beowulf-security main contrib non-free diff --git a/repo/common/pkgman/devuan_4.list b/repo/common/pkgman/devuan_4.list index e4c58de..d5ffe01 100644 --- a/repo/common/pkgman/devuan_4.list +++ b/repo/common/pkgman/devuan_4.list @@ -5,5 +5,5 @@ deb-src http://fr.deb.devuan.org/merged chimaera main contrib non-free deb http://fr.deb.devuan.org/merged chimaera-updates main contrib non-free deb-src http://fr.deb.devuan.org/merged chimaera-updates main contrib non-free -deb http://fr.deb.devuan.org/merged chimaera-backports main contrib non-free -deb-src http://fr.deb.devuan.org/merged chimaera-backports main contrib non-free +deb http://fr.deb.devuan.org/merged chimaera-security main contrib non-free +deb-src http://fr.deb.devuan.org/merged chimaera-security main contrib non-free diff --git a/repo/common/pkgman/devuan_5.list b/repo/common/pkgman/devuan_5.list index fcd4f58..65495b8 100644 --- a/repo/common/pkgman/devuan_5.list +++ b/repo/common/pkgman/devuan_5.list @@ -1,9 +1,9 @@ -# -deb http://fr.deb.devuan.org/merged daedalus main contrib non-free -deb-src http://fr.deb.devuan.org/merged daedalus main contrib non-free +# +deb http://fr.deb.devuan.org/merged daedalus main contrib non-free non-free-firmware +deb-src http://fr.deb.devuan.org/merged daedalus main contrib non-free non-free-firmware -#deb http://fr.deb.devuan.org/merged daedalus-updates main contrib non-free -#deb-src http://fr.deb.devuan.org/merged daedalus-updates main contrib non-free +deb http://fr.deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware +deb-src http://fr.deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware -#deb http://fr.deb.devuan.org/merged daedalus-backports main contrib non-free -#deb-src http://fr.deb.devuan.org/merged daedalus-backports main contrib non-free +deb http://fr.deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware +deb-src http://fr.deb.devuan.org/merged daedalus-securtity main contrib non-free non-free-firmware