Merge branch 'develop'

4 files changed, 14 insertions, 21 deletions

diff --git a/puppet/modules/site_config/manifests/caching_resolver.pp b/puppet/modules/site_config/manifests/caching_resolver.pp
index 1b8bd1a2..cdebbad0 100644
--- a/puppet/modules/site_config/manifests/caching_resolver.pp
+++ b/puppet/modules/site_config/manifests/caching_resolver.pp
@@ -1,32 +1,12 @@
 class site_config::caching_resolver {
   tag 'leap_base'
 
-  # Setup a conf.d directory to place additional unbound configuration files.
-  # There must be at least one file in the directory, or unbound will not start,
-  # so create an empty placeholder to ensure this.
-
-  # Note: the version of unbound we are working with does not accept a wildcard
-  # for an include directive, so we are not able to use this. When we can use
-  # the newer unbound, then we will add 'include: /etc/unbound.d/*' to the
-  # configuration file
-
   include site_apt::preferences::unbound
 
-  file {
-    # cleanup from how we used to do it
-    '/etc/unbound/conf.d':
-      force   => true,
-      ensure  => absent;
-
-    '/etc/unbound/conf.d/placeholder':
-      ensure  => absent;
-  }
-
   class { 'unbound':
     root_hints => false,
     anchor     => false,
     ssl        => false,
-    require    => File['/etc/unbound/conf.d/placeholder'],
     settings   => {
       server       => {
         verbosity      => '1',
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'];
   }
 }
diff --git a/puppet/modules/site_config/manifests/packages/base.pp b/puppet/modules/site_config/manifests/packages/base.pp
index f20d04a4..c23495fc 100644
--- a/puppet/modules/site_config/manifests/packages/base.pp
+++ b/puppet/modules/site_config/manifests/packages/base.pp
@@ -1,3 +1,4 @@
+# install default packages and remove unwanted packages
 class site_config::packages::base {
 
 
@@ -7,7 +8,7 @@ class site_config::packages::base {
   }
 
   # base set of packages that we want to remove everywhere
-  package { [ 'acpi', 'acpid', 'acpi-support-base',  'eject', 'ftp',
+  package { [ 'acpi', 'eject', 'ftp',
               'laptop-detect', 'lpr', 'nfs-common', 'nfs-kernel-server',
               'portmap', 'pppconfig', 'pppoe', 'pump', 'qstat', 'rpcbind',
               'samba-common', 'samba-common-bin', 'smbclient', 'tcl8.5',
diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp
index 3f46659c..b339e6af 100644
--- a/puppet/modules/site_config/manifests/remove_files.pp
+++ b/puppet/modules/site_config/manifests/remove_files.pp
@@ -27,6 +27,10 @@ class site_config::remove_files {
       path => '/var/log/',
       recurse => true,
       matches => 'leap_mx*';
+    'leap_mx_rotate':
+      path => '/var/log/leap/',
+      recurse => true,
+      matches => [ 'mx.log.[0-9]', 'mx.log.[0-9]?', 'mx.log.[6-9]?gz'];
     '/srv/leap/webapp/public/provider.json':;
     '/srv/leap/couchdb/designs/tmp_users':
       recurse => true,