From ca97424f91b1f2dd94dfab531f2512097ab59154 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Wed, 26 Jan 2022 10:00:49 +0100 Subject: [PATCH] Updated efg.pm (telekom ipv6 disable, mx routing via ace). --- sources/dhcp.in/config | 2 +- .../efg.pm/firstboot/01_setupnetworking.sh | 3 +-- .../install/usr/local/bin/setuprouting.sh | 3 ++- .../var/named/228.10.in-addr.arpa.zonesource | 2 ++ ....0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource | 2 ++ .../var/named/in.useribm.hu.zonesource | 5 ++-- sources/start-order.txt | 9 ++++---- sources/vhost1.in/root/temperature.sh | 23 ++++++++++++------- sources/vhost2.in/root/temperature.sh | 23 ++++++++++++------- 9 files changed, 46 insertions(+), 26 deletions(-) diff --git a/sources/dhcp.in/config b/sources/dhcp.in/config index ae5824b..76e9570 100644 --- a/sources/dhcp.in/config +++ b/sources/dhcp.in/config @@ -18,4 +18,4 @@ lxc.signal.halt = SIGRTMIN+4 lxc.start.auto = 1 lxc.start.order = __CONTAINER_START_ORDER__ -lxc.start.delay = 3 +lxc.start.delay = 5 diff --git a/sources/efg.pm/firstboot/01_setupnetworking.sh b/sources/efg.pm/firstboot/01_setupnetworking.sh index 39714fd..129ef18 100755 --- a/sources/efg.pm/firstboot/01_setupnetworking.sh +++ b/sources/efg.pm/firstboot/01_setupnetworking.sh @@ -68,8 +68,7 @@ nmcli connection add \ ipv4.method "manual" \ ipv4.route-metric 100 \ ipv4.routes "10.228.0.0/16 192.168.173.1, 192.168.42.0/24 192.168.173.1, 192.168.43.0/24 192.168.173.1" \ - ipv6.method "auto" \ - ipv6.route-metric 200 \ + ipv6.method "disabled" \ save yes #ipv4.route-table 150 \ # magyar telekom -> mt (13 * 10 + 20) diff --git a/sources/efg.pm/postinstall/install/usr/local/bin/setuprouting.sh b/sources/efg.pm/postinstall/install/usr/local/bin/setuprouting.sh index f7b347b..02c2094 100755 --- a/sources/efg.pm/postinstall/install/usr/local/bin/setuprouting.sh +++ b/sources/efg.pm/postinstall/install/usr/local/bin/setuprouting.sh @@ -3,7 +3,8 @@ # the vpn server, the nameservers and everything from the perimeter network # are routed via ACE -ip rule add priority 64 from 10.228.109.104/32 lookup 30 +ip rule add priority 63 from 10.228.109.104/32 lookup 30 +ip rule add priority 64 from 10.228.109.154/32 lookup 30 ip rule add priority 65 from 10.228.109.236/32 lookup 30 ip rule add priority 66 from 10.228.109.253/32 lookup 30 ip rule add priority 128 from 192.168.173.0/24 lookup 30 diff --git a/sources/sns.in/postinstall/install/var/named/228.10.in-addr.arpa.zonesource b/sources/sns.in/postinstall/install/var/named/228.10.in-addr.arpa.zonesource index 53b4bf7..7760fa1 100644 --- a/sources/sns.in/postinstall/install/var/named/228.10.in-addr.arpa.zonesource +++ b/sources/sns.in/postinstall/install/var/named/228.10.in-addr.arpa.zonesource @@ -177,6 +177,8 @@ $TTL 86400 104.109 IN PTR ins.in.useribm.hu. +64.109 IN PTR fds.in.useribm.hu. + 59.109 IN PTR dhcp.in.useribm.hu. 51.109 IN PTR winadk.in.useribm.hu. diff --git a/sources/sns.in/postinstall/install/var/named/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource b/sources/sns.in/postinstall/install/var/named/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource index d720e4b..0ef2a86 100644 --- a/sources/sns.in/postinstall/install/var/named/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource +++ b/sources/sns.in/postinstall/install/var/named/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource @@ -86,6 +86,8 @@ b.8.d.6.3.0.e.f.f.f.8.1.c.0.0.0 IN PTR ls.in.useribm.hu. 8.6.d.6.3.0.e.f.f.f.8.1.c.0.0.0 IN PTR ins.in.useribm.hu. +0.4.d.6.3.0.e.f.f.f.8.1.c.0.0.0 IN PTR fds.in.useribm.hu. + ; ================================================================ ; infrastructure management (im = 9 * 10 + 13 = 103) diff --git a/sources/sns.in/postinstall/install/var/named/in.useribm.hu.zonesource b/sources/sns.in/postinstall/install/var/named/in.useribm.hu.zonesource index e7b4c2f..4844cf1 100644 --- a/sources/sns.in/postinstall/install/var/named/in.useribm.hu.zonesource +++ b/sources/sns.in/postinstall/install/var/named/in.useribm.hu.zonesource @@ -159,8 +159,6 @@ ittestwin2012 IN A 10.228.110.12 ifg IN A 10.228.109.254 ifg IN AAAA 2a02:d400:0000:f268:000c:18ff:fe03:6dfe dhcp IN A 10.228.109.253 -mx IN A 10.228.109.253 -mx IN AAAA 2a02:d400:0000:f268:000c:18ff:fe03:6dfd ns IN A 10.228.109.253 ns IN AAAA 2a02:d400:0000:f268:000c:18ff:fe03:6dfd svc IN A 10.228.109.253 @@ -204,6 +202,9 @@ iscbe IN A 10.228.109.109 ; is ins IN A 10.228.109.104 ; in ins IN AAAA 2a02:d400:0000:f268:000c:18ff:fe03:6d68 +fds IN A 10.228.109.64 ; fd +fds IN AAAA 2a02:d400:0000:f268:000c:18ff:fe03:6d40 + dhcp IN A 10.228.109.59 ; ds (dhcp server) winadk IN A 10.228.109.51 ; dk diff --git a/sources/start-order.txt b/sources/start-order.txt index 5b4e890..720652b 100644 --- a/sources/start-order.txt +++ b/sources/start-order.txt @@ -23,10 +23,11 @@ group 5: vpn.in 48 group 6: - ldap.in 51 - pns.in 52 - sns.in 53 - wiki.in 54 + fds.in 51 + ldap.in 52 + pns.in 53 + sns.in 54 + wiki.in 55 group 7: dhsvn.in 61 diff --git a/sources/vhost1.in/root/temperature.sh b/sources/vhost1.in/root/temperature.sh index d71a804..d25afe4 100755 --- a/sources/vhost1.in/root/temperature.sh +++ b/sources/vhost1.in/root/temperature.sh @@ -38,7 +38,7 @@ delete_mail() { delete_received_smses() { PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) curl --output /tmp/ses_tok.xml \ @@ -86,7 +86,7 @@ delete_received_smses() { delete_sent_smses() { PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) curl --output /tmp/ses_tok.xml \ @@ -134,7 +134,7 @@ log_temperature() { MESSAGE_TYPE=$1 TEMPERATURE=$2 PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) echo "${STR_DATE}: ${MESSAGE_TYPE}: $TEMPERATURE" | tee -a /var/log/temperature-${PRG_DATE}.log @@ -142,7 +142,7 @@ log_temperature() { process_received_smses() { PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) curl --output /tmp/ses_tok.xml \ @@ -176,7 +176,7 @@ send_heartbeat_sms() { MESSAGE_TYPE=$1 TEMPERATURE=$2 PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) if [ -f $SCRIPT_STOP ] @@ -216,7 +216,7 @@ send_sms() { MESSAGE_TYPE=$1 TEMPERATURE=$2 PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) MESSAGE="${MESSAGE_TYPE}: temperature is $TEMPERATURE" @@ -250,7 +250,7 @@ send_stop_sms() { MESSAGE_TYPE=$1 TEMPERATURE=$2 PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) if [ ! -f $SCRIPT_STOP ] @@ -296,7 +296,7 @@ send_test_sms() { MESSAGE_TYPE=$1 TEMPERATURE=$2 PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) if [ -f $SCRIPT_STOP ] @@ -356,6 +356,13 @@ shutdown_hosts() { } +IPMI_PROCESSES=$(ps -ef | grep [i]pmitool | wc -l) +if [ $IPMI_PROCESSES -ne 0 ] +then + echo "$IPMI_PROCESSES ipmitool processes running, exiting." >&2 + exit 1 +fi + TEMPERATURE=$(ipmitool -H $IMM_FQDN -I open -P pwd sensor get 'Ambient Temp' \ | grep 'Sensor Reading' \ | sed 's/^ Sensor Reading : \([^ ]*\) (+\/- .) degrees C$/\1/') diff --git a/sources/vhost2.in/root/temperature.sh b/sources/vhost2.in/root/temperature.sh index d71a804..d25afe4 100755 --- a/sources/vhost2.in/root/temperature.sh +++ b/sources/vhost2.in/root/temperature.sh @@ -38,7 +38,7 @@ delete_mail() { delete_received_smses() { PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) curl --output /tmp/ses_tok.xml \ @@ -86,7 +86,7 @@ delete_received_smses() { delete_sent_smses() { PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) curl --output /tmp/ses_tok.xml \ @@ -134,7 +134,7 @@ log_temperature() { MESSAGE_TYPE=$1 TEMPERATURE=$2 PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) echo "${STR_DATE}: ${MESSAGE_TYPE}: $TEMPERATURE" | tee -a /var/log/temperature-${PRG_DATE}.log @@ -142,7 +142,7 @@ log_temperature() { process_received_smses() { PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) curl --output /tmp/ses_tok.xml \ @@ -176,7 +176,7 @@ send_heartbeat_sms() { MESSAGE_TYPE=$1 TEMPERATURE=$2 PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) if [ -f $SCRIPT_STOP ] @@ -216,7 +216,7 @@ send_sms() { MESSAGE_TYPE=$1 TEMPERATURE=$2 PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) MESSAGE="${MESSAGE_TYPE}: temperature is $TEMPERATURE" @@ -250,7 +250,7 @@ send_stop_sms() { MESSAGE_TYPE=$1 TEMPERATURE=$2 PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) if [ ! -f $SCRIPT_STOP ] @@ -296,7 +296,7 @@ send_test_sms() { MESSAGE_TYPE=$1 TEMPERATURE=$2 PRG_DATE=$(date +%Y%m%d) - STR_DATE=$(date) + STR_DATE=$(LC_TIME=C.UTF-8 date) if [ -f $SCRIPT_STOP ] @@ -356,6 +356,13 @@ shutdown_hosts() { } +IPMI_PROCESSES=$(ps -ef | grep [i]pmitool | wc -l) +if [ $IPMI_PROCESSES -ne 0 ] +then + echo "$IPMI_PROCESSES ipmitool processes running, exiting." >&2 + exit 1 +fi + TEMPERATURE=$(ipmitool -H $IMM_FQDN -I open -P pwd sensor get 'Ambient Temp' \ | grep 'Sensor Reading' \ | sed 's/^ Sensor Reading : \([^ ]*\) (+\/- .) degrees C$/\1/') -- 2.54.0