From 928cbb13d946c66cd079b9d1efea0ae0fe8ebf86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Mon, 28 Jan 2019 12:12:12 +0100 Subject: [PATCH] Updated pns.usr.f29 (v5010 resurrection, misc changes), svc.usr.f29 (2n static dhcp). --- scripts/dnf.conf.fedora | 1 + .../var/named/228.10.in-addr.arpa.zone | 6 +++++- .../var/named/42.168.192.in-addr.arpa.zone | 12 +++++------ .../install/var/named/sr.user.hu.zone | 20 +++++++++---------- .../install/var/named/useribm.hu.zone | 6 +++--- .../install/var/named/userrendszerhaz.hu.zone | 6 +++--- .../install/var/named/usr.user.hu.zone | 6 +++++- sources/svc.usr.f29/envvars | 4 ++-- .../postinstall/install/etc/dhcp/dhcpd.conf | 12 +++++++++++ 9 files changed, 47 insertions(+), 26 deletions(-) diff --git a/scripts/dnf.conf.fedora b/scripts/dnf.conf.fedora index 328cc4e..0f8fc9c 100644 --- a/scripts/dnf.conf.fedora +++ b/scripts/dnf.conf.fedora @@ -7,3 +7,4 @@ gpgcheck=0 name=Fedora $releasever - $basearch - Updates baseurl=http://store.usr.user.hu/linux/fedora/updates/$releasever/Everything/$basearch/ gpgcheck=0 +excludepkgs=dbus* diff --git a/sources/pns.usr.f29/postinstall/install/var/named/228.10.in-addr.arpa.zone b/sources/pns.usr.f29/postinstall/install/var/named/228.10.in-addr.arpa.zone index 78c74a9..cf59274 100644 --- a/sources/pns.usr.f29/postinstall/install/var/named/228.10.in-addr.arpa.zone +++ b/sources/pns.usr.f29/postinstall/install/var/named/228.10.in-addr.arpa.zone @@ -1,6 +1,6 @@ $TTL 86400 @ IN SOA ns.usr.user.hu. hostmaster.mx.usr.user.hu. ( - 2019011501 ; Serial + 2019012801 ; Serial 86400 ; Refresh (1 day) 7200 ; Retry (2 hours) 2419200 ; Expire (4 weeks) @@ -224,6 +224,10 @@ $TTL 86400 ; ================================================================ ; infrastructure management (im = 9 * 10 + 13 = 103) ; ================================================================ +246.103 IN PTR v5010svc2.usr.user.hu. +245.103 IN PTR v5010svc1.usr.user.hu. +227.103 IN PTR v5010b.usr.user.hu. +225.103 IN PTR v5010.usr.user.hu. 3.103 IN PTR vhost3imm.usr.user.hu. 2.103 IN PTR vhost2imm.usr.user.hu. 1.103 IN PTR vhost1imm.usr.user.hu. diff --git a/sources/pns.usr.f29/postinstall/install/var/named/42.168.192.in-addr.arpa.zone b/sources/pns.usr.f29/postinstall/install/var/named/42.168.192.in-addr.arpa.zone index f635546..b87747a 100644 --- a/sources/pns.usr.f29/postinstall/install/var/named/42.168.192.in-addr.arpa.zone +++ b/sources/pns.usr.f29/postinstall/install/var/named/42.168.192.in-addr.arpa.zone @@ -1,6 +1,6 @@ $TTL 86400 @ IN SOA svc.sr.user.hu. hostmaster.svc.sr.user.hu. ( - 2018012301 ; Serial + 2019012801 ; Serial 86400 ; Refresh (1 day) 7200 ; Retry (2 hours) 2419200 ; Expire (4 weeks) @@ -36,7 +36,7 @@ $TTL 86400 230 IN PTR jazzserver.sr.user.hu. ;srevesz 229 IN PTR netmon.sr.user.hu. 228 IN PTR test.sr.user.hu. -227 IN PTR vcsvr51.sr.user.hu. +;227 IN PTR vcsvr51.sr.user.hu. 224 IN PTR erstehit.sr.user.hu. @@ -62,12 +62,12 @@ $TTL 86400 204 IN PTR mqfiles.sr.user.hu. 203 IN PTR azsamboki01.sr.user.hu. 202 IN PTR praxis.sr.user.hu. -201 IN PTR ds5020b.sr.user.hu. -200 IN PTR ds5020a.sr.user.hu. +;201 IN PTR ds5020b.sr.user.hu. +;200 IN PTR ds5020a.sr.user.hu. -197 IN PTR vtlstgb.sr.user.hu. -196 IN PTR vtlstga.sr.user.hu. +;197 IN PTR vtlstgb.sr.user.hu. +;196 IN PTR vtlstga.sr.user.hu. 195 IN PTR lto.sr.user.hu. 194 IN PTR csldallianz.sr.user.hu. 193 IN PTR store-old.sr.user.hu. diff --git a/sources/pns.usr.f29/postinstall/install/var/named/sr.user.hu.zone b/sources/pns.usr.f29/postinstall/install/var/named/sr.user.hu.zone index 952045a..1415fde 100644 --- a/sources/pns.usr.f29/postinstall/install/var/named/sr.user.hu.zone +++ b/sources/pns.usr.f29/postinstall/install/var/named/sr.user.hu.zone @@ -1,6 +1,6 @@ $TTL 86400 @ IN SOA svc.sr.user.hu. hostmaster.svc.sr.user.hu. ( - 2018012301 ; Serial + 2019012801 ; Serial 86400 ; Refresh (1 day) 7200 ; Retry (2 hours) 2419200 ; Expire (4 weeks) @@ -44,7 +44,7 @@ testcibod IN A 192.168.42.231 ; CIB OnDemand test (fuge) jazzserver IN A 192.168.42.230 ; jazz.net (RTC) server netmon IN A 192.168.42.229 ; netmon (marcell, fritter) test IN A 192.168.42.228 ; (kickstart) test -vcsvr51 IN A 192.168.42.227 ; vCenter server +;vcsvr51 IN A 192.168.42.227 ; vCenter server erstehit IN A 192.168.42.224 ; Erste (fuge) @@ -72,12 +72,12 @@ mqfiles IN A 192.168.42.204 ; MQ file server (srevesz) azsamboki01 IN A 192.168.42.203 ; azsamboki test 01 praxis IN A 192.168.42.202 ; praxis (dvasary) edoki IN CNAME praxis.sr.user.hu. -ds5020b IN A 192.168.42.201 ; DS5020 ctrl B -ds5020a IN A 192.168.42.200 ; DS5020 ctrl A +;ds5020b IN A 192.168.42.201 ; DS5020 ctrl B +;ds5020a IN A 192.168.42.200 ; DS5020 ctrl A -vtlstgb IN A 192.168.42.197 ; VTL storage ctrl B -vtlstga IN A 192.168.42.196 ; VTL storage ctrl A +;vtlstgb IN A 192.168.42.197 ; VTL storage ctrl B +;vtlstga IN A 192.168.42.196 ; VTL storage ctrl A lto IN A 192.168.42.195 ; TS3200 csldallianz IN A 192.168.42.194 ; CSLD Allianz (fuge) store-old IN A 192.168.42.193 ; old store @@ -98,10 +98,10 @@ tsmclustera IN A 192.168.42.173 ; FRitter, BB Test cluster tsmclusterb IN A 192.168.42.172 ; FRitter, BB Test cluster tsmcluster IN A 192.168.42.171 ; FRitter, BB Test cluster -cwdba IN A 192.168.42.162 ; zfelleg temp -cwdbb IN A 192.168.42.161 ; zfelleg temp -cwbina IN A 192.168.42.160 ; zfelleg temp -cwbinb IN A 192.168.42.159 ; zfelleg temp +;cwdba IN A 192.168.42.162 ; zfelleg temp +;cwdbb IN A 192.168.42.161 ; zfelleg temp +;cwbina IN A 192.168.42.160 ; zfelleg temp +;cwbinb IN A 192.168.42.159 ; zfelleg temp ; network ...128/27 -> desktops ; network address: ...128 diff --git a/sources/pns.usr.f29/postinstall/install/var/named/useribm.hu.zone b/sources/pns.usr.f29/postinstall/install/var/named/useribm.hu.zone index b66e39a..291c7f9 100644 --- a/sources/pns.usr.f29/postinstall/install/var/named/useribm.hu.zone +++ b/sources/pns.usr.f29/postinstall/install/var/named/useribm.hu.zone @@ -1,6 +1,6 @@ $TTL 86400 @ IN SOA ns.useribm.hu. hostmaster.mx.useribm.hu. ( - 2018120601 ; Serial + 2019012201 ; Serial 86400 ; Refresh (1 day) 7200 ; Retry (2 hours) 2419200 ; Expire (4 weeks) @@ -21,13 +21,13 @@ gw IN A 84.2.25.193 ; gateway router IN A 84.2.25.193 ; gateway mx2 IN A 84.2.25.194 ; secondary mail exchanger whmcs IN A 84.2.25.194 ; whmcs (fschnell) -minecraft IN A 84.2.25.195 ; akosztolanyi's server +u195 IN A 84.2.25.195 ; unknown/unused tfs IN A 84.2.25.196 ; TFS Server, rrendek, dvasary u197 IN A 84.2.25.197 ; unknown/unused u198 IN A 84.2.25.198 ; unknown/unused u199 IN A 84.2.25.199 ; unknown/unused u200 IN A 84.2.25.200 ; unknown/unused -u201 IN A 84.2.25.201 ; unknown/unused +minecraft IN A 84.2.25.201 ; akosztolanyi's server hg IN A 84.2.25.202 ; mercurial jtrac IN A 84.2.25.202 ; jtrac minicrm IN A 84.2.25.202 ; minicrm (rrendek) diff --git a/sources/pns.usr.f29/postinstall/install/var/named/userrendszerhaz.hu.zone b/sources/pns.usr.f29/postinstall/install/var/named/userrendszerhaz.hu.zone index 2e29dd3..e2bd2b8 100644 --- a/sources/pns.usr.f29/postinstall/install/var/named/userrendszerhaz.hu.zone +++ b/sources/pns.usr.f29/postinstall/install/var/named/userrendszerhaz.hu.zone @@ -1,6 +1,6 @@ $TTL 86400 @ IN SOA ns.userrendszerhaz.hu. hostmaster.mx.userrendszerhaz.hu. ( - 2018120601 ; Serial + 2019012201 ; Serial 86400 ; Refresh (1 day) 7200 ; Retry (2 hours) 2419200 ; Expire (4 weeks) @@ -21,13 +21,13 @@ gw IN A 84.2.25.193 ; gateway router IN A 84.2.25.193 ; gateway ;mx2 IN A 84.2.25.194 ; secondary mail exchanger whmcs IN A 84.2.25.194 ; whmcs (fschnell) -minecraft IN A 84.2.25.195 ; akosztolanyi's server +u195 IN A 84.2.25.195 ; unknown/unused tfs IN A 84.2.25.196 ; TFS Server, rrendek, dvasary u197 IN A 84.2.25.197 ; unknown/unused u198 IN A 84.2.25.198 ; unknown/unused u199 IN A 84.2.25.199 ; unknown/unused u200 IN A 84.2.25.200 ; unknown/unused -u201 IN A 84.2.25.201 ; unknown/unused +minecraft IN A 84.2.25.201 ; akosztolanyi's server hg IN A 84.2.25.202 ; mercurial jtrac IN A 84.2.25.202 ; jtrac minicrm IN A 84.2.25.202 ; minicrm (rrendek) diff --git a/sources/pns.usr.f29/postinstall/install/var/named/usr.user.hu.zone b/sources/pns.usr.f29/postinstall/install/var/named/usr.user.hu.zone index a9d54c0..1565d7e 100644 --- a/sources/pns.usr.f29/postinstall/install/var/named/usr.user.hu.zone +++ b/sources/pns.usr.f29/postinstall/install/var/named/usr.user.hu.zone @@ -1,6 +1,6 @@ $TTL 86400 @ IN SOA ns.usr.user.hu. hostmaster.mx.usr.user.hu. ( - 2019011501 ; Serial + 2019012801 ; Serial 86400 ; Refresh (1 day) 7200 ; Retry (2 hours) 2419200 ; Expire (4 weeks) @@ -241,6 +241,10 @@ winadk IN A 10.228.109.51 ; dk ; ================================================================ ; infrastructure management (im = 9 * 10 + 13 = 103) ; ================================================================ +v5010svc2 IN A 10.228.103.246 ; v5 + (s + 2) +v5010svc1 IN A 10.228.103.245 ; v5 + (s + 1) +v5010b IN A 10.228.103.227 ; v5 + b +v5010 IN A 10.228.103.225 ; v5 vhost3imm IN A 10.228.103.3 vhost2imm IN A 10.228.103.2 vhost1imm IN A 10.228.103.1 diff --git a/sources/svc.usr.f29/envvars b/sources/svc.usr.f29/envvars index b96f003..3c76157 100644 --- a/sources/svc.usr.f29/envvars +++ b/sources/svc.usr.f29/envvars @@ -1,4 +1,4 @@ #BASE_PACKAGES="NetworkManager initscripts openssh-server openssh-clients openssh-ldap rootfiles rsyslog sudo tar vim-minimal" #SPEC_PACKAGES="authselect bind bind-utils dhcp openldap-clients nss-pam-ldapd pam_ssh passwd postfix" -BASE_PACKAGES="NetworkManager initscripts rootfiles rsyslog tar" -SPEC_PACKAGES="bind bind-utils dhcp postfix" +BASE_PACKAGES="NetworkManager hostname initscripts iputils iproute rootfiles rsyslog tar vim-minimal" +SPEC_PACKAGES="bind bind-utils dhcp postfix python3 python3-dbus" diff --git a/sources/svc.usr.f29/postinstall/install/etc/dhcp/dhcpd.conf b/sources/svc.usr.f29/postinstall/install/etc/dhcp/dhcpd.conf index 0eb8020..afd1038 100644 --- a/sources/svc.usr.f29/postinstall/install/etc/dhcp/dhcpd.conf +++ b/sources/svc.usr.f29/postinstall/install/etc/dhcp/dhcpd.conf @@ -51,10 +51,22 @@ subnet 10.228.0.0 netmask 255.255.0.0 { } # static hosts +host tn-phone-test { + hardware ethernet 00:0b:82:66:f2:3e; + fixed-address 10.228.215.220; +} host tn-phone-sf { hardware ethernet 00:0b:82:67:2f:1c; fixed-address 10.228.215.196; } +host tn-intercom-gf { + hardware ethernet 7c:1e:b3:fe:4e:61; + fixed-address 10.228.215.76; +} +host tn-phone-ff { + hardware ethernet 00:0b:82:67:2d:26; + fixed-address 10.228.215.66; +} host db2svr { hardware ethernet 00:50:56:00:d4:2a; fixed-address 10.228.212.42; -- 2.54.0