Add support for AIX osfamily and refactoring

manifests/config.pp

@@ -0,0 +1,40 @@
+class logrotate::config {
+
+    include ::logrotate
+
+    File {
+        owner   => 'root',
+        group   => '0'
+    }
+
+    file { $::logrotate::config_file:
+        ensure  => file,
+        mode    => '0444',
+        content => template('logrotate/etc/logrotate.conf.erb')
+    }
+
+    file { $::logrotate::config_dir:
+        ensure  => directory,
+        mode    => '0755'
+    }
+
+    file { $::logrotate::daily_cron_script:
+        ensure  => file,
+        mode    => '0555',
+        content => template('logrotate/etc/cron.daily/logrotate.erb')
+    }
+
+    # For O.S like AIX that does not have /etc/cron.{daily,hourly,...}
+    # feature, just create a standard cron task
+    if $::logrotate::has_cron_d_feature == false {
+        cron { 'logrotate-daily-task':
+            command     => $::logrotate::daily_cron_script,
+            minute      => ['25'],
+            hour        => ['06'],
+            monthday    => absent,
+            weekday     => absent,
+            user        => 'root',
+            ensure      => 'present'
+        }
+    }
+}

manifests/defaults.pp

@@ -0,0 +1,14 @@
+class logrotate::defaults {
+  case $::osfamily {
+    'Debian': {
+      include ::logrotate::defaults::debian
+    }
+    'RedHat': {
+      include ::logrotate::defaults::redhat
+    }
+    'SuSE': {
+      include ::logrotate::defaults::suse
+    }
+    default: { }
+  }
+}

manifests/hourly.pp

