Skip to content

Commit edadf13

Browse files
smortexTheMeier
smortex
authored and
TheMeier
committed
Remove legacy top-scope syntax
1 parent befd673 commit edadf13

12 files changed

+21
-21
lines changed

Diff for: ‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ https://github.com/voxpupuli/puppet-nginx/pull/1385 changes the default behaviou
10981098
- '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)
10991099
- \[WIP\] Improve SSL support [\#599](https://github.com/voxpupuli/puppet-nginx/issues/599)
11001100
- ssl vhost gives error [\#585](https://github.com/voxpupuli/puppet-nginx/issues/585)
1101-
- class ::nginx::config has not been evaluated [\#580](https://github.com/voxpupuli/puppet-nginx/issues/580)
1101+
- class nginx::config has not been evaluated [\#580](https://github.com/voxpupuli/puppet-nginx/issues/580)
11021102
- vagrant vhost files [\#577](https://github.com/voxpupuli/puppet-nginx/issues/577)
11031103
- How to set document root in server block using hiera? [\#576](https://github.com/voxpupuli/puppet-nginx/issues/576)
11041104
- Configure passenger through hiera. [\#568](https://github.com/voxpupuli/puppet-nginx/issues/568)

Diff for: ‎HISTORY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@
607607
- '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)
608608
- \[WIP\] Improve SSL support [\#599](https://github.com/voxpupuli/puppet-nginx/issues/599)
609609
- ssl vhost gives error [\#585](https://github.com/voxpupuli/puppet-nginx/issues/585)
610-
- class ::nginx::config has not been evaluated [\#580](https://github.com/voxpupuli/puppet-nginx/issues/580)
610+
- class nginx::config has not been evaluated [\#580](https://github.com/voxpupuli/puppet-nginx/issues/580)
611611
- vagrant vhost files [\#577](https://github.com/voxpupuli/puppet-nginx/issues/577)
612612
- How to set document root in server block using hiera? [\#576](https://github.com/voxpupuli/puppet-nginx/issues/576)
613613
- Configure passenger through hiera. [\#568](https://github.com/voxpupuli/puppet-nginx/issues/568)

Diff for: ‎manifests/resource/server.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -639,9 +639,9 @@
639639
}
640640
}
641641

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, {
645645
ensure => $ensure,
646646
server => $name_sanitized,
647647
ssl => $ssl,

Diff for: ‎spec/defines/resource_geo_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
let :pre_condition do
1616
[
17-
'include ::nginx'
17+
'include nginx'
1818
]
1919
end
2020

Diff for: ‎spec/defines/resource_location_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
end
1616
let :pre_condition do
1717
[
18-
'include ::nginx'
18+
'include nginx'
1919
]
2020
end
2121

Diff for: ‎spec/defines/resource_mailhost_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
ipv6_enable: true
1717
}
1818
end
19-
let(:pre_condition) { ['include ::nginx'] }
19+
let(:pre_condition) { ['include nginx'] }
2020

2121
describe 'os-independent items' do
2222
describe 'basic assumptions' do
@@ -689,7 +689,7 @@
689689
facts.merge(nginx_version: '1.16.0')
690690
end
691691

692-
let(:pre_condition) { ['include ::nginx'] }
692+
let(:pre_condition) { ['include nginx'] }
693693

694694
it 'has `ssl` at end of listen directive' do
695695
content = catalogue.resource('concat::fragment', "#{title}-ssl").send(:parameters)[:content]

Diff for: ‎spec/defines/resource_map_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
let :pre_condition do
2828
[
29-
'include ::nginx'
29+
'include nginx'
3030
]
3131
end
3232

Diff for: ‎spec/defines/resource_server_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
let :pre_condition do
2525
[
26-
'include ::nginx'
26+
'include nginx'
2727
]
2828
end
2929

Diff for: ‎spec/defines/resource_stream_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
let :pre_condition do
2222
[
23-
'include ::nginx'
23+
'include nginx'
2424
]
2525
end
2626

Diff for: ‎spec/defines/resource_upstream_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
let :pre_condition do
3636
[
37-
'include ::nginx'
37+
'include nginx'
3838
]
3939
end
4040

Diff for: ‎templates/server/server_header.erb

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ server {
4242
<% elsif @access_log == 'off' -%>
4343
access_log off;
4444
<% elsif not @access_log -%>
45-
access_log <%= scope['::nginx::config::log_dir'] %>/<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
45+
access_log <%= scope['nginx::config::log_dir'] %>/<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
4646
<% else -%>
4747
access_log <%= @access_log %><% if @format_log %> <%= @format_log%><% end %>;
4848
<% end -%>
@@ -52,7 +52,7 @@ server {
5252
<%- end -%>
5353
<% elsif @error_log == 'absent' -%>
5454
<% elsif not @error_log -%>
55-
error_log <%= scope['::nginx::config::log_dir'] %>/<%= @name_sanitized %>.error.log;
55+
error_log <%= scope['nginx::config::log_dir'] %>/<%= @name_sanitized %>.error.log;
5656
<% else -%>
5757
error_log <%= @error_log %>;
5858
<% end -%>
@@ -194,7 +194,7 @@ server {
194194
<% elsif @access_log == 'off' -%>
195195
access_log off;
196196
<% elsif not @access_log -%>
197-
access_log <%= scope['::nginx::config::log_dir'] %>/<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
197+
access_log <%= scope['nginx::config::log_dir'] %>/<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
198198
<% else -%>
199199
access_log <%= @access_log %><% if @format_log %> <%= @format_log%><% end %>;
200200
<% end -%>
@@ -204,7 +204,7 @@ server {
204204
<%- end -%>
205205
<% elsif @error_log == 'absent' -%>
206206
<% elsif not @error_log -%>
207-
error_log <%= scope['::nginx::config::log_dir'] %>/<%= @name_sanitized %>.error.log;
207+
error_log <%= scope['nginx::config::log_dir'] %>/<%= @name_sanitized %>.error.log;
208208
<% else -%>
209209
error_log <%= @error_log %>;
210210
<% end -%>

Diff for: ‎templates/server/server_ssl_header.erb

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ server {
2525
<% elsif @access_log == 'off' -%>
2626
access_log off;
2727
<% elsif not @access_log -%>
28-
access_log <%= scope['::nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
28+
access_log <%= scope['nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
2929
<% else -%>
3030
access_log <%= @access_log %><% if @format_log %> <%= @format_log%><% end %>;
3131
<% end -%>
@@ -35,7 +35,7 @@ server {
3535
<%- end -%>
3636
<% elsif @error_log == 'absent' -%>
3737
<% elsif not @error_log -%>
38-
error_log <%= scope['::nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.error.log;
38+
error_log <%= scope['nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.error.log;
3939
<% else -%>
4040
error_log <%= @error_log %>;
4141
<% end -%>
@@ -123,7 +123,7 @@ server {
123123
<% elsif @access_log == 'off' -%>
124124
access_log off;
125125
<% elsif not @access_log -%>
126-
access_log <%= scope['::nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
126+
access_log <%= scope['nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>;
127127
<% else -%>
128128
access_log <%= @access_log %><% if @format_log %> <%= @format_log%><% end %>;
129129
<% end -%>
@@ -133,7 +133,7 @@ server {
133133
<%- end -%>
134134
<% elsif @error_log == 'absent' -%>
135135
<% elsif not @error_log -%>
136-
error_log <%= scope['::nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.error.log;
136+
error_log <%= scope['nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.error.log;
137137
<% else -%>
138138
error_log <%= @error_log %>;
139139
<% end -%>

0 commit comments

Comments
 (0)