Merge pull request #1584 from voxpupuli/remove-legacy-top-scope-syntax

TheMeier · web-flow · commit 417c5995d2e7 · 2024-06-05T10:52:01.000+02:00
Remove legacy top-scope syntax
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1098,7 +1098,7 @@ https://github.com/voxpupuli/puppet-nginx/pull/1385 changes the default behaviou
 - 'undef' from left operand of 'in' expression is not a string at /etc/puppet/modules/nginx/manifests/params.pp:23 [\#601](https://github.com/voxpupuli/puppet-nginx/issues/601)
 - \[WIP\] Improve SSL support [\#599](https://github.com/voxpupuli/puppet-nginx/issues/599)
 - ssl vhost gives error  [\#585](https://github.com/voxpupuli/puppet-nginx/issues/585)
-- class ::nginx::config has not been evaluated [\#580](https://github.com/voxpupuli/puppet-nginx/issues/580)
+- class nginx::config has not been evaluated [\#580](https://github.com/voxpupuli/puppet-nginx/issues/580)
 - vagrant vhost files [\#577](https://github.com/voxpupuli/puppet-nginx/issues/577)
 - How to set document root in server block using hiera? [\#576](https://github.com/voxpupuli/puppet-nginx/issues/576)
 - Configure passenger through hiera. [\#568](https://github.com/voxpupuli/puppet-nginx/issues/568)
diff --git a/HISTORY.md b/HISTORY.md
@@ -607,7 +607,7 @@
 - 'undef' from left operand of 'in' expression is not a string at /etc/puppet/modules/nginx/manifests/params.pp:23 [\#601](https://github.com/voxpupuli/puppet-nginx/issues/601)
 - \[WIP\] Improve SSL support [\#599](https://github.com/voxpupuli/puppet-nginx/issues/599)
 - ssl vhost gives error  [\#585](https://github.com/voxpupuli/puppet-nginx/issues/585)
-- class ::nginx::config has not been evaluated [\#580](https://github.com/voxpupuli/puppet-nginx/issues/580)
+- class nginx::config has not been evaluated [\#580](https://github.com/voxpupuli/puppet-nginx/issues/580)
 - vagrant vhost files [\#577](https://github.com/voxpupuli/puppet-nginx/issues/577)
 - How to set document root in server block using hiera? [\#576](https://github.com/voxpupuli/puppet-nginx/issues/576)
 - Configure passenger through hiera. [\#568](https://github.com/voxpupuli/puppet-nginx/issues/568)
diff --git a/manifests/resource/server.pp b/manifests/resource/server.pp
@@ -639,9 +639,9 @@
     }
   }
 
-  create_resources('::nginx::resource::map', $string_mappings)
-  create_resources('::nginx::resource::geo', $geo_mappings)
-  create_resources('::nginx::resource::location', $locations, {
+  create_resources('nginx::resource::map', $string_mappings)
+  create_resources('nginx::resource::geo', $geo_mappings)
+  create_resources('nginx::resource::location', $locations, {
       ensure   => $ensure,
       server   => $name_sanitized,
       ssl      => $ssl,
diff --git a/spec/defines/resource_geo_spec.rb b/spec/defines/resource_geo_spec.rb
@@ -14,7 +14,7 @@
 
       let :pre_condition do
         [
-          'include ::nginx'
+          'include nginx'
         ]
       end
 
diff --git a/spec/defines/resource_location_spec.rb b/spec/defines/resource_location_spec.rb
@@ -15,7 +15,7 @@
       end
       let :pre_condition do
         [
-          'include ::nginx'
+          'include nginx'
         ]
       end
 
diff --git a/spec/defines/resource_mailhost_spec.rb b/spec/defines/resource_mailhost_spec.rb
@@ -16,7 +16,7 @@
           ipv6_enable: true
         }
       end
-      let(:pre_condition) { ['include ::nginx'] }
+      let(:pre_condition) { ['include nginx'] }
 
       describe 'os-independent items' do
         describe 'basic assumptions' do
@@ -689,7 +689,7 @@
                 facts.merge(nginx_version: '1.16.0')
               end
 
-              let(:pre_condition) { ['include ::nginx'] }
+              let(:pre_condition) { ['include nginx'] }
 
               it 'has `ssl` at end of listen directive' do
                 content = catalogue.resource('concat::fragment', "#{title}-ssl").send(:parameters)[:content]
diff --git a/spec/defines/resource_map_spec.rb b/spec/defines/resource_map_spec.rb
@@ -26,7 +26,7 @@
 
       let :pre_condition do
         [
-          'include ::nginx'
+          'include nginx'
         ]
       end
 
diff --git a/spec/defines/resource_server_spec.rb b/spec/defines/resource_server_spec.rb
@@ -23,7 +23,7 @@
 
       let :pre_condition do
         [
-          'include ::nginx'
+          'include nginx'
         ]
       end
 
diff --git a/spec/defines/resource_stream_spec.rb b/spec/defines/resource_stream_spec.rb
@@ -20,7 +20,7 @@
 
       let :pre_condition do
         [
-          'include ::nginx'
+          'include nginx'
         ]
       end
 
diff --git a/spec/defines/resource_upstream_spec.rb b/spec/defines/resource_upstream_spec.rb
@@ -34,7 +34,7 @@
 
       let :pre_condition do
         [
-          'include ::nginx'
+          'include nginx'
         ]
       end
 
diff --git a/templates/server/server_header.erb b/templates/server/server_header.erb
@@ -42,7 +42,7 @@ server {
 <% elsif @access_log == 'off' -%>
   access_log            off;
 <% elsif not @access_log -%>
-  access_log            <%= scope['::nginx::config::log_dir'] %>/<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
+  access_log            <%= scope['nginx::config::log_dir'] %>/<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
 <% else -%>
   access_log            <%= @access_log %><% if @format_log %> <%= @format_log%><% end %>;
 <% end -%>
@@ -52,7 +52,7 @@ server {
   <%- end -%>
 <% elsif @error_log == 'absent' -%>
 <% elsif not @error_log -%>
-  error_log             <%= scope['::nginx::config::log_dir'] %>/<%= @name_sanitized %>.error.log;
+  error_log             <%= scope['nginx::config::log_dir'] %>/<%= @name_sanitized %>.error.log;
 <% else -%>
   error_log             <%= @error_log %>;
 <% end -%>
@@ -194,7 +194,7 @@ server {
 <% elsif @access_log == 'off' -%>
   access_log            off;
 <% elsif not @access_log -%>
-  access_log            <%= scope['::nginx::config::log_dir'] %>/<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
+  access_log            <%= scope['nginx::config::log_dir'] %>/<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
 <% else -%>
   access_log            <%= @access_log %><% if @format_log %> <%= @format_log%><% end %>;
 <% end -%>
@@ -204,7 +204,7 @@ server {
   <%- end -%>
 <% elsif @error_log == 'absent' -%>
 <% elsif not @error_log -%>
-  error_log             <%= scope['::nginx::config::log_dir'] %>/<%= @name_sanitized %>.error.log;
+  error_log             <%= scope['nginx::config::log_dir'] %>/<%= @name_sanitized %>.error.log;
 <% else -%>
   error_log             <%= @error_log %>;
 <% end -%>
diff --git a/templates/server/server_ssl_header.erb b/templates/server/server_ssl_header.erb
@@ -25,7 +25,7 @@ server {
 <% elsif @access_log == 'off' -%>
   access_log            off;
 <% elsif not @access_log -%>
-  access_log            <%= scope['::nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
+  access_log            <%= scope['nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
 <% else -%>
   access_log            <%= @access_log %><% if @format_log %> <%= @format_log%><% end %>;
 <% end -%>
@@ -35,7 +35,7 @@ server {
   <%- end -%>
 <% elsif @error_log == 'absent' -%>
 <% elsif not @error_log -%>
-  error_log             <%= scope['::nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.error.log;
+  error_log             <%= scope['nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.error.log;
 <% else -%>
   error_log             <%= @error_log %>;
 <% end -%>
@@ -123,7 +123,7 @@ server {
 <% elsif @access_log == 'off' -%>
   access_log            off;
 <% elsif not @access_log -%>
-  access_log            <%= scope['::nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
+  access_log            <%= scope['nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
 <% else -%>
   access_log            <%= @access_log %><% if @format_log %> <%= @format_log%><% end %>;
 <% end -%>
@@ -133,7 +133,7 @@ server {
   <%- end -%>
 <% elsif @error_log == 'absent' -%>
 <% elsif not @error_log -%>
-  error_log             <%= scope['::nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.error.log;
+  error_log             <%= scope['nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.error.log;
 <% else -%>
   error_log             <%= @error_log %>;
 <% end -%>

Original file line number	Diff line number	Diff line change
`@@ -639,9 +639,9 @@`
`639`	`639`	`}`
`640`	`640`	`}`
`641`	`641`
`642`		`- create_resources('::nginx::resource::map', $string_mappings)`
`643`		`- create_resources('::nginx::resource::geo', $geo_mappings)`
`644`		`- create_resources('::nginx::resource::location', $locations, {`
	`642`	`+ create_resources('nginx::resource::map', $string_mappings)`
	`643`	`+ create_resources('nginx::resource::geo', $geo_mappings)`
	`644`	`+ create_resources('nginx::resource::location', $locations, {`
`645`	`645`	`ensure => $ensure,`
`646`	`646`	`server => $name_sanitized,`
`647`	`647`	`ssl => $ssl,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`let :pre_condition do`
`16`	`16`	`[`
`17`		`- 'include ::nginx'`
	`17`	`+ 'include nginx'`
`18`	`18`	`]`
`19`	`19`	`end`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`end`
`16`	`16`	`let :pre_condition do`
`17`	`17`	`[`
`18`		`- 'include ::nginx'`
	`18`	`+ 'include nginx'`
`19`	`19`	`]`
`20`	`20`	`end`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`
`27`	`27`	`let :pre_condition do`
`28`	`28`	`[`
`29`		`- 'include ::nginx'`
	`29`	`+ 'include nginx'`
`30`	`30`	`]`
`31`	`31`	`end`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`let :pre_condition do`
`25`	`25`	`[`
`26`		`- 'include ::nginx'`
	`26`	`+ 'include nginx'`
`27`	`27`	`]`
`28`	`28`	`end`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`let :pre_condition do`
`22`	`22`	`[`
`23`		`- 'include ::nginx'`
	`23`	`+ 'include nginx'`
`24`	`24`	`]`
`25`	`25`	`end`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`
`35`	`35`	`let :pre_condition do`
`36`	`36`	`[`
`37`		`- 'include ::nginx'`
	`37`	`+ 'include nginx'`
`38`	`38`	`]`
`39`	`39`	`end`
`40`	`40`