From 60dd4dddc84f58ed21b40b2c84afdba5bc4b5be3 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 3 Oct 2024 21:17:14 +0200 Subject: [PATCH] Move net-tools install to basic_software --- personal_infra/puppet/modules/basic_software/manifests/init.pp | 2 +- personal_infra/puppet/site/h1.pdp7.net.pp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/personal_infra/puppet/modules/basic_software/manifests/init.pp b/personal_infra/puppet/modules/basic_software/manifests/init.pp index f7638ee..fdfaeab 100644 --- a/personal_infra/puppet/modules/basic_software/manifests/init.pp +++ b/personal_infra/puppet/modules/basic_software/manifests/init.pp @@ -1,5 +1,5 @@ class basic_software { - package {['less', 'mlocate', 'traceroute', 'nmap', 'tree', 'tar', 'screen', 'git']:} + package {['less', 'mlocate', 'traceroute', 'nmap', 'tree', 'tar', 'screen', 'git', 'net-tools']:} if($facts['os']['family'] == 'RedHat') { package {'which':} diff --git a/personal_infra/puppet/site/h1.pdp7.net.pp b/personal_infra/puppet/site/h1.pdp7.net.pp index e6f712d..7d7427a 100644 --- a/personal_infra/puppet/site/h1.pdp7.net.pp +++ b/personal_infra/puppet/site/h1.pdp7.net.pp @@ -35,9 +35,6 @@ node 'h1.pdp7.net' { , } - # TODO: ugly; tinc scripts require this :( - package {'net-tools':} - # https://lists.fedorahosted.org/archives/list/freeipa-users@lists.fedorahosted.org/thread/EZSM6LQPSNRY4WA52IYVR46RSXIDU3U7/ # SSH hack file {'/etc/ssh/sshd_config.d/weak-gss.conf': -- 2.47.3