Skip to content

Commit

Permalink
Fix Travis tests and normalize with other cookbooks
Browse files Browse the repository at this point in the history
  • Loading branch information
sethvargo committed Sep 26, 2013
1 parent 1e676d6 commit 832805e
Show file tree
Hide file tree
Showing 21 changed files with 583 additions and 371 deletions.
21 changes: 20 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,21 @@
.kitchen/
*~
*#
.#*
\#*#
.*.sw[a-z]
*.un~
*.tmp
*.bk
*.bkup
.kitchen.local.yml
Berksfile.lock
Gemfile.lock

.bundle/
.cache/
.kitchen/
.vagrant/
.vagrant.d/
bin/
tmp/
vendor/
31 changes: 8 additions & 23 deletions .kitchen.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
---
driver_plugin: vagrant
driver_config:
require_chef_omnibus: true

platforms:
- name: ubuntu-13.04
driver_config:
box: opscode-ubuntu-13.04
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box

- name: ubuntu-12.04
driver_config:
box: opscode-ubuntu-12.04
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box

- name: ubuntu-10.04
driver_config:
box: opscode-ubuntu-10.04
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box

- name: debian-7.1.0
driver_config:
box: opscode-debian-7.1.0
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_debian-7.1.0_provisionerless.box
- name: ubuntu-13.04
- name: ubuntu-12.04
- name: ubuntu-10.04
- name: debian-7.1.0

suites:
- name: default
run_list: ["recipe[firewall::default]", "recipe[firewall-test::default]"]
attributes: {}
- name: default
run_list:
- recipe[firewall::default]
- recipe[firewall-test::default]
14 changes: 14 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
AllCops:
Excludes:
- vendor/**

AlignParameters:
Enabled: false
Encoding:
Enabled: false
HashSyntax:
Enabled: false
LineLength:
Enabled: false
MethodLength:
Max: 30
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
rvm:
- 1.9.3
- 2.0.0
before_script:
- bundle exec berks install
script:
- bundle exec foodcritic -f any .
- bundle exec rubocop
4 changes: 2 additions & 2 deletions Berksfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
site :opscode

metadata

group :integration do
cookbook 'firewall-test', :path => './test/cookbooks/firewall-test'
cookbook 'apt', '~> 2.0'
cookbook 'firewall-test', path: 'test/fixtures/cookbooks/fake'
end
100 changes: 51 additions & 49 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,67 +1,69 @@
## v0.11.0:
firewall Cookbook CHANGELOG
=======================
This file is used to list changes made in each version of the firewall cookbook.

### Improvement

v0.11.0
-------
### Improvement
- [COOK-2932]: ufw providers work on debian but cannot be used

## v0.10.2:

* [COOK-2250] - improve readme

## v0.10.0:

* [COOK-1234] - allow multiple ports per rule

## v0.9.2:

* [COOK-1615] - Firewall example docs have incorrect direction syntax

## v0.9.0:
v0.10.2
-------
- [COOK-2250] - improve readme

The default action for firewall LWRP is now :enable, the default
action for firewall_rule LWRP is now :reject. This is in line with a
"default deny" policy.
v0.10.0
------
- [COOK-1234] - allow multiple ports per rule

* [COOK-1429] - resolve foodcritic warnings
v0.9.2
------
- [COOK-1615] - Firewall example docs have incorrect direction syntax

## v0.8.0:
v0.9.0
------
The default action for firewall LWRP is now :enable, the default action for firewall_rule LWRP is now :reject. This is in line with a "default deny" policy.

* refactor all resources and providers into LWRPs
* removed :reset action from firewall resource (couldn't find a good way to make it idempotent)
* removed :logging action from firewall resource...just set desired level via the log_level attribute
- [COOK-1429] - resolve foodcritic warnings

## v0.6.0:
v0.8.0
------
- refactor all resources and providers into LWRPs
- removed :reset action from firewall resource (couldn't find a good way to make it idempotent)
- removed :logging action from firewall resource...just set desired level via the log_level attribute

* [COOK-725] Firewall cookbook firewall_rule LWRP needs to support logging attribute.
* Firewall cookbook firewall LWRP needs to support :logging
v0.6.0
------
- [COOK-725] Firewall cookbook firewall_rule LWRP needs to support logging attribute.
- Firewall cookbook firewall LWRP needs to support :logging

## v0.5.7:
v0.5.7
------
- [COOK-696] Firewall cookbook firewall_rule LWRP needs to support interface
- [COOK-697] Firewall cookbook firewall_rule LWRP needs to support the direction for the rules

* [COOK-696] Firewall cookbook firewall_rule LWRP needs to support interface
* [COOK-697] Firewall cookbook firewall_rule LWRP needs to support the direction for the rules
v0.5.6
------
- [COOK-695] Firewall cookbook firewall_rule LWRP needs to support destination port

## v0.5.6:
v0.5.5
------
- [COOK-709] fixed :nothing action for the 'firewall_rule' resource.

* [COOK-695] Firewall cookbook firewall_rule LWRP needs to support destination port
v0.5.4
------
- [COOK-694] added :reject action to the 'firewall_rule' resource.

## v0.5.5:
v0.5.3
------
- [COOK-698] added :reset action to the 'firewall' resource.

* [COOK-709] fixed :nothing action for the 'firewall_rule' resource.

## v0.5.4:

* [COOK-694] added :reject action to the 'firewall_rule' resource.

## v0.5.3:

* [COOK-698] added :reset action to the 'firewall' resource.

## v0.5.2:

* add missing 'requires' statements. fixes 'NameError: uninitialized constant' error.
v0.5.2
------
- Add missing 'requires' statements. fixes 'NameError: uninitialized constant' error.
thanks to Ernad Husremović for the fix.

## v0.5.0:

* [COOK-686] create firewall and firewall_rule resources
* [COOK-687] create UFW providers for all resources
v0.5.0
------
- [COOK-686] create firewall and firewall_rule resources
- [COOK-687] create UFW providers for all resources
29 changes: 0 additions & 29 deletions CONTRIBUTING

This file was deleted.

Loading

0 comments on commit 832805e

Please sign in to comment.