diff options
| author | Micah Anderson <micah@riseup.net> | 2013-07-04 07:30:11 -0400 | 
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-07-04 07:30:11 -0400 | 
| commit | 9889da139c08f57bd7ac81729371b0ad447848ff (patch) | |
| tree | 80f4fa7f1172111a7a419090f4a6ff438266e0a6 | |
| parent | 85af5272ed1e22369b9e9df54c63eaaf905b23f8 (diff) | |
| parent | 597dc1d48e4d8d4bdb8e5292f31da8151b2da5a3 (diff) | |
Merge branch 'leap/develop' into develop0.2.2rc1
| -rw-r--r-- | puppet/modules/site_config/manifests/resolvconf.pp | 11 | 
1 files changed, 0 insertions, 11 deletions
diff --git a/puppet/modules/site_config/manifests/resolvconf.pp b/puppet/modules/site_config/manifests/resolvconf.pp index d73f0b78..271c5043 100644 --- a/puppet/modules/site_config/manifests/resolvconf.pp +++ b/puppet/modules/site_config/manifests/resolvconf.pp @@ -1,16 +1,5 @@  class site_config::resolvconf { -  # bind9 purging can be taken out after some time -  package { 'bind9': -    ensure => absent, -  } -  file { '/etc/default/bind9': -    ensure    => absent; -  } -  file { '/etc/bind/named.conf.options': -    ensure => absent; -  } -    $domain_public = $site_config::default::domain_hash['full_suffix']    # 127.0.0.1:      caching-only local bind  | 
