- take Care of the other sensitive rendered Templates also

Author: cocker-cc

manifests/proxy.pp

@@ -489,14 +489,19 @@
   }
 
   # Configuring the zabbix-proxy configuration file
+  $content = template('zabbix/zabbix_proxy.conf.erb')
   file { $proxy_configfile_path:
     ensure  => file,
     owner   => 'zabbix',
     group   => 'zabbix',
     mode    => '0644',
     require => Package["zabbix-proxy-${db}"],
     replace => true,
-    content => template('zabbix/zabbix_proxy.conf.erb'),
+    content => if $database_password =~ Sensitive {
+      Sensitive($content)
+    } else {
+      $content
+    },
   }
 
   # Include dir for specific zabbix-proxy checks.

manifests/server.pp

@@ -444,14 +444,19 @@
   }
 
   # Configuring the zabbix-server configuration file
+  $content = template('zabbix/zabbix_server.conf.erb')
   file { $server_configfile_path:
     ensure  => file,
     owner   => $server_config_owner,
     group   => $server_config_group,
     mode    => '0640',
     require => Package["zabbix-server-${db}"],
     replace => true,
-    content => template('zabbix/zabbix_server.conf.erb'),
+    content => if $database_password =~ Sensitive {
+      Sensitive($content)
+    } else {
+      $content
+    },
   }
 
   # Include dir for specific zabbix-server checks.

manifests/web.pp

@@ -259,16 +259,17 @@
   }
 
   # Webinterface config file
+  $content = template('zabbix/web/zabbix.conf.php.erb')
   file { '/etc/zabbix/web/zabbix.conf.php':
     ensure  => file,
     owner   => $web_config_owner,
     group   => $web_config_group,
     mode    => '0640',
     replace => true,
     content => if $database_password =~ Sensitive {
-      Sensitive(template('zabbix/web/zabbix.conf.php.erb'))
+      Sensitive($content)
     } else {
-      template('zabbix/web/zabbix.conf.php.erb')
+      $content
     },
   }