Merge pull request #5 from HEP-Puppet/development

Importing first release passing the tests from dev branch

.fixtures.yml

@@ -1,7 +1,9 @@
 fixtures:
   repositories:
-    "apache": "https://github.com/example42/puppet-apache.git"
+    "apache": "https://github.com/puppetlabs/puppetlabs-apache.git"
+    "concat": "https://github.com/puppetlabs/puppetlabs-concat.git"
     "stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib"
+    "firewall": "https://github.com/puppetlabs/puppetlabs-firewall"
     "grid_repos": "https://github.com/HEP-Puppet/grid_repos"
   symlinks:
     "nagios": "#{source_dir}"

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 .pydevproject
+spec/fixtures

.travis.yml

@@ -1,14 +1,27 @@
 language: ruby
+
 rvm:
   - 1.8.7
-script: "rake spec SPEC_OPTS='--format documentation'"
+
+script: "rake spec SPEC_OPTS='--color --format documentation'"
+
 branches:
   only:
     - master
-    - dev
+    - development
+
 notifications:
   email: false
+
 gemfile: Gemfile
+
 env:
   - PUPPET_VERSION=2.7.23 # latest 2.7; PE 2.8.0+
   - PUPPET_VERSION=3.3.2 # latest 3.3; 
+
+before_install:
+  - travis_retry gem update --system 2.1.11
+  - travis_retry gem install bundler --pre
+  - gem --version
+  - bundle --version
+

Modulefile

@@ -12,3 +12,4 @@ project_page 'http://hep-puppet.github.io/'
 dependency 'puppetlabs-apache', '>=0.9.0'
 dependency 'heppuppet-grid_repos', '0.1.0'
 dependency 'puppetlabs-stdlib', '>=4.1.0'
+dependency 'puppetlabs/firewall', '>=0.3.1'