Merge branch 'merge_immerda'

Conflicts:
	manifests/apache.pp

this conflict was just a indentation difference.

1 files changed, 6 insertions, 6 deletions

diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp
index 75f87d7..3f2a1a4 100644
--- a/manifests/plugin/deploy.pp
+++ b/manifests/plugin/deploy.pp
@@ -5,26 +5,26 @@ define nagios::plugin::deploy($source = '', $ensure = 'present', $config = '', $
         default => $ensure
     }
     $real_source = $source ? {
-        ''  =>  "nagios/plugins/$plugin_src",
+        ''  =>  "nagios/plugins/${plugin_src}",
         default => $source
     }
 
     if !defined(Package[$require_package]) {
-      @@package { $require_package:
+      package { $require_package:
         ensure => installed,
         tag => "nagios::plugin::deploy::package";
       }
     }
-    
+
     include nagios::plugin::scriptpaths
-    @@file { "nagios_plugin_${name}":
+    file { "nagios_plugin_${name}":
       path => "$nagios::plugin::scriptpaths::script_path/${name}",
-      source => "puppet://$server/modules/$real_source",
+      source => "puppet:///modules/${real_source}",
       mode => 0755, owner => root, group => 0,
       require => Package[$require_package],
       tag => "nagios::plugin::deploy::file";
     }
 
     # register the plugin
-    @@nagios::plugin{$name: ensure => $ensure, require => Package['nagios-plugins'] }
+    nagios::plugin{$name: ensure => $ensure, require => Package['nagios-plugins'] }
 }