From 64d65fb4f1c003b483fac01b31996f7464f3efcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 22 Nov 2023 16:36:11 -1000 Subject: [PATCH] Remove legacy top-scope syntax --- README.md | 14 +++++++------- spec/defines/acl_spec.rb | 2 +- spec/defines/auth_param_spec.rb | 2 +- spec/defines/cache_dir_spec.rb | 2 +- spec/defines/cache_spec.rb | 2 +- spec/defines/extra_config_section_spec.rb | 2 +- spec/defines/http_access_spec.rb | 2 +- spec/defines/http_port_spec.rb | 2 +- spec/defines/https_port_spec.rb | 2 +- spec/defines/icp_access_spec.rb | 2 +- spec/defines/refresh_pattern_spec.rb | 2 +- spec/defines/send_hit_spec.rb | 2 +- spec/defines/snmp_access_spec.rb | 2 +- spec/defines/snmp_port_spec.rb | 2 +- spec/defines/ssl_bump_spec.rb | 2 +- spec/defines/sslproxy_cert_error_spec.rb | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 5e2a46c..5d15980 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ acl remote_urls url_regex http://example.org/path acl remote_urls url_regex http://example.com/anotherpath ``` -These may be defined as a hash passed to ::squid +These may be defined as a hash passed to squid #### Parameters for Type squid::acl * `type` The acltype of the acl, must be defined, e.g url_regex, urlpath_regex, port, .. @@ -269,7 +269,7 @@ Adds a squid.conf line snmp_access allow monitoring hosts ``` -These may be defined as a hash passed to ::squid +These may be defined as a hash passed to squid ### Defined Type squid::icp\_access Defines [icp_access entries](http://www.squid-cache.org/Doc/config/icp_access/) for a squid server. @@ -286,7 +286,7 @@ Adds a squid.conf line icp_access allow our_networks hosts ``` -These may be defined as a hash passed to ::squid +These may be defined as a hash passed to squid #### Parameters for Type squid::http\_allow * `value` defaults to the `namevar` the rule to allow or deny. @@ -381,7 +381,7 @@ refresh_pattern ^ftp: 1440 20% 10080 refresh_pattern (/cgi-bin/|\?) -i 0 0% 0 ``` -These may be defined as a hash passed to ::squid +These may be defined as a hash passed to squid YAML example: ``` @@ -465,7 +465,7 @@ auth_param basic realm Squid Basic Authentication auth_param basic credentialsttl 5 hours ``` -These may be defined as a hash passed to ::squid +These may be defined as a hash passed to squid #### Parameters for Type squid::auth_param * `scheme` the scheme used for authentication must be defined @@ -487,7 +487,7 @@ Adds a squid.conf line ssl_bump bump all ``` -These may be defined as a hash passed to ::squid +These may be defined as a hash passed to squid #### Parameters for Type squid::ssl\_bump * `value` The type of the ssl_bump, must be defined, e.g bump, peek, .. @@ -509,7 +509,7 @@ Adds a squid.conf line sslproxy_cert_error allow all ``` -These may be defined as a hash passed to ::squid +These may be defined as a hash passed to squid #### Parameters for Type squid::sslproxy\_cert\_error * `value` defaults to the `namevar` the rule to allow or deny. diff --git a/spec/defines/acl_spec.rb b/spec/defines/acl_spec.rb index 64609cc..70b6413 100644 --- a/spec/defines/acl_spec.rb +++ b/spec/defines/acl_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/auth_param_spec.rb b/spec/defines/auth_param_spec.rb index 52af09b..f685c94 100644 --- a/spec/defines/auth_param_spec.rb +++ b/spec/defines/auth_param_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/cache_dir_spec.rb b/spec/defines/cache_dir_spec.rb index 1ef4705..a40f17b 100644 --- a/spec/defines/cache_dir_spec.rb +++ b/spec/defines/cache_dir_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/cache_spec.rb b/spec/defines/cache_spec.rb index 7efdae9..5683ebf 100644 --- a/spec/defines/cache_spec.rb +++ b/spec/defines/cache_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/extra_config_section_spec.rb b/spec/defines/extra_config_section_spec.rb index 883a174..f8fcdd7 100644 --- a/spec/defines/extra_config_section_spec.rb +++ b/spec/defines/extra_config_section_spec.rb @@ -9,7 +9,7 @@ facts end let(:pre_condition) do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/http_access_spec.rb b/spec/defines/http_access_spec.rb index d4dd90e..30c17da 100644 --- a/spec/defines/http_access_spec.rb +++ b/spec/defines/http_access_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/http_port_spec.rb b/spec/defines/http_port_spec.rb index f07d994..7e2a7db 100644 --- a/spec/defines/http_port_spec.rb +++ b/spec/defines/http_port_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/https_port_spec.rb b/spec/defines/https_port_spec.rb index ea8dc46..013a6c2 100644 --- a/spec/defines/https_port_spec.rb +++ b/spec/defines/https_port_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/icp_access_spec.rb b/spec/defines/icp_access_spec.rb index 7bea84a..6b949e5 100644 --- a/spec/defines/icp_access_spec.rb +++ b/spec/defines/icp_access_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/refresh_pattern_spec.rb b/spec/defines/refresh_pattern_spec.rb index 877be60..627e388 100644 --- a/spec/defines/refresh_pattern_spec.rb +++ b/spec/defines/refresh_pattern_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/send_hit_spec.rb b/spec/defines/send_hit_spec.rb index 66ee0e5..2791002 100644 --- a/spec/defines/send_hit_spec.rb +++ b/spec/defines/send_hit_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/snmp_access_spec.rb b/spec/defines/snmp_access_spec.rb index 05435f0..32a55eb 100644 --- a/spec/defines/snmp_access_spec.rb +++ b/spec/defines/snmp_access_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/snmp_port_spec.rb b/spec/defines/snmp_port_spec.rb index 618416b..55f47bb 100644 --- a/spec/defines/snmp_port_spec.rb +++ b/spec/defines/snmp_port_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/ssl_bump_spec.rb b/spec/defines/ssl_bump_spec.rb index 72d552e..b01f77a 100644 --- a/spec/defines/ssl_bump_spec.rb +++ b/spec/defines/ssl_bump_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } ' diff --git a/spec/defines/sslproxy_cert_error_spec.rb b/spec/defines/sslproxy_cert_error_spec.rb index 5edf0a9..cbc8a2a 100644 --- a/spec/defines/sslproxy_cert_error_spec.rb +++ b/spec/defines/sslproxy_cert_error_spec.rb @@ -9,7 +9,7 @@ facts end let :pre_condition do - ' class{"::squid": + ' class{"squid": config => "/tmp/squid.conf" } '