Merge pull request #268 from voxpupuli/modulesync

modulesync 0.12.2 + Improvements
voxpupuli · Aug 27, 2016 · fae91e7 · fae91e7
2 parents 7395f66 + 112fc0d
commit fae91e7
Show file tree

Hide file tree

Showing 9 changed files with 638 additions and 440 deletions.
diff --git a/manifests/agent.pp b/manifests/agent.pp
@@ -315,7 +315,9 @@
 
   # Ensure that the correct config file is used.
   zabbix::startup {'zabbix-agent':
-    require => Package[$zabbix_package_agent],
+    pidfile               => $pidfile,
+    agent_configfile_path => $agent_configfile_path,
+    require               => Package[$zabbix_package_agent],
   }
 
   if $agent_configfile_path != '/etc/zabbix/zabbix_agentd.conf' {

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -26,7 +26,7 @@
       $server_fping6location = '/usr/bin/fping6'
       $proxy_fpinglocation   = '/usr/bin/fping'
       $proxy_fping6location  = '/usr/bin/fping6'
-      $manage_repo = false
+      $manage_repo           = false
       $zabbix_package_agent  = 'zabbix3-agent'
 
     }

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -108,7 +108,7 @@
         Class['Apt::Update']  -> Package<|tag == 'zabbix'|>
       }
       default  : {
-        fail('Unrecognized operating system for webserver')
+        fail("Managing a repo on ${::osfamily} is currently not implemented")
       }
     }
   } # end if ($manage_repo)

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -436,7 +436,10 @@
 
   # Ensure that the correct config file is used.
   zabbix::startup {'zabbix-server':
-    require => Package["zabbix-server-${db}"],
+    pidfile                => $pidfile,
+    database_type          => $database_type,
+    server_configfile_path => $server_configfile_path,
+    require                => Package["zabbix-server-${db}"],
   }
 
   if $server_configfile_path != '/etc/zabbix/zabbix_server.conf' {
@@ -532,7 +535,7 @@
   }
 
   # check if selinux is active and allow zabbix
-  if $::osfamily == 'RedHat' and $::selinux_config_mode == 'enforcing' {
+  if $::selinux_config_mode == 'enforcing' {
     selboolean{'zabbix_can_network':
       persistent => true,
       value      => 'on',

diff --git a/manifests/startup.pp b/manifests/startup.pp
@@ -11,16 +11,34 @@
 #  zabbix::startup { 'agent':
 #  }
 #
-# === Authors
-#
-# Author Name: ikben@werner-dijkerman.nl
-#
-# === Copyright
-#
-# Copyright 2014 Werner Dijkerman
-#
-define zabbix::startup {
+define zabbix::startup (
+  $pidfile                = undef,
+  $agent_configfile_path  = undef,
+  $server_configfile_path = undef,
+  $database_type          = undef,
+  ) {
+  case $title {
+    /agent/: {
+      unless $agent_configfile_path {
+        fail('you have to provide a agent_configfile_path param')
+      }
+    }
+    /server/: {
+      unless $server_configfile_path {
+        fail('you have to provide a server_configfile_path param')
+      }
+      unless $database_type {
+        fail('you have to provide a database_type param')
+      }
+    }
+    default: {
+      fail('we currently only spport a title that contains agent or server')
+    }
+  }
   if str2bool($::systemd) {
+    unless $pidfile {
+      fail('you have to provide a pidfile param')
+    }
     contain ::systemd
     file { "/etc/systemd/system/${name}.service":
       ensure  => file,
@@ -39,5 +57,7 @@
       mode    => '0755',
       content => template("zabbix/${name}-${osfamily_downcase}.init.erb"),
     }
+  } else {
+    fail('We currently only support Debian and RedHat osfamily as non-systemd')
   }
-}
+}