Skip to content

Commit 46b9003

Browse files
committed
nginx: add service resource to nginx_site resource
nginx: cookstyle fixes Removes specific Orb version pin
1 parent 70ada08 commit 46b9003

File tree

5 files changed

+20
-7
lines changed

5 files changed

+20
-7
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ lint_and_unit: &lint_and_unit
88
version: 2.1
99

1010
orbs:
11-
kitchen: sous-chefs/kitchen@2.0.2
11+
kitchen: sous-chefs/kitchen@2
1212

1313
workflows:
1414
kitchen:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ This file is used to list changes made in each version of the nginx cookbook.
44

55
## Unreleased
66

7+
## 10.0.2 (2019-09-24)
8+
9+
- Bug Fix: Add missing service resource in `nginx_site` resource. [Issue #505](https://github.com/sous-chefs/nginx/issues/505))
10+
711
## 10.0.1 (2019-08-04)
812

913
- Maintenance: Add contributing.md file for cookbook health metrics

metadata.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
chef_version '>= 14'
77
license 'Apache-2.0'
88
description 'Installs and configures nginx'
9-
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
10-
version '10.0.1'
9+
version '10.0.2'
1110

1211
depends 'ohai', '~> 5.2'
1312

resources/site.rb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
not_if { site_enabled?(new_resource.site_name) }
3030
only_if { site_available?(new_resource.site_name) }
3131
end
32+
33+
service 'nginx' do
34+
supports status: true, restart: true, reload: true
35+
action :nothing
36+
end
3237
end
3338

3439
action :disable do
@@ -47,4 +52,9 @@
4752
notifies :reload, 'service[nginx]'
4853
end
4954
end
55+
56+
service 'nginx' do
57+
supports status: true, restart: true, reload: true
58+
action :nothing
59+
end
5060
end

spec/unit/libraries/helpers_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@ class DummyClass < Chef::Node
181181
context 'with version 8' do
182182
let(:platform_version) { '8' }
183183

184-
it { expect(subject.passenger_packages).to eq ['ruby-dev', 'libcurl4-gnutls-dev', 'passenger'] }
184+
it { expect(subject.passenger_packages).to eq %w(ruby-dev libcurl4-gnutls-dev passenger) }
185185
end
186186

187187
context 'with version 9' do
188188
let(:platform_version) { '9' }
189189

190-
it { expect(subject.passenger_packages).to eq ['ruby-dev', 'libcurl4-gnutls-dev', 'libnginx-mod-http-passenger'] }
190+
it { expect(subject.passenger_packages).to eq %w(ruby-dev libcurl4-gnutls-dev libnginx-mod-http-passenger) }
191191
end
192192
end
193193

@@ -197,13 +197,13 @@ class DummyClass < Chef::Node
197197
context 'with version 16.04' do
198198
let(:platform_version) { '16.04' }
199199

200-
it { expect(subject.passenger_packages).to eq ['ruby-dev', 'libcurl4-gnutls-dev', 'passenger'] }
200+
it { expect(subject.passenger_packages).to eq %w(ruby-dev libcurl4-gnutls-dev passenger) }
201201
end
202202

203203
context 'with version 18.04' do
204204
let(:platform_version) { '18.04' }
205205

206-
it { expect(subject.passenger_packages).to eq ['ruby-dev', 'libcurl4-gnutls-dev', 'libnginx-mod-http-passenger'] }
206+
it { expect(subject.passenger_packages).to eq %w(ruby-dev libcurl4-gnutls-dev libnginx-mod-http-passenger) }
207207
end
208208
end
209209
end

0 commit comments

Comments
 (0)