make it possible to pass the config content, linting

diff --git a/manifests/base.pp b/manifests/base.pp
index 4b9f0355332dc995373274d3412f9579a760413e..6eee36fc357ded36046bf530a05d8bf9bf302856 100644 (file)
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,21 +1,33 @@
+# manages the basic stuff for the service
 class ejabberd::base {
   package{'ejabberd':
     ensure => installed,
   }
 
   file{'/etc/ejabberd/ejabberd.cfg':
-    source => [ "puppet:///modules/site_ejabberd/${::fqdn}/ejabberd.cfg",
-                "puppet:///modules/site_ejabberd/ejabberd.cfg",
-                "puppet:///modules/ejabberd/ejabberd.cfg" ],
     require => Package['ejabberd'],
-    notify => Service['ejabberd'],
-    owner => root, group => ejabberd, mode => 0640;
+    notify  => Service['ejabberd'],
+    owner   => 'root',
+    group   => 'ejabberd',
+    mode    => '0640';
+  }
+
+  if $ejabberd::config_content {
+    File['/etc/ejabberd/ejabberd.cfg']{
+      content => $ejabberd::config_content
+    }
+  } else {
+    File['/etc/ejabberd/ejabberd.cfg']{
+      source => [ "puppet:///modules/site_ejabberd/${::fqdn}/ejabberd.cfg",
+                  'puppet:///modules/site_ejabberd/ejabberd.cfg',
+                  'puppet:///modules/ejabberd/ejabberd.cfg' ]
+    }
   }
 
   service{'ejabberd':
-    ensure => running,
-    enable => true,
+    ensure    => running,
+    enable    => true,
     hasstatus => true,
-    require => Package[ejabberd],
+    require   => Package['ejabberd'],
   }
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index 5ba015a7ba94afae1c06b5a404a0c7c669013b7f..8c21344782bc1d84fd63eef75cc323126123fcc6 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,8 +2,10 @@
 # Copyright (C) 2007 admin@immerda.ch
 # GPLv3
 
+# Manage an ejabberd server
 class ejabberd(
   $domains          = $::fqdn,
+  $config_content   = false,
   $nagios_domain    = $::fqdn,
   $nagios_user      = 'nagios',
   $nagios_pwd       = '',