Move net-tools install to basic_software

diff --git a/personal_infra/puppet/modules/basic_software/manifests/init.pp b/personal_infra/puppet/modules/basic_software/manifests/init.pp
index f7638ee1ca7ace58805af8ab7b45e2bec6319d6c..fdfaeabc4bd642ef77ce0322c7d9e5ee18a1e70e 100644 (file)
--- 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 e6f712dfb22221805b76239f2a03b78925cfe4af..7d7427a1055c0da234f5e5f692840cb763fd6b66 100644 (file)
--- 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':