From: Zoltán Felleg Date: Thu, 15 Feb 2024 21:26:58 +0000 (+0100) Subject: Added kea.in (renamed dhcp.in). X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=ec037fb9cb2fb339552513effd7a40e7efad407a;p=user-lxc.git Added kea.in (renamed dhcp.in). --- diff --git a/sources/dhcp.in/c3d/postinstall/install-data/etc/dhcp/dhcpd.conf b/sources/dhcp.in/c3d/postinstall/install-data/etc/dhcp/dhcpd.conf deleted file mode 100644 index 3c1cb32..0000000 --- a/sources/dhcp.in/c3d/postinstall/install-data/etc/dhcp/dhcpd.conf +++ /dev/null @@ -1,601 +0,0 @@ -# dhcpd.conf -# -# Configuration file for ISC dhcpd -# - -# Option definitions -option broadcast-address 10.228.255.255; -option domain-name "in.useribm.hu"; -option domain-name-servers 10.228.92.159, 10.228.109.159; -option domain-search "in.useribm.hu", "sr.user.hu", "in.user.hu"; -option ntp-servers ntp1.in.useribm.hu, ntp2.in.useribm.hu; -option routers ifg.in.useribm.hu; -option smtp-server mx.in.useribm.hu; -option subnet-mask 255.255.0.0; -option time-offset 3600; - -option space PXE; -option PXE.mtftp-ip code 1 = ip-address; -option PXE.mtftp-cport code 2 = unsigned integer 16; -option PXE.mtftp-sport code 3 = unsigned integer 16; -option PXE.mtftp-tmout code 4 = unsigned integer 8; -option PXE.mtftp-delay code 5 = unsigned integer 8; -option architecture-type code 93 = unsigned integer 16; - -option space pxelinux; -option pxelinux.magic code 208 = string; -option pxelinux.configfile code 209 = text; -option pxelinux.pathprefix code 210 = text; -option pxelinux.reboottime code 211 = unsigned integer 32; -option architecture-type code 93 = unsigned integer 16; - -option space apc; -option apc.cookie code 1 = text; -option apc.cookie "1APC"; - -# 12/24 hours -default-lease-time 43200; -max-lease-time 86400; - -# Disable dynamic dns updates -ddns-update-style none; - -# This DHCP server is the official DHCP server for the local network -authoritative; - -# Use this to send dhcp log messages to a different log file (you also -# have to hack syslog.conf to complete the redirection). -log-facility local7; - -# in.useribm.hu subnet -subnet 10.228.0.0 netmask 255.255.0.0 { - range 10.228.43.1 10.228.43.254; - vendor-option-space apc; -} - -# 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 apcups2 { - hardware ethernet 00:c0:b7:23:dd:7d; - fixed-address 10.228.226.2; -} -host apcups1 { - hardware ethernet 00:c0:b7:58:c2:0c; - fixed-address 10.228.226.1; -} -host db2svr { - hardware ethernet 00:50:56:00:d4:2a; - fixed-address 10.228.212.42; -} -host accounting-usr { - hardware ethernet 00:50:56:00:d4:0d; - fixed-address 10.228.212.13; -} -host tsmapil { - hardware ethernet 00:50:56:00:c0:d4; - fixed-address 10.228.192.212; -} -host sssbn3 { - hardware ethernet 00:50:56:00:d1:83; - fixed-address 10.228.209.131; -} -host sssbn2 { - hardware ethernet 00:50:56:00:d1:82; - fixed-address 10.228.209.130; -} -host sssbn1 { - hardware ethernet 00:50:56:00:d1:81; - fixed-address 10.228.209.129; -} -host sssan3 { - hardware ethernet 00:50:56:00:d1:03; - fixed-address 10.228.209.3; -} -host sssan2 { - hardware ethernet 00:50:56:00:d1:02; - fixed-address 10.228.209.2; -} -host sssan1 { - hardware ethernet 00:50:56:00:d1:01; - fixed-address 10.228.209.1; -} -host spstsql { - hardware ethernet 00:50:56:00:ce:d4; - fixed-address 10.228.206.212; -} -host spstad { - hardware ethernet 00:50:56:00:ce:d3; - fixed-address 10.228.206.211; -} -host spstsp { - hardware ethernet 00:50:56:00:ce:d2; - fixed-address 10.228.206.210; -} -host spw2k08sql { - hardware ethernet 00:50:56:00:ce:cf; - fixed-address 10.228.206.207; -} -host spw2k08sp { - hardware ethernet 00:50:56:00:ce:ce; - fixed-address 10.228.206.206; -} -host spw2k08ad { - hardware ethernet 00:50:56:00:ce:0e; - fixed-address 10.228.206.14; -} -host ppitsp { - hardware ethernet 00:50:56:00:ce:03; - fixed-address 10.228.206.3; -} -host ppitdb { - hardware ethernet 00:50:56:00:ce:02; - fixed-address 10.228.206.2; -} -host ppitad { - hardware ethernet 00:50:56:00:ce:01; - fixed-address 10.228.206.1; -} -host rredms { - hardware ethernet 00:50:56:00:c6:35; - fixed-address 10.228.198.53; -} -host ssam { - hardware ethernet 00:50:56:00:c0:d1; - fixed-address 10.228.192.209; -} -host spsbsql { - hardware ethernet 00:50:56:00:c0:cf; - fixed-address 10.228.192.207; -} -host spsb { - hardware ethernet 00:50:56:00:c0:ce; - fixed-address 10.228.192.206; -} -host tsmddtest { - hardware ethernet 00:50:56:00:c0:cc; - fixed-address 10.228.192.204; -} -host toolbox { - hardware ethernet 00:50:56:00:c0:ca; - fixed-address 10.228.192.202; -} -host spsbad { - hardware ethernet 00:50:56:00:c0:bf; - fixed-address 10.228.192.191; -} -host jenkinswin { - hardware ethernet 00:50:56:00:c0:7b; - fixed-address 10.228.192.123; -} -host mkbdarc2dev { - hardware ethernet 00:50:56:00:c0:2c; - fixed-address 10.228.192.44; -} -host blobtest { - hardware ethernet 00:50:56:00:c0:28; - fixed-address 10.228.192.40; -} -host rkdominoadmin { - hardware ethernet 00:50:56:00:bf:01; - fixed-address 10.228.191.1; -} -host rhgssn3 { - hardware ethernet 00:50:56:00:bb:03; - fixed-address 10.228.187.3; -} -host rhgssn2 { - hardware ethernet 00:50:56:00:bb:02; - fixed-address 10.228.187.2; -} -host rhgssn1 { - hardware ethernet 00:50:56:00:bb:01; - fixed-address 10.228.187.1; -} -host purebcw2k12 { - hardware ethernet 00:50:56:00:a2:f2; - fixed-address 10.228.162.242; -} -host purebcw2k08 { - hardware ethernet 00:50:56:00:a2:ee; - fixed-address 10.228.162.238; -} -host purebcw2k03 { - hardware ethernet 00:50:56:00:a2:e9; - fixed-address 10.228.162.233; -} -host purebcrhel7 { - hardware ethernet 00:50:56:00:a2:bb; - fixed-address 10.228.162.187; -} -host purebcrhel6 { - hardware ethernet 00:50:56:00:a2:ba; - fixed-address 10.228.162.186; -} -host purebcwdb2105 { - hardware ethernet 00:50:56:00:a2:6a; - fixed-address 10.228.162.106; -} -host purebcldb2105 { - hardware ethernet 00:50:56:00:a2:69; - fixed-address 10.228.162.105; -} -host purebcldb297 { - hardware ethernet 00:50:56:00:a2:61; - fixed-address 10.228.162.97; -} -host msexchange { - hardware ethernet 00:50:56:00:95:f3; - fixed-address 10.228.149.243; -} -host msptt4 { - hardware ethernet 00:50:56:00:95:d4; - fixed-address 10.228.149.212; -} -host msptt3 { - hardware ethernet 00:50:56:00:95:d3; - fixed-address 10.228.149.211; -} -host msptt2 { - hardware ethernet 00:50:56:00:95:d2; - fixed-address 10.228.149.210; -} -host msptt1 { - hardware ethernet 00:50:56:00:95:d1; - fixed-address 10.228.149.209; -} -host msfhblbtest2 { - hardware ethernet 00:50:56:00:95:04; - fixed-address 10.228.149.4; -} -host msfhblbtest1 { - hardware ethernet 00:50:56:00:95:03; - fixed-address 10.228.149.3; -} -host msflashtest { - hardware ethernet 00:50:56:00:95:02; - fixed-address 10.228.149.2; -} -host mstsmupgrade { - hardware ethernet 00:50:56:00:95:01; - fixed-address 10.228.149.1; -} -host svc { - hardware ethernet 00:50:56:00:6d:fd; - fixed-address 10.228.109.253; -} -host idm { - hardware ethernet 00:50:56:00:6d:fc; - fixed-address 10.228.109.252; -} -host vpn { - hardware ethernet 00:50:56:00:6d:fb; - fixed-address 10.228.109.251; -} -host store { - hardware ethernet 00:50:56:00:6d:fa; - fixed-address 10.228.109.250; -} -host tsm { - hardware ethernet 00:50:56:00:6d:f9; - fixed-address 10.228.109.249; -} -host winadk { - hardware ethernet 00:50:56:00:6d:33; - fixed-address 10.228.109.51; -} -host vcsa60 { - hardware ethernet 00:50:56:00:5d:3c; - fixed-address 10.228.93.60; -} -host vcsvr55 { - hardware ethernet 00:50:56:00:5d:37; - fixed-address 10.228.93.55; -} -host vhost2 { - hardware ethernet e4:1f:13:bc:e0:d0; - fixed-address 10.228.93.2; -} -host vhost1 { - hardware ethernet e4:1f:13:bc:c3:20; - fixed-address 10.228.93.1; -} -host svcb { - hardware ethernet 00:50:56:00:5c:fd; - fixed-address 10.228.92.253; -} -host fuonyffilenet { - hardware ethernet 00:50:56:00:51:02; - fixed-address 10.228.81.2; -} -host futmp { - hardware ethernet 00:50:56:00:51:01; - fixed-address 10.228.81.1; -} -host fsmq8004 { - hardware ethernet 00:50:56:00:4f:54; - fixed-address 10.228.79.84; -} -host frsppapp { - hardware ethernet 00:50:56:00:4e:ce; - fixed-address 10.228.78.206; -} -host frtsm71 { - hardware ethernet 00:50:56:00:4e:47; - fixed-address 10.228.78.71; -} -host fdic922bmc { - hardware ethernet 08:94:ef:80:e5:57; - fixed-address 10.228.64.92; -} -host dvredmine { - hardware ethernet 00:50:56:00:3e:c1; - fixed-address 10.228.62.193; -} -host dvedmstest { - hardware ethernet 00:50:56:00:3e:46; - fixed-address 10.228.62.70; -} -host dvaviglion { - hardware ethernet 00:18:85:09:80:06; - fixed-address 10.228.62.32; -} -host desktop-20 { - hardware ethernet 00:50:56:00:3c:14; - fixed-address 10.228.60.20; -} -host desktop-19 { - hardware ethernet 00:50:56:00:3c:13; - fixed-address 10.228.60.19; -} -host desktop-18 { - hardware ethernet 00:50:56:00:3c:12; - fixed-address 10.228.60.18; -} -host desktop-17 { - hardware ethernet 00:50:56:00:3c:11; - fixed-address 10.228.60.17; -} -host desktop-16 { - hardware ethernet 00:50:56:00:3c:10; - fixed-address 10.228.60.16; -} -host desktop-15 { - hardware ethernet 00:50:56:00:3c:0f; - fixed-address 10.228.60.15; -} -host desktop-14 { - hardware ethernet 00:50:56:00:3c:0e; - fixed-address 10.228.60.14; -} -host desktop-13 { - hardware ethernet 00:50:56:00:3c:0d; - fixed-address 10.228.60.13; -} -host desktop-12 { - hardware ethernet 00:50:56:00:3c:0c; - fixed-address 10.228.60.12; -} -host desktop-11 { - hardware ethernet 00:50:56:00:3c:0b; - fixed-address 10.228.60.11; -} -host desktop-10 { - hardware ethernet 00:50:56:00:3c:0a; - fixed-address 10.228.60.10; -} -host desktop-09 { - hardware ethernet 00:50:56:00:3c:09; - fixed-address 10.228.60.9; -} -host desktop-08 { - hardware ethernet 00:50:56:00:3c:08; - fixed-address 10.228.60.8; -} -host desktop-07 { - hardware ethernet 00:50:56:00:3c:07; - fixed-address 10.228.60.7; -} -host desktop-06 { - hardware ethernet 00:50:56:00:3c:06; - fixed-address 10.228.60.6; -} -host desktop-05 { - hardware ethernet 00:50:56:00:3c:05; - fixed-address 10.228.60.5; -} -host desktop-04 { - hardware ethernet 00:50:56:00:3c:04; - fixed-address 10.228.60.4; -} -host desktop-03 { - hardware ethernet 00:50:56:00:3c:03; - fixed-address 10.228.60.3; -} -host desktop-02 { - hardware ethernet 00:50:56:00:3c:02; - fixed-address 10.228.60.2; -} -host desktop-01 { - hardware ethernet 00:50:56:00:3c:01; - fixed-address 10.228.60.1; -} -host ads { - hardware ethernet 00:50:56:00:2a:f6; - fixed-address 10.228.42.246; -} -host spelive { - hardware ethernet 00:50:56:00:2a:f5; - fixed-address 10.228.42.245; -} -host datacap-rr { - hardware ethernet 00:50:56:00:2a:ec; - fixed-address 10.228.42.236; -} -host testcibod9 { - hardware ethernet 00:50:56:00:2a:e7; - fixed-address 10.228.42.231; -} -host rtc4 { - hardware ethernet 00:50:56:00:2a:d0; - fixed-address 10.228.42.208; -} -host vmbkp { - hardware ethernet 00:50:56:00:2a:cf; - fixed-address 10.228.42.207; -} -host mqsvr { - hardware ethernet 00:50:56:00:2a:ce; - fixed-address 10.228.42.206; -} -host mqback { - hardware ethernet 00:50:56:00:2a:cd; - fixed-address 10.228.42.205; -} -host mqfiles { - hardware ethernet 00:50:56:00:2a:cc; - fixed-address 10.228.42.204; -} -host azsamboki01 { - hardware ethernet 00:50:56:00:2a:cb; - fixed-address 10.228.42.203; -} -host csldallianz { - hardware ethernet 00:50:56:00:2a:c2; - fixed-address 10.228.42.194; -} -host tsmmon-p { - hardware ethernet 00:50:56:00:2a:be; - fixed-address 10.228.42.190; -} -host tsmmon-s { - hardware ethernet 00:50:56:00:2a:bd; - fixed-address 10.228.42.189; -} -host accounting { - hardware ethernet 00:50:56:00:2a:bc; - fixed-address 10.228.42.188; -} -host jenkinslnx { - hardware ethernet 00:50:56:00:2a:b9; - fixed-address 10.228.42.185; -} -host jenkinstst { - hardware ethernet 00:50:56:00:2a:b8; - fixed-address 10.228.42.184; -} -host ssam71 { - hardware ethernet 00:50:56:00:2a:b4; - fixed-address 10.228.42.180; -} -host cfserver { - hardware ethernet 00:0c:29:ca:eb:d3; - fixed-address 10.228.36.1; -} -host cdvm { - hardware ethernet 00:50:56:00:22:e9; - fixed-address 10.228.34.233; -} -host cds822p4 { - hardware ethernet 98:be:94:04:06:fb; - fixed-address 10.228.34.25; -} -host cds822p3 { - hardware ethernet 98:be:94:04:06:fa; - fixed-address 10.228.34.24; -} -host cds822p2 { - hardware ethernet 98:be:94:04:06:f9; - fixed-address 10.228.34.23; -} -host cds822p1 { - hardware ethernet 98:be:94:04:06:f8; - fixed-address 10.228.34.22; -} -host cds822hmc2 { - hardware ethernet 98:be:94:4c:5e:3f; - fixed-address 10.228.34.2; -} -host cds822hmc1 { - hardware ethernet 98:be:94:4c:5e:3e; - fixed-address 10.228.34.1; -} -host akmacmini { - hardware ethernet 10:dd:b1:b3:e3:ad; - fixed-address 10.228.21.143; -} -host aiac922 { - hardware ethernet 08:94:ef:80:21:3b; - fixed-address 10.228.19.13; -} -host aiac922bmc { - hardware ethernet 08:94:ef:80:21:3a; - fixed-address 10.228.19.12; -} -host acubuntu14 { - hardware ethernet 00:50:56:00:0d:0e; - fixed-address 10.228.13.14; -} -host acopensuse11 { - hardware ethernet 00:50:56:00:0d:0b; - fixed-address 10.228.13.11; -} -host accentos5 { - hardware ethernet 00:50:56:00:0d:05; - fixed-address 10.228.13.5; -} -host zfvpn { - hardware ethernet 00:50:56:00:0a:ec; - fixed-address 10.228.10.236; -} -host zfmssql { - hardware ethernet 00:50:56:00:0a:95; - fixed-address 10.228.10.149; -} -host zfwin81 { - hardware ethernet 00:50:56:00:0a:51; - fixed-address 10.228.10.81; -} -host zfbldw2k08 { - hardware ethernet 00:50:56:00:0a:1c; - fixed-address 10.228.10.28; -} -host zfbldrhel7 { - hardware ethernet 00:50:56:00:0a:1b; - fixed-address 10.228.10.27; -} -host zfbldrhel6 { - hardware ethernet 00:50:56:00:0a:1a; - fixed-address 10.228.10.26; -} -host zfwin2k { - hardware ethernet 00:50:56:00:0a:14; - fixed-address 10.228.10.20; -} -host zfwin7 { - hardware ethernet 00:50:56:00:0a:07; - fixed-address 10.228.10.7; -} -host zfryzen { - hardware ethernet 1c:1b:0d:e4:ed:c7; - fixed-address 10.228.10.3; -} -# zfelleg (BLU R1 HD) -host zfblu-r1-hd { - hardware ethernet cc:79:4a:fe:58:8b; - fixed-address 10.228.10.2; -} diff --git a/sources/dhcp.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/kea.in/c3d/firstboot/scripts/01_setupnetworking.sh similarity index 95% rename from sources/dhcp.in/c3d/firstboot/scripts/01_setupnetworking.sh rename to sources/kea.in/c3d/firstboot/scripts/01_setupnetworking.sh index c3b5832..d95fb34 100755 --- a/sources/dhcp.in/c3d/firstboot/scripts/01_setupnetworking.sh +++ b/sources/kea.in/c3d/firstboot/scripts/01_setupnetworking.sh @@ -67,7 +67,7 @@ nmcli connection add \ connection.id internal \ connection.interface-name $CONNECTION_DEVICE \ connection.type 802-3-ethernet \ - ipv4.addresses "10.228.109.238/16" \ + ipv4.addresses "10.228.109.127/16" \ ipv4.dns "10.228.109.159, 10.228.92.159" \ ipv4.dns-search "in.useribm.hu" \ ipv4.gateway "10.228.109.254" \ @@ -77,5 +77,5 @@ nmcli connection add \ nmcli connection show -hostnamectl hostname dhcp.in.useribm.hu +hostnamectl hostname kea.in.useribm.hu hostnamectl diff --git a/sources/dhcp.in/c3d/firstboot/scripts/02_settimezone.sh b/sources/kea.in/c3d/firstboot/scripts/02_settimezone.sh similarity index 100% rename from sources/dhcp.in/c3d/firstboot/scripts/02_settimezone.sh rename to sources/kea.in/c3d/firstboot/scripts/02_settimezone.sh diff --git a/sources/dhcp.in/c3d/firstboot/scripts/90_setupservices.sh b/sources/kea.in/c3d/firstboot/scripts/90_setupservices.sh similarity index 72% rename from sources/dhcp.in/c3d/firstboot/scripts/90_setupservices.sh rename to sources/kea.in/c3d/firstboot/scripts/90_setupservices.sh index 8b7de4a..9177fb5 100755 --- a/sources/dhcp.in/c3d/firstboot/scripts/90_setupservices.sh +++ b/sources/kea.in/c3d/firstboot/scripts/90_setupservices.sh @@ -1,8 +1,8 @@ #!/bin/sh -systemctl enable dhcpd.service -systemctl start dhcpd.service +systemctl enable kea-dhcp4.service +systemctl start kea-dhcp4.service systemctl enable NetworkManager-wait-online.service systemctl start NetworkManager-wait-online.service diff --git a/sources/dhcp.in/c3d/mode.txt b/sources/kea.in/c3d/mode.txt similarity index 100% rename from sources/dhcp.in/c3d/mode.txt rename to sources/kea.in/c3d/mode.txt diff --git a/sources/kea.in/c3d/postinstall/install-data/etc/kea/kea-dhcp4.conf b/sources/kea.in/c3d/postinstall/install-data/etc/kea/kea-dhcp4.conf new file mode 100644 index 0000000..cb41910 --- /dev/null +++ b/sources/kea.in/c3d/postinstall/install-data/etc/kea/kea-dhcp4.conf @@ -0,0 +1,779 @@ +{ + "Dhcp4": { + "interfaces-config": { + "interfaces": [ "*" ] + }, + "authoritative": true, + "echo-client-id": true, + "option-def": [ + { + "name": "cookie", + "code": 1, + "type": "string", + "space": "APC" + } + ], + "option-data": [ + { + "space": "dhcp4", + "name": "domain-name", + "code": 15, + "data": "in.useribm.hu" + }, + { + "space": "dhcp4", + "name": "domain-name-servers", + "code": 6, + "data": "10.228.92.159, 10.228.109.159" + }, + { + "space": "dhcp4", + "name": "domain-search", + "code": 119, + "data": "in.useribm.hu, sr.user.hu" + }, + { + "space": "dhcp4", + "name": "ntp-servers", + "code": 42, + "data": "10.228.93.1, 10.228.93.2" + }, + { + "space": "dhcp4", + "name": "time-offset", + "code": 2, + "data": "3600" + } + ], + "client-classes": [ + { + "name": "VENDOR_CLASS_APC", + "option-def": [ + { + "name": "vendor-encapsulated-options", + "code": 43, + "type": "empty", + "encapsulate": "APC" + } + ], + "option-data": [ + { + "name": "vendor-encapsulated-options" + }, + { + "always-send": true, + "name": "cookie", + "space": "APC", + "data": "1APC" + } + ] + } + ], + "subnet4": [ + { + "id": 1, + "subnet": "10.228.0.0/16", + "option-data": [ + { + "space": "dhcp4", + "name": "broadcast-address", + "code": 28, + "data": "10.228.255.255" + }, + { + "space": "dhcp4", + "name": "subnet-mask", + "code": 1, + "data": "255.255.0.0" + }, + { + "space": "dhcp4", + "name": "routers", + "code": 3, + "data": "10.228.109.254" + } + ], + "pools": [ + { + "pool": "10.228.43.1 - 10.228.43.254" + } + ] + } + ], + + "host-reservation-identifiers": [ + "hw-address" + ], + "reservation-mode": "global", + "reservations": [ + { + "hostname": "apcups2", + "hw-address": "00:c0:b7:23:dd:7d", + "ip-address": "10.228.226.2" + }, + { + "hostname": "apcups1", + "hw-address": "00:c0:b7:58:c2:0c", + "ip-address": "10.228.226.1" + }, + { + "hostname": "db2svr", + "hw-address": "00:50:56:00:d4:2a", + "ip-address": "10.228.212.42" + }, + { + "hostname": "accounting-usr", + "hw-address": "00:50:56:00:d4:0d", + "ip-address": "10.228.212.13" + }, + { + "hostname": "tsmapil", + "hw-address": "00:50:56:00:c0:d4", + "ip-address": "10.228.192.212" + }, + { + "hostname": "sssbn3", + "hw-address": "00:50:56:00:d1:83", + "ip-address": "10.228.209.131" + }, + { + "hostname": "sssbn2", + "hw-address": "00:50:56:00:d1:82", + "ip-address": "10.228.209.130" + }, + { + "hostname": "sssbn1", + "hw-address": "00:50:56:00:d1:81", + "ip-address": "10.228.209.129" + }, + { + "hostname": "sssan3", + "hw-address": "00:50:56:00:d1:03", + "ip-address": "10.228.209.3" + }, + { + "hostname": "sssan2", + "hw-address": "00:50:56:00:d1:02", + "ip-address": "10.228.209.2" + }, + { + "hostname": "sssan1", + "hw-address": "00:50:56:00:d1:01", + "ip-address": "10.228.209.1" + }, + { + "hostname": "spstsql", + "hw-address": "00:50:56:00:ce:d4", + "ip-address": "10.228.206.212" + }, + { + "hostname": "spstad", + "hw-address": "00:50:56:00:ce:d3", + "ip-address": "10.228.206.211" + }, + { + "hostname": "spstsp", + "hw-address": "00:50:56:00:ce:d2", + "ip-address": "10.228.206.210" + }, + { + "hostname": "spw2k08sql", + "hw-address": "00:50:56:00:ce:cf", + "ip-address": "10.228.206.207" + }, + { + "hostname": "spw2k08sp", + "hw-address": "00:50:56:00:ce:ce", + "ip-address": "10.228.206.206" + }, + { + "hostname": "spw2k08ad", + "hw-address": "00:50:56:00:ce:0e", + "ip-address": "10.228.206.14" + }, + { + "hostname": "ppitsp", + "hw-address": "00:50:56:00:ce:03", + "ip-address": "10.228.206.3" + }, + { + "hostname": "ppitdb", + "hw-address": "00:50:56:00:ce:02", + "ip-address": "10.228.206.2" + }, + { + "hostname": "ppitad", + "hw-address": "00:50:56:00:ce:01", + "ip-address": "10.228.206.1" + }, + { + "hostname": "rredms", + "hw-address": "00:50:56:00:c6:35", + "ip-address": "10.228.198.53" + }, + { + "hostname": "ssam", + "hw-address": "00:50:56:00:c0:d1", + "ip-address": "10.228.192.209" + }, + { + "hostname": "spsbsql", + "hw-address": "00:50:56:00:c0:cf", + "ip-address": "10.228.192.207" + }, + { + "hostname": "spsb", + "hw-address": "00:50:56:00:c0:ce", + "ip-address": "10.228.192.206" + }, + { + "hostname": "tsmddtest", + "hw-address": "00:50:56:00:c0:cc", + "ip-address": "10.228.192.204" + }, + { + "hostname": "toolbox", + "hw-address": "00:50:56:00:c0:ca", + "ip-address": "10.228.192.202" + }, + { + "hostname": "spsbad", + "hw-address": "00:50:56:00:c0:bf", + "ip-address": "10.228.192.191" + }, + { + "hostname": "jenkinswin", + "hw-address": "00:50:56:00:c0:7b", + "ip-address": "10.228.192.123" + }, + { + "hostname": "mkbdarc2dev", + "hw-address": "00:50:56:00:c0:2c", + "ip-address": "10.228.192.44" + }, + { + "hostname": "blobtest", + "hw-address": "00:50:56:00:c0:28", + "ip-address": "10.228.192.40" + }, + { + "hostname": "rkdominoadmin", + "hw-address": "00:50:56:00:bf:01", + "ip-address": "10.228.191.1" + }, + { + "hostname": "rhgssn3", + "hw-address": "00:50:56:00:bb:03", + "ip-address": "10.228.187.3" + }, + { + "hostname": "rhgssn2", + "hw-address": "00:50:56:00:bb:02", + "ip-address": "10.228.187.2" + }, + { + "hostname": "rhgssn1", + "hw-address": "00:50:56:00:bb:01", + "ip-address": "10.228.187.1" + }, + { + "hostname": "purebcw2k12", + "hw-address": "00:50:56:00:a2:f2", + "ip-address": "10.228.162.242" + }, + { + "hostname": "purebcw2k08", + "hw-address": "00:50:56:00:a2:ee", + "ip-address": "10.228.162.238" + }, + { + "hostname": "purebcw2k03", + "hw-address": "00:50:56:00:a2:e9", + "ip-address": "10.228.162.233" + }, + { + "hostname": "purebcrhel7", + "hw-address": "00:50:56:00:a2:bb", + "ip-address": "10.228.162.187" + }, + { + "hostname": "purebcrhel6", + "hw-address": "00:50:56:00:a2:ba", + "ip-address": "10.228.162.186" + }, + { + "hostname": "purebcwdb2105", + "hw-address": "00:50:56:00:a2:6a", + "ip-address": "10.228.162.106" + }, + { + "hostname": "purebcldb2105", + "hw-address": "00:50:56:00:a2:69", + "ip-address": "10.228.162.105" + }, + { + "hostname": "purebcldb297", + "hw-address": "00:50:56:00:a2:61", + "ip-address": "10.228.162.97" + }, + { + "hostname": "msexchange", + "hw-address": "00:50:56:00:95:f3", + "ip-address": "10.228.149.243" + }, + { + "hostname": "msptt4", + "hw-address": "00:50:56:00:95:d4", + "ip-address": "10.228.149.212" + }, + { + "hostname": "msptt3", + "hw-address": "00:50:56:00:95:d3", + "ip-address": "10.228.149.211" + }, + { + "hostname": "msptt2", + "hw-address": "00:50:56:00:95:d2", + "ip-address": "10.228.149.210" + }, + { + "hostname": "msptt1", + "hw-address": "00:50:56:00:95:d1", + "ip-address": "10.228.149.209" + }, + { + "hostname": "msfhblbtest2", + "hw-address": "00:50:56:00:95:04", + "ip-address": "10.228.149.4" + }, + { + "hostname": "msfhblbtest1", + "hw-address": "00:50:56:00:95:03", + "ip-address": "10.228.149.3" + }, + { + "hostname": "msflashtest", + "hw-address": "00:50:56:00:95:02", + "ip-address": "10.228.149.2" + }, + { + "hostname": "mstsmupgrade", + "hw-address": "00:50:56:00:95:01", + "ip-address": "10.228.149.1" + }, + { + "hostname": "svc", + "hw-address": "00:50:56:00:6d:fd", + "ip-address": "10.228.109.253" + }, + { + "hostname": "idm", + "hw-address": "00:50:56:00:6d:fc", + "ip-address": "10.228.109.252" + }, + { + "hostname": "vpn", + "hw-address": "00:50:56:00:6d:fb", + "ip-address": "10.228.109.251" + }, + { + "hostname": "store", + "hw-address": "00:50:56:00:6d:fa", + "ip-address": "10.228.109.250" + }, + { + "hostname": "tsm", + "hw-address": "00:50:56:00:6d:f9", + "ip-address": "10.228.109.249" + }, + { + "hostname": "winadk", + "hw-address": "00:50:56:00:6d:33", + "ip-address": "10.228.109.51" + }, + { + "hostname": "vcsa60", + "hw-address": "00:50:56:00:5d:3c", + "ip-address": "10.228.93.60" + }, + { + "hostname": "vcsvr55", + "hw-address": "00:50:56:00:5d:37", + "ip-address": "10.228.93.55" + }, + { + "hostname": "vhost2", + "hw-address": "e4:1f:13:bc:e0:d0", + "ip-address": "10.228.93.2" + }, + { + "hostname": "vhost1", + "hw-address": "e4:1f:13:bc:c3:20", + "ip-address": "10.228.93.1" + }, + { + "hostname": "svcb", + "hw-address": "00:50:56:00:5c:fd", + "ip-address": "10.228.92.253" + }, + { + "hostname": "fuonyffilenet", + "hw-address": "00:50:56:00:51:02", + "ip-address": "10.228.81.2" + }, + { + "hostname": "futmp", + "hw-address": "00:50:56:00:51:01", + "ip-address": "10.228.81.1" + }, + { + "hostname": "fsmq8004", + "hw-address": "00:50:56:00:4f:54", + "ip-address": "10.228.79.84" + }, + { + "hostname": "frsppapp", + "hw-address": "00:50:56:00:4e:ce", + "ip-address": "10.228.78.206" + }, + { + "hostname": "frtsm71", + "hw-address": "00:50:56:00:4e:47", + "ip-address": "10.228.78.71" + }, + { + "hostname": "fdic922bmc", + "hw-address": "08:94:ef:80:e5:57", + "ip-address": "10.228.64.92" + }, + { + "hostname": "dvredmine", + "hw-address": "00:50:56:00:3e:c1", + "ip-address": "10.228.62.193" + }, + { + "hostname": "dvedmstest", + "hw-address": "00:50:56:00:3e:46", + "ip-address": "10.228.62.70" + }, + { + "hostname": "dvaviglion", + "hw-address": "00:18:85:09:80:06", + "ip-address": "10.228.62.32" + }, + { + "hostname": "desktop-20", + "hw-address": "00:50:56:00:3c:14", + "ip-address": "10.228.60.20" + }, + { + "hostname": "desktop-19", + "hw-address": "00:50:56:00:3c:13", + "ip-address": "10.228.60.19" + }, + { + "hostname": "desktop-18", + "hw-address": "00:50:56:00:3c:12", + "ip-address": "10.228.60.18" + }, + { + "hostname": "desktop-17", + "hw-address": "00:50:56:00:3c:11", + "ip-address": "10.228.60.17" + }, + { + "hostname": "desktop-16", + "hw-address": "00:50:56:00:3c:10", + "ip-address": "10.228.60.16" + }, + { + "hostname": "desktop-15", + "hw-address": "00:50:56:00:3c:0f", + "ip-address": "10.228.60.15" + }, + { + "hostname": "desktop-14", + "hw-address": "00:50:56:00:3c:0e", + "ip-address": "10.228.60.14" + }, + { + "hostname": "desktop-13", + "hw-address": "00:50:56:00:3c:0d", + "ip-address": "10.228.60.13" + }, + { + "hostname": "desktop-12", + "hw-address": "00:50:56:00:3c:0c", + "ip-address": "10.228.60.12" + }, + { + "hostname": "desktop-11", + "hw-address": "00:50:56:00:3c:0b", + "ip-address": "10.228.60.11" + }, + { + "hostname": "desktop-10", + "hw-address": "00:50:56:00:3c:0a", + "ip-address": "10.228.60.10" + }, + { + "hostname": "desktop-09", + "hw-address": "00:50:56:00:3c:09", + "ip-address": "10.228.60.9" + }, + { + "hostname": "desktop-08", + "hw-address": "00:50:56:00:3c:08", + "ip-address": "10.228.60.8" + }, + { + "hostname": "desktop-07", + "hw-address": "00:50:56:00:3c:07", + "ip-address": "10.228.60.7" + }, + { + "hostname": "desktop-06", + "hw-address": "00:50:56:00:3c:06", + "ip-address": "10.228.60.6" + }, + { + "hostname": "desktop-05", + "hw-address": "00:50:56:00:3c:05", + "ip-address": "10.228.60.5" + }, + { + "hostname": "desktop-04", + "hw-address": "00:50:56:00:3c:04", + "ip-address": "10.228.60.4" + }, + { + "hostname": "desktop-03", + "hw-address": "00:50:56:00:3c:03", + "ip-address": "10.228.60.3" + }, + { + "hostname": "desktop-02", + "hw-address": "00:50:56:00:3c:02", + "ip-address": "10.228.60.2" + }, + { + "hostname": "desktop-01", + "hw-address": "00:50:56:00:3c:01", + "ip-address": "10.228.60.1" + }, + { + "hostname": "ads", + "hw-address": "00:50:56:00:2a:f6", + "ip-address": "10.228.42.246" + }, + { + "hostname": "spelive", + "hw-address": "00:50:56:00:2a:f5", + "ip-address": "10.228.42.245" + }, + { + "hostname": "datacap-rr", + "hw-address": "00:50:56:00:2a:ec", + "ip-address": "10.228.42.236" + }, + { + "hostname": "testcibod9", + "hw-address": "00:50:56:00:2a:e7", + "ip-address": "10.228.42.231" + }, + { + "hostname": "rtc4", + "hw-address": "00:50:56:00:2a:d0", + "ip-address": "10.228.42.208" + }, + { + "hostname": "vmbkp", + "hw-address": "00:50:56:00:2a:cf", + "ip-address": "10.228.42.207" + }, + { + "hostname": "mqsvr", + "hw-address": "00:50:56:00:2a:ce", + "ip-address": "10.228.42.206" + }, + { + "hostname": "mqback", + "hw-address": "00:50:56:00:2a:cd", + "ip-address": "10.228.42.205" + }, + { + "hostname": "mqfiles", + "hw-address": "00:50:56:00:2a:cc", + "ip-address": "10.228.42.204" + }, + { + "hostname": "azsamboki01", + "hw-address": "00:50:56:00:2a:cb", + "ip-address": "10.228.42.203" + }, + { + "hostname": "csldallianz", + "hw-address": "00:50:56:00:2a:c2", + "ip-address": "10.228.42.194" + }, + { + "hostname": "tsmmon-p", + "hw-address": "00:50:56:00:2a:be", + "ip-address": "10.228.42.190" + }, + { + "hostname": "tsmmon-s", + "hw-address": "00:50:56:00:2a:bd", + "ip-address": "10.228.42.189" + }, + { + "hostname": "accounting", + "hw-address": "00:50:56:00:2a:bc", + "ip-address": "10.228.42.188" + }, + { + "hostname": "jenkinslnx", + "hw-address": "00:50:56:00:2a:b9", + "ip-address": "10.228.42.185" + }, + { + "hostname": "jenkinstst", + "hw-address": "00:50:56:00:2a:b8", + "ip-address": "10.228.42.184" + }, + { + "hostname": "ssam71", + "hw-address": "00:50:56:00:2a:b4", + "ip-address": "10.228.42.180" + }, + { + "hostname": "cfserver", + "hw-address": "00:0c:29:ca:eb:d3", + "ip-address": "10.228.36.1" + }, + { + "hostname": "cdvm", + "hw-address": "00:50:56:00:22:e9", + "ip-address": "10.228.34.233" + }, + { + "hostname": "cds822p4", + "hw-address": "98:be:94:04:06:fb", + "ip-address": "10.228.34.25" + }, + { + "hostname": "cds822p3", + "hw-address": "98:be:94:04:06:fa", + "ip-address": "10.228.34.24" + }, + { + "hostname": "cds822p2", + "hw-address": "98:be:94:04:06:f9", + "ip-address": "10.228.34.23" + }, + { + "hostname": "cds822p1", + "hw-address": "98:be:94:04:06:f8", + "ip-address": "10.228.34.22" + }, + { + "hostname": "cds822hmc2", + "hw-address": "98:be:94:4c:5e:3f", + "ip-address": "10.228.34.2" + }, + { + "hostname": "cds822hmc1", + "hw-address": "98:be:94:4c:5e:3e", + "ip-address": "10.228.34.1" + }, + { + "hostname": "akmacmini", + "hw-address": "10:dd:b1:b3:e3:ad", + "ip-address": "10.228.21.143" + }, + { + "hostname": "aiac922", + "hw-address": "08:94:ef:80:21:3b", + "ip-address": "10.228.19.13" + }, + { + "hostname": "aiac922bmc", + "hw-address": "08:94:ef:80:21:3a", + "ip-address": "10.228.19.12" + }, + { + "hostname": "acubuntu14", + "hw-address": "00:50:56:00:0d:0e", + "ip-address": "10.228.13.14" + }, + { + "hostname": "acopensuse11", + "hw-address": "00:50:56:00:0d:0b", + "ip-address": "10.228.13.11" + }, + { + "hostname": "accentos5", + "hw-address": "00:50:56:00:0d:05", + "ip-address": "10.228.13.5" + }, + { + "hostname": "zfvpn", + "hw-address": "00:50:56:00:0a:ec", + "ip-address": "10.228.10.236" + }, + { + "hostname": "zfmssql", + "hw-address": "00:50:56:00:0a:95", + "ip-address": "10.228.10.149" + }, + { + "hostname": "zfwin81", + "hw-address": "00:50:56:00:0a:51", + "ip-address": "10.228.10.81" + }, + { + "hostname": "zfbldw2k08", + "hw-address": "00:50:56:00:0a:1c", + "ip-address": "10.228.10.28" + }, + { + "hostname": "zfbldrhel7", + "hw-address": "00:50:56:00:0a:1b", + "ip-address": "10.228.10.27" + }, + { + "hostname": "zfbldrhel6", + "hw-address": "00:50:56:00:0a:1a", + "ip-address": "10.228.10.26" + }, + { + "hostname": "zfwin2k", + "hw-address": "00:50:56:00:0a:14", + "ip-address": "10.228.10.20" + }, + { + "hostname": "zfwin7", + "hw-address": "00:50:56:00:0a:07", + "ip-address": "10.228.10.7" + }, + { + "hostname": "zfryzen", + "hw-address": "1c:1b:0d:e4:ed:c7", + "ip-address": "10.228.10.3" + } + ], + + "loggers": [ + { + "name": "kea-dhcp4", + "output_options": [ + { + "output": "syslog" + } + ], + "severity": "INFO", + "debuglevel": 0 + } + ] + } +} diff --git a/sources/kea.in/c3d/postinstall/install-data/etc/rsyslog.d/remote.conf b/sources/kea.in/c3d/postinstall/install-data/etc/rsyslog.d/remote.conf new file mode 100644 index 0000000..550bb6d --- /dev/null +++ b/sources/kea.in/c3d/postinstall/install-data/etc/rsyslog.d/remote.conf @@ -0,0 +1,7 @@ +:programname, isequal, "kea-dhcp4" action(type="omfwd" + queue.type="linkedlist" + queue.filename="fwd_queue" + action.resumeRetryCount="-1" + queue.saveOnShutdown="on" + target="log.in.useribm.hu" port="514" protocol="tcp" +) diff --git a/sources/dhcp.in/c3d/postinstall/scripts/10_setupservices.sh b/sources/kea.in/c3d/postinstall/scripts/10_setupservices.sh similarity index 73% rename from sources/dhcp.in/c3d/postinstall/scripts/10_setupservices.sh rename to sources/kea.in/c3d/postinstall/scripts/10_setupservices.sh index fad3b1f..81282d7 100755 --- a/sources/dhcp.in/c3d/postinstall/scripts/10_setupservices.sh +++ b/sources/kea.in/c3d/postinstall/scripts/10_setupservices.sh @@ -1,7 +1,7 @@ #!/bin/sh -systemctl disable dhcpd.service +systemctl disable kea-dhcp4.service systemctl disable NetworkManager-wait-online.service systemctl disable logrotate.timer diff --git a/sources/dhcp.in/config b/sources/kea.in/config similarity index 86% rename from sources/dhcp.in/config rename to sources/kea.in/config index a4c0c54..935e386 100644 --- a/sources/dhcp.in/config +++ b/sources/kea.in/config @@ -1,7 +1,7 @@ lxc.include = /usr/share/lxc/config/common.conf lxc.arch = x86_64 -lxc.uts.name = dhcp.in.useribm.hu +lxc.uts.name = kea.in.useribm.hu lxc.rootfs.path = __CONTAINER_PATH__/rootfs lxc.rootfs.options = idmap=container lxc.mount.auto = proc:rw sys:ro @@ -9,7 +9,7 @@ lxc.mount.auto = proc:rw sys:ro lxc.net.0.type = veth lxc.net.0.flags = up lxc.net.0.link = brci-dev -lxc.net.0.hwaddr = 02:0c:18:03:6d:ee +lxc.net.0.hwaddr = 02:0c:18:03:6d:7f lxc.autodev = 1 diff --git a/sources/dhcp.in/envvars b/sources/kea.in/envvars similarity index 58% rename from sources/dhcp.in/envvars rename to sources/kea.in/envvars index 5eab331..8cfa5af 100644 --- a/sources/dhcp.in/envvars +++ b/sources/kea.in/envvars @@ -1,3 +1,3 @@ DISTRIBUTION=Fedora DISTRIBUTION_VERSION=39 -SPEC_PACKAGES="dhcp-server" +SPEC_PACKAGES="kea dhcp-keama" diff --git a/sources/log.in/config b/sources/log.in/config index a8d474d..b336645 100644 --- a/sources/log.in/config +++ b/sources/log.in/config @@ -1,7 +1,7 @@ lxc.include = /usr/share/lxc/config/common.conf lxc.arch = x86_64 -lxc.uts.name = ls.in.useribm.hu +lxc.uts.name = log.in.useribm.hu lxc.rootfs.path = __CONTAINER_PATH__/rootfs lxc.rootfs.options = idmap=container lxc.mount.auto = proc:rw sys:ro diff --git a/sources/start-order.txt b/sources/start-order.txt index bc245d9..78365a9 100644 --- a/sources/start-order.txt +++ b/sources/start-order.txt @@ -13,23 +13,25 @@ group 4: ifg.in 31 group 5: - dhcp.in 41 - ls.in 42 - mx.in 43 - ns1.in 44 - ns2.in 45 - vpn.in 46 + kea.in 41 + kms.in 42 + log.in 43 + mx.in 44 + ns1.in 45 + ns2.in 46 + vpn.in 47 group 6: - fds.in 51 - pki.in 52 - sns.in 53 - wiki.in 54 + db2.in 51 + fds.in 52 + pki.in 53 + slycrm.in 54 + sns.in 55 + wiki.in 56 group 7: git.pm 61 - hg.pm 62 - svn.pm 63 + gitea.in 62 group 8: dhsvn.in 71