Fixes for Systemd- and Postgress-Config

manifests/init.pp

@@ -130,7 +130,7 @@
   validate_array($custom_plugins)
   validate_re($database, '^(cassandra|postgres)$', "${module_name}: Database must be cassandra or postgres.")
   validate_string($dns_resolver)
-  validate_hash($dns_resolvers_available)
+#  validate_hash($dns_resolvers_available)
   validate_absolute_path($kong_path)
   validate_absolute_path($kong_prefix)
   validate_string($log_level)

manifests/initscripts.pp

@@ -13,7 +13,7 @@
     }
 
     $_init_script_file_path = $::service_provider ? {
-      'systemd' => "${systemd::systemd_unit_path}/kong.service",
+      'systemd' => "${systemd_unit_path}/kong.service",
       'upstart' => '/etc/init/kong.conf',
       default   => '/etc/init.d/kong',
     }

manifests/install.pp

@@ -41,11 +41,11 @@
     } else {
 
       # Install package from your local repository using the native package provider
-      package { 'kong:':
+      package { 'kong':
         ensure => $kong::version,
       }
     }
 
   }
 
-}
+}

metadata.json

@@ -82,7 +82,7 @@
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">=4.6.0 <5.0.0"
+      "version_requirement": ">=4.12.0 <5.0.0"
     },
     {
       "name": "camptocamp/systemd",

templates/init/systemd/kong.service.erb

@@ -4,11 +4,11 @@ Description=Kong daemon
 
 [Service]
 <%- if !@nginx_conf.nil? -%>
-ExecStart=<%= @kong_path -%> start --conf @config_file_path --nginx-conf @nginx_conf
-ExecReload=<% @kong_path -%> reload --conf @config_file_path --nginx-conf @nginx_conf
+ExecStart=<%= @kong_path -%> start --conf <%= @config_file_path -%> --nginx-conf <%= @nginx_conf %>
+ExecReload=<%= @kong_path -%> reload --conf <%= @config_file_path -%> --nginx-conf <%= @nginx_conf %>
 <% else -%>
-ExecStart=<%= @kong_path -%> start --conf @config_file_path
-ExecReload=<% @kong_path -%> reload --conf @config_file_path --nginx-conf
+ExecStart=<%= @kong_path -%> start --conf <%= @config_file_path %>
+ExecReload=<%= @kong_path -%> reload --conf <%= @config_file_path %>
 <%- end -%>
-ExecStop<%= @kong_path -%> stop
-Restart=on-failure
+ExecStop=<%= @kong_path -%> stop
+Restart=on-failure

templates/kong.conf.erb

@@ -29,19 +29,19 @@ ssl_cert = <%= @ssl_cert -%>
 <% end -%>
 
 <% if @ssl_cert_key -%>
-ssl_key_path = <%= @ssl_cert_key -%>
+ssl_cert_key = <%= @ssl_cert_key -%>
 <% end -%>
 
 database = <%= @database -%>
 
 <% if @database == 'postgres' -%>
-pg_host = <%= @pg_host -%>
+pg_host = <%= @pg_host %>
 pg_port = <%= @pg_port %>
-pg_user = <%= @pg_user -%>
-pg_password = <%= @pg_password -%>
-pg_database = <%= @pg_database -%>
-pg_ssl = <%= @pg_ssl -%>
-pg_ssl_verify = <%= @pg_ssl_verify -%>
+pg_user = <%= @pg_user %>
+pg_password = <%= @pg_password %>
+pg_database = <%= @pg_database %>
+pg_ssl = <%= @pg_ssl %>
+pg_ssl_verify = <%= @pg_ssl_verify %>
 <% end -%>
 
 <% if @database == 'cassandra' -%>
@@ -85,9 +85,9 @@ cluster_ttl_on_failure = <%= @cluster_ttl_on_failure %>
 
 cluster_profile = <%= @cluster_profile %>
 
-dnsmasq = <%= @dnsmasq -%>
+dnsmasq = <%= @dnsmasq %>
 <% if @dnsmasq -%>
-dnsmasq_port = <%= @dnsmasq_port -%>
+dnsmasq_port = <%= @dnsmasq_port %>
 <% end -%>
 
 <% if ! @dnsmasq -%>