Updates

data/common.yaml

@@ -23,8 +23,9 @@ tinyproxy::min_spare_servers: 5
 tinyproxy::max_spare_servers: 20
 tinyproxy::start_servers: 10
 tinyproxy::max_requests_per_child: 0
-tinyproxy::allow: '127.0.0.1'
-tinyproxy::deny: null
+tinyproxy::allow:
+  - '127.0.0.1'
+tinyproxy::deny: []
 tinyproxy::add_headers: null
 tinyproxy::via_proxy_name: 'tinyproxy'
 tinyproxy::disable_via_header: false

manifests/config.pp

@@ -24,8 +24,8 @@
   Integer $max_spare_servers,
   Integer $start_servers,
   Integer $max_requests_per_child,
-  Optional[String] $allow,
-  Optional[String] $deny,
+  Array[String] $allow,
+  Array[String] $deny,
   Optional[Hash[String, String]] $add_headers,
   String $via_proxy_name,
   Boolean $disable_via_header,

manifests/init.pp

@@ -30,8 +30,8 @@
   Integer $max_spare_servers,
   Integer $start_servers,
   Integer $max_requests_per_child,
-  Optional[String] $allow,
-  Optional[String] $deny,
+  Array[String] $allow,
+  Array[String] $deny,
   Optional[Hash[String, String]] $add_headers,
   String $via_proxy_name,
   Boolean $disable_via_header,

manifests/install.pp

@@ -10,8 +10,7 @@
       }
     }
     'Debian': {
-      include ::apt
-      require ::apt::update
+      Class['apt::update']  -> Package<| provider == 'apt' |>
     }
     default: {
       fail("Module ${module_name} is not supported on ${facts['os']['family']}")

metadata.json

@@ -16,13 +16,17 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">=4.9.0 < 6.0.0"
+      "version_requirement": ">=4.9.0 < 7.0.0"
     }
   ],
   "dependencies": [
     {
       "name": "puppetlabs-stdlib",
-      "version_requirement": ">= 4.0.0 < 5.0.0"
+      "version_requirement": ">= 4.0.0 < 7.0.0"
+    },
+    {
+      "name": "puppetlabs-apt",
+      "version_requirement": ">= 4.5.1"
     }
   ],
   "operatingsystem_support": [
@@ -51,7 +55,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     },
     {

templates/tinyproxy.conf.erb

@@ -255,11 +255,11 @@ MaxRequestsPerChild <%= @max_requests_per_child %>
 # The order of the controls are important. All incoming connections are
 # tested against the controls based on order.
 #
-<%- if @allow -%>
-Allow <%= @allow %>
+<%- @allow.each do |ip| -%>
+Allow <%= ip %>
 <%- end -%>
-<%- if @deny -%>
-Deny <%= @deny %>
+<%- @deny.each do |ip| -%>
+Deny <%= ip %>
 <%- end -%>
 
 #
@@ -311,7 +311,7 @@ Filter "<%= @filter %>"
 <%- if @filter_urls.nil? -%>
 #FilterURLs On
 <%- else -%>
-FilterURLs "<%= @filter_urls ? 'On' : 'Off' %>"
+FilterURLs <%= @filter_urls ? 'On' : 'Off' %>
 <%- end -%>
 
 #
@@ -321,7 +321,7 @@ FilterURLs "<%= @filter_urls ? 'On' : 'Off' %>"
 <%- if @filter_extended.nil? -%>
 #FilterExtended On
 <%- else -%>
-FilterExtended "<%= @filter_extended ? 'On' : 'Off' %>"
+FilterExtended <%= @filter_extended ? 'On' : 'Off' %>
 <%- end -%>
 
 #
@@ -330,7 +330,7 @@ FilterExtended "<%= @filter_extended ? 'On' : 'Off' %>"
 <%- if @filter_case_sensitive.nil? -%>
 #FilterCaseSensitive On
 <%- else -%>
-FilterCaseSensitive "<%= @filter_case_sensitive ? 'On' : 'Off' %>"
+FilterCaseSensitive <%= @filter_case_sensitive ? 'On' : 'Off' %>
 <%- end -%>
 
 #
@@ -346,7 +346,7 @@ FilterCaseSensitive "<%= @filter_case_sensitive ? 'On' : 'Off' %>"
 <%- if @filter_default_deny.nil? -%>
 #FilterDefaultDeny Yes
 <%- else -%>
-FilterDefaultDeny "<%= @filter_default_deny ? 'Yes' : 'No' %>"
+FilterDefaultDeny <%= @filter_default_deny ? 'Yes' : 'No' %>
 <%- end -%>
 
 #