From f81d1a2b8c74344d6926fc0101a70339c0d88e20 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 5 Feb 2023 22:07:39 +0100 Subject: [PATCH] Remove FreeIPA dnmasq --- personal_infra/puppet/site/case.ces.int.pdp7.net.pp | 2 -- personal_infra/puppet/site/dixie.bcn.int.pdp7.net.pp | 1 - personal_infra/puppet/site/h1.pdp7.net.pp | 1 - personal_infra/puppet/site/h2.pdp7.net.pp | 3 +-- personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp | 1 - 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/personal_infra/puppet/site/case.ces.int.pdp7.net.pp b/personal_infra/puppet/site/case.ces.int.pdp7.net.pp index 1b0b9f3..2b4844c 100644 --- a/personal_infra/puppet/site/case.ces.int.pdp7.net.pp +++ b/personal_infra/puppet/site/case.ces.int.pdp7.net.pp @@ -7,6 +7,4 @@ host-record=tplink,tplink.ces.int.pdp7.net,10.17.19.2 host-record=case.ces.int.pdp7.net,case,10.17.19.3 ', } - - class {'freeipa::dnsmasq':} } diff --git a/personal_infra/puppet/site/dixie.bcn.int.pdp7.net.pp b/personal_infra/puppet/site/dixie.bcn.int.pdp7.net.pp index caf0d92..0b04c3d 100644 --- a/personal_infra/puppet/site/dixie.bcn.int.pdp7.net.pp +++ b/personal_infra/puppet/site/dixie.bcn.int.pdp7.net.pp @@ -8,5 +8,4 @@ dhcp-option=121,10.0.0.0/8,192.168.76.2 ", notify => Service["dnsmasq"], } - class {'freeipa::dnsmasq':} } diff --git a/personal_infra/puppet/site/h1.pdp7.net.pp b/personal_infra/puppet/site/h1.pdp7.net.pp index 1c6ae1c..af66ab5 100644 --- a/personal_infra/puppet/site/h1.pdp7.net.pp +++ b/personal_infra/puppet/site/h1.pdp7.net.pp @@ -1,7 +1,6 @@ node 'h1.pdp7.net' { class {'proxmox::freeipa':} class {'dns_dhcp':} - class {'freeipa::dnsmasq':} # TODO: ugly; tinc scripts require this :( package {'net-tools':} diff --git a/personal_infra/puppet/site/h2.pdp7.net.pp b/personal_infra/puppet/site/h2.pdp7.net.pp index 99255f1..51dda7a 100644 --- a/personal_infra/puppet/site/h2.pdp7.net.pp +++ b/personal_infra/puppet/site/h2.pdp7.net.pp @@ -1,10 +1,9 @@ node 'h2.pdp7.net' { class {'dns_dhcp':} - class {'freeipa::dnsmasq':} file {'/etc/dnsmasq.d/static.conf': content => "dhcp-host=freeswitch,10.42.42.3,freeswitch host-record=h2.h2.int.pdp7.net,10.42.42.1 ", - } + } } diff --git a/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp b/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp index 106049e..064af4d 100644 --- a/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp +++ b/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp @@ -1,6 +1,5 @@ node 'maelcum.mad.int.pdp7.net' { class {'dns_dhcp':} - class {'freeipa::dnsmasq':} file {'/etc/dnsmasq.d/static.conf': content => 'host-record=router,router.mad.int.pdp7.net,10.34.10.1 dhcp-host=d8:8c:79:1a:11:59,chromecast,10.34.10.3 -- 2.47.3