@@ -13,6 +13,9 @@
 #     ensure => absent,
 #   }
 class logrotate::hourly($ensure='present') {
+
+  include ::logrotate
+
   case $ensure {
     'absent': {
       $dir_ensure = $ensure
@@ -25,21 +28,41 @@
     }
   }
 
-  file {
-    '/etc/logrotate.d/hourly':
-      ensure => $dir_ensure,
-      owner  => 'root',
-      group  => 'root',
-      mode   => '0755';
-    '/etc/cron.hourly/logrotate':
-      ensure  => $ensure,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0555',
-      source  => 'puppet:///modules/logrotate/etc/cron.hourly/logrotate',
-      require => [
-        File['/etc/logrotate.d/hourly'],
-        Package['logrotate'],
-      ];
+  File {
+    owner   => 'root',
+    group   => '0'
+  }
+
+  $hourly_config_dir = "${::logrotate::config_dir}/hourly"
+
+  file { $hourly_config_dir:
+    ensure  => $dir_ensure,
+    mode    => '0755' 
+  }
+
+  file { $::logrotate::hourly_cron_script:
+    ensure  => $ensure,
+    mode    => '0555',
+    content => template('logrotate/etc/cron.hourly/logrotate.erb'),
+    require => [
+      File[$hourly_config_dir],
+      Package[$::logrotate::package_name]
+    ]
+  }
+
+  # For O.S like AIX that does not have /etc/cron.{daily,hourly,...}
+  # feature, just create a standard cron task
+  if $::logrotate::has_cron_d_feature == false {
+    if ! defined(Cron['logrotate-hourly-task']) {
+      cron { 'logrotate-hourly-task':
+        command     => $::logrotate::hourly_cron_script,
+        minute      => ['17'],
+        hour        => absent,
+        monthday    => absent,
+        weekday     => absent,
+        user        => 'root',
+        ensure      => $ensure
+      }
+    }
   }
 }

manifests/init.pp

@@ -0,0 +1,15 @@
+class logrotate(
+    $package_name       = $::logrotate::params::package_name,
+    $package_ensure     = $::logrotate::params::package_ensure,
+    $config_file        = $::logrotate::params::logrotate_config_file,
+    $config_dir         = $::logrotate::params::logrotate_config_dir,
+    $daily_cron_script  = $::logrotate::params::logrotate_daily_cron_script,
+    $hourly_cron_script = $::logrotate::params::logrotate_hourly_cron_script,
+    $bin_path           = $::logrotate::params::logrotate_bin_path,
+    $has_cron_d_feature = $::logrotate::params::has_cron_d_feature
+) inherits ::logrotate::params {
+
+    class { '::logrotate::install': } ->
+    class { '::logrotate::config': } ->
+    class { '::logrotate::defaults': }
+}

manifests/install.pp

@@ -0,0 +1,8 @@
+class logrotate::install {
+
+    include ::logrotate
+
+    package { $::logrotate::package_name:
+        ensure  => $::logrotate::package_ensure
+    }
+}

manifests/params.pp

@@ -0,0 +1,23 @@
+class logrotate::params {
+    $package_name = 'logrotate'
+    $package_ensure = 'latest'
+    $logrotate_config_file = '/etc/logrotate.conf'
+    $logrotate_config_dir = '/etc/logrotate.d'
+    $logrotate_bin_path = '/usr/sbin/logrotate'
+
+    case $::osfamily {
+        'AIX': {
+            # Note(riton):
+            # If someone finds a better place to drop those scripts, be my
+            # guest.
+            $logrotate_daily_cron_script = '/usr/bin/logrotate.daily'
+            $logrotate_hourly_cron_script = '/usr/bin/logrotate.hourly'
+            $has_cron_d_feature = false
+        }
+        default: {
+            $logrotate_daily_cron_script = '/etc/cron.daily/logrotate'
+            $logrotate_hourly_cron_script = '/etc/cron.hourly/logrotate'
+            $has_cron_d_feature = true 
+        }
+    }
+}

manifests/rule.pp

@@ -401,21 +401,23 @@
   #############################################################################
   #
 
-  include logrotate::base
+  include ::logrotate
+
+  $hourly_config_dir = "${::logrotate::config_dir}/hourly"
 
   case $rotate_every {
     'hour', 'hourly': {
-      include logrotate::hourly
-      $rule_path = "/etc/logrotate.d/hourly/${name}"
+      include ::logrotate::hourly
+      $rule_path = "${hourly_config_dir}/${name}"
 
-      file { "/etc/logrotate.d/${name}":
+      file { "${::logrotate::config_dir}/${name}":
         ensure => absent,
       }
     }
     default: {
-      $rule_path = "/etc/logrotate.d/${name}"
+      $rule_path = "${::logrotate::config_dir}/${name}"
 
-      file { "/etc/logrotate.d/hourly/${name}":
+      file { "${hourly_config_dir}/${name}":
         ensure => absent,
       }
     }
@@ -424,9 +426,9 @@
   file { $rule_path:
     ensure  => $ensure,
     owner   => 'root',
-    group   => 'root',
+    group   => '0',
     mode    => '0444',
     content => template('logrotate/etc/logrotate.d/rule.erb'),
-    require => Class['logrotate::base'],
+    require => Class['logrotate'],
   }
 }

files/etc/cron.hourly/logrotate → templates/etc/cron.daily/logrotate.erb

@@ -2,7 +2,7 @@
 # THIS FILE IS AUTOMATICALLY DISTRIBUTED BY PUPPET.  ANY CHANGES WILL BE
 # OVERWRITTEN.
 
-OUTPUT=$(/usr/sbin/logrotate /etc/logrotate.d/hourly 2>&1)
+OUTPUT=$(<%= scope.lookupvar('::logrotate::bin_path') -%> <%= scope.lookupvar('::logrotate::config_file') -%> 2>&1)
 EXITVALUE=$?
 if [ $EXITVALUE != 0 ]; then
     /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"

files/etc/cron.daily/logrotate → templates/etc/cron.hourly/logrotate.erb

@@ -2,7 +2,7 @@
 # THIS FILE IS AUTOMATICALLY DISTRIBUTED BY PUPPET.  ANY CHANGES WILL BE
 # OVERWRITTEN.
 
-OUTPUT=$(/usr/sbin/logrotate /etc/logrotate.conf 2>&1)
+OUTPUT=$(<%= scope.lookupvar('::logrotate::bin_path') -%> <%= @hourly_config_dir -%> 2>&1)
 EXITVALUE=$?
 if [ $EXITVALUE != 0 ]; then
     /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"

files/etc/logrotate.conf → templates/etc/logrotate.conf.erb

@@ -12,4 +12,4 @@ rotate 4
 create
 
 # packages drop log rotation information into this directory
-include /etc/logrotate.d
+include <%= @config_dir %>