Skip to content

Commit ac97dab

Browse files
authored
Merge pull request #48 from rveznaver/switch_nginx_cookbook
switch to nginx cookbook
2 parents bb22334 + 0136aaa commit ac97dab

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.kitchen.vagrant.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ suites:
3131
run_list:
3232
- recipe[apt]
3333
- recipe[nginx-hardening::upgrades]
34-
- recipe[chef_nginx]
34+
- recipe[nginx]
3535
- recipe[nginx-hardening]
3636
verifier:
3737
inspec_tests:

.kitchen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ suites:
8686
run_list:
8787
- recipe[apt]
8888
- recipe[nginx-hardening::upgrades]
89-
- recipe[chef_nginx]
89+
- recipe[nginx]
9090
- recipe[nginx-hardening]
9191
verifier:
9292
inspec_tests:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This cookbook provides a secure overlay for nginx configuration.
3131
- `['nginx-hardening']['options']['ssl_prefer_server_ciphers']` - `'on'` Specifies that server ciphers should be preferred over client ciphers when using the TLS protocols. Set to `false` to disable it.
3232
- `['nginx-hardening']['dh-size']` - `2048` Specifies the length of DH parameters for EDH ciphers.
3333

34-
You can also use the complete attributes from the [chef_nginx cookbook](https://supermarket.chef.io/cookbooks/chef_nginx)
34+
You can also use the complete attributes from the [nginx cookbook](https://supermarket.chef.io/cookbooks/nginx)
3535

3636
## Usage
3737

@@ -40,7 +40,7 @@ Add the recipes to the run_list:
4040
```
4141
"recipe[apt]"
4242
"recipe[nginx-hardening::upgrades]"
43-
"recipe[chef_nginx]"
43+
"recipe[nginx]"
4444
"recipe[nginx-hardening]"
4545
```
4646

attributes/default.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# limitations under the License.
2020
#
2121

22-
include_attribute 'chef_nginx'
22+
include_attribute 'nginx'
2323

2424
# to be on par with the puppet module defaults
2525
default['nginx']['repo_source'] = 'nginx'

metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
supports 'ubuntu', '>= 12.04'
3232
supports 'centos', '>= 6.6'
3333

34-
depends 'chef_nginx', '>= 4.0'
34+
depends 'nginx', '>= 7.0'
3535
depends 'openssl'
3636

3737
recipe 'nginx-hardening::default', 'configures nginx for hardening'

spec/recipes/default_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
describe 'nginx-hardening::default' do
2121
let(:runner) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04') }
22-
let(:chef_run) { runner.converge('chef_nginx::default', described_recipe) }
22+
let(:chef_run) { runner.converge('nginx::default', described_recipe) }
2323

2424
before(:each) do
2525
stub_command("find /etc/nginx -perm -o+r -type f -o -perm -o+w -type f | wc -l | egrep '^0$'")

0 commit comments

Comments
 (0)