summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varac@users.noreply.github.com>2015-06-02 16:46:20 +0200
committervarac <varac@users.noreply.github.com>2015-06-02 16:46:20 +0200
commit5c0fe23dccc285adde85e45a5ee41922d2e5a891 (patch)
treedff7ec7b07e95078875bbb2f3d4d380f7aa3afdb /puppet
parentf868a99e76b58243a0fd6321841cca4ad3091dba (diff)
parent8b74c455efe54c681fe9a18ba30915b284dd58ff (diff)
Merge pull request #71 from cz8s/ensure_dhcp_enterhook_present
ensure the enterhooks directory is present
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/dhclient.pp8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/dhclient.pp b/puppet/modules/site_config/manifests/dhclient.pp
index dbe2ef1c..7755413b 100644
--- a/puppet/modules/site_config/manifests/dhclient.pp
+++ b/puppet/modules/site_config/manifests/dhclient.pp
@@ -22,11 +22,19 @@ class site_config::dhclient {
require => File['/usr/local/sbin/reload_dhclient'],
}
+ file { '/etc/dhcp/dhclient-enter-hooks.d':
+ ensure => directory,
+ mode => '0755',
+ owner => 'root',
+ group => 'root',
+ }
+
file { '/etc/dhcp/dhclient-enter-hooks.d/disable_resolvconf':
content => 'make_resolv_conf() { : ; } ; set_hostname() { : ; }',
mode => '0644',
owner => 'root',
group => 'root',
+ require => File['/etc/dhcp/dhclient-enter-hooks.d'],
notify => Exec['reload_dhclient'];
}
}