aboutsummaryrefslogtreecommitdiff
path: root/personal_infra
diff options
context:
space:
mode:
authoralex <alex@pdp7.net>2024-10-03 21:17:14 +0200
committeralexpdp7 <alex@corcoles.net>2024-10-03 21:19:39 +0200
commit60dd4dddc84f58ed21b40b2c84afdba5bc4b5be3 (patch)
tree37209fb66189296c2fd209025815531864c12404 /personal_infra
parentca0b07ad08ed8e07ce9e4f93939ab8aee4220488 (diff)
Move net-tools install to basic_software
Diffstat (limited to 'personal_infra')
-rw-r--r--personal_infra/puppet/modules/basic_software/manifests/init.pp2
-rw-r--r--personal_infra/puppet/site/h1.pdp7.net.pp3
2 files changed, 1 insertions, 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 f7638ee1..fdfaeabc 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 e6f712df..7d7427a1 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':