From 7d7286eabbc12e805d668bb86ae545ea48c72ca3 Mon Sep 17 00:00:00 2001
From: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
Date: Tue, 19 Jan 2016 22:31:34 +0100
Subject: [PATCH 1/2] Fixup illegal comma separated argument list in
 manifests/nagios_resources.pp and in manifests/install.pp

---
 manifests/install.pp          | 4 ++--
 manifests/nagios_resources.pp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/install.pp b/manifests/install.pp
index 175306f..72df379 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -4,8 +4,8 @@
 
 class icinga::install {
 
-  $ido_db_server = $::icinga::ido_db_server,
-  $manage_repo   = $::icinga::manage_repo,
+  $ido_db_server = $::icinga::ido_db_server
+  $manage_repo   = $::icinga::manage_repo
   $gui_type      = $::icinga::gui_type
 
   case $::osfamily {
diff --git a/manifests/nagios_resources.pp b/manifests/nagios_resources.pp
index 1e388da..12f9ece 100644
--- a/manifests/nagios_resources.pp
+++ b/manifests/nagios_resources.pp
@@ -5,8 +5,8 @@
 class icinga::nagios_resources (
 ) {
 
-  $icinga_user  = $::icinga::icinga_user,
-  $icinga_group = $::icinga::icinga_group,
+  $icinga_user  = $::icinga::icinga_user
+  $icinga_group = $::icinga::icinga_group
 
   $nagios_resource_files = [
     '/etc/nagios/nagios_command.cfg',

From 1e4ead4668db2321eed5a1f6d9a36d3dc5afe3f9 Mon Sep 17 00:00:00 2001
From: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
Date: Wed, 20 Jan 2016 09:01:23 +0100
Subject: [PATCH 2/2] Fixup template warnings:

Warning: Variable access via 'web_db_port' is deprecated. Use '@web_db_port' instead. template[/etc/puppet/environments/production/modules/icinga/templates/etc/icinga-web/conf.d/databases.xml.erb]:19
   (at /usr/local/lib/ruby/site_ruby/2.2/puppet/parser/templatewrapper.rb:77:in `method_missing')

Warning: Variable access via 'ido_db_port' is deprecated. Use '@ido_db_port' instead. template[/etc/puppet/environments/production/modules/icinga/templates/etc/icinga-web/conf.d/databases.xml.erb]:46
   (at /usr/local/lib/ruby/site_ruby/2.2/puppet/parser/templatewrapper.rb:77:in `method_missing')
---
 templates/etc/icinga-web/conf.d/databases.xml.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/etc/icinga-web/conf.d/databases.xml.erb b/templates/etc/icinga-web/conf.d/databases.xml.erb
index 79f80ab..828f2e8 100644
--- a/templates/etc/icinga-web/conf.d/databases.xml.erb
+++ b/templates/etc/icinga-web/conf.d/databases.xml.erb
@@ -16,7 +16,7 @@
     Overwrite the icinga-web database (where users, roles, views, etc are stored 
     -->
     <db:database name="icinga_web" class="AppKitDoctrineDatabase">
-      <ae:parameter name="dsn"><%= @web_db_server %>://<%= @web_db_user %>:<%= @web_db_pass %>@<%= @web_db_host %>:<%- if @web_db_server == 'pgsql' and web_db_port == 3306 -%>5432<%- else -%><%= @web_db_port %><%- end -%>/<%= @web_db_name %></ae:parameter>
+      <ae:parameter name="dsn"><%= @web_db_server %>://<%= @web_db_user %>:<%= @web_db_pass %>@<%= @web_db_host %>:<%- if @web_db_server == 'pgsql' and @web_db_port == 3306 -%>5432<%- else -%><%= @web_db_port %><%- end -%>/<%= @web_db_name %></ae:parameter>
         <ae:parameter name="charset">utf8</ae:parameter>
         <ae:parameter name="manager_attributes">
             <ae:parameter name="Doctrine_Core::ATTR_MODEL_LOADING">CONSERVATIVE</ae:parameter>
@@ -43,7 +43,7 @@
         EXAMPLE (oracle needs icingaOracle as the db driver) 
     -->
     <db:database xmlns="http://agavi.org/agavi/config/parts/databases/1.0" name="icinga" class="IcingaDoctrineDatabase">
-      <ae:parameter name="dsn"><%= @ido_db_server %>://<%= @ido_db_user %>:<%= @ido_db_pass %>@<%= @ido_db_host %>:<%- if @ido_db_server == 'pgsql' and ido_db_port == 3306 -%>5432<%- else -%><%= @ido_db_port %><%- end -%>/<%= @ido_db_name %></ae:parameter>
+      <ae:parameter name="dsn"><%= @ido_db_server %>://<%= @ido_db_user %>:<%= @ido_db_pass %>@<%= @ido_db_host %>:<%- if @ido_db_server == 'pgsql' and @ido_db_port == 3306 -%>5432<%- else -%><%= @ido_db_port %><%- end -%>/<%= @ido_db_name %></ae:parameter>
         <ae:parameter name="prefix">icinga_</ae:parameter>
         <ae:parameter name="charset">utf8</ae:parameter>
         <ae:parameter name="use_retained">true</ae:parameter>