(MODULES-4098) Sync the rest of the files

diff --git a/.gitignore b/.gitignore
index 0cd25de9afb0e3ed0bdc5f3b72d6d4e2362c2d33..f6e8b46c29ee7fb0d148126fec3ff54c4192f676 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,24 @@
 #This file is generated by ModuleSync, do not edit.
 pkg/
 Gemfile.lock
+Gemfile.local
 vendor/
 spec/fixtures/manifests/
 spec/fixtures/modules/
+log/
+junit/
 .vagrant/
 .bundle/
 coverage/
 log/
 .idea/
+.metadata
 *.iml
+.*.sw[op]
+.yardoc
+.yardwarns
+.DS_Store
+tmp/
+vendor/
+doc/
+

diff --git a/.project b/.project
new file mode 100644 (file)
index 0000000..38c2bdb
--- /dev/null
+++ b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>puppetlabs-firewall</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
+               <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+       </natures>
+</projectDescription>

diff --git a/.sync.yml b/.sync.yml
index ffc7ff3d73436f47adc515b611dee15a34823c10..728465c253acd059c1129b87391d234d3dec2816 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,4 +1,6 @@
 ---
+appveyor.yml:
+  delete: true
 # only run a minimal subset of tests on travis, as many of the tests exercise the kernel, which is the "wrong" one anyways
 .travis.yml:
   docker_sets:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3c3f1e79997c90de7e3b08202667ef8c72c65bac..990edba7e70c856cb84c64affdafa9b4f98aa110 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,7 +43,7 @@ Checklist (and a short version for the impatient)
 
       - Make sure you have a [GitHub account](https://github.com/join)
 
-      - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
+      - [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.
 
     * Preferred method:
 
@@ -215,4 +215,3 @@ Additional Resources
 * [General GitHub documentation](http://help.github.com/)
 
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-

diff --git a/Gemfile b/Gemfile
index 5820775a362b1dcdba4e45288a8597be2f53c199..5d863251d66604c2b1327f1e0fb6b420dadb6076 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -49,15 +49,13 @@ group :development do
   gem 'json_pure', '<= 2.0.1',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
   gem 'fast_gettext', '1.1.0',              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
   gem 'fast_gettext',                       :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+  gem 'rainbow', '< 2.2.0',                 :require => false
 end
 
 group :system_tests do
-  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.20')                if supports_windows
-  gem 'beaker', *location_for(ENV['BEAKER_VERSION'])                             if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0') and ! supports_windows
-  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '< 3')                    if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0') and ! supports_windows
-  gem 'beaker-pe',                                                               :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
-  gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')     if ! supports_windows
-  gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1')     if supports_windows
+  gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
+  gem 'beaker-pe',                                                               :require => false
+  gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'])                
   gem 'beaker-puppet_install_helper',                                            :require => false
   gem 'beaker-module_install_helper',                                            :require => false
   gem 'master_manipulator',                                                      :require => false

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644 (file)
index 0000000..1b588ae
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,6 @@
+## Maintenance
+
+Maintainers:
+  - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`
+
+Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `firewall`.

diff --git a/NOTICE b/NOTICE
index b22144877e7cc78c24c3afcf5210f55b2df87c1b..98965f859a6928ee22dd707ec4c979411ce9d718 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,17 +1,6 @@
-firewall puppet module
-
-Copyright (C) 2011-2016 Puppet Labs, Inc.
-Copyright (C) 2011 Jonathan Boyett
-Copyright (C) 2011 Media Temple, Inc.
-
-Some of the iptables code was taken from puppet-iptables which was:
-
-Copyright (C) 2011 Bob.sh Limited
-Copyright (C) 2008 Camptocamp Association
-Copyright (C) 2007 Dmitri Priimak
-
-Puppet Labs can be contacted at: info@puppetlabs.com
+Puppet Module - puppetlabs-firewall
 
+Copyright 2017 Puppet, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,4 +12,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
\ No newline at end of file

diff --git a/Rakefile b/Rakefile
index 3e8d4cb9526d1ac226aa591ea64ac558f905e50a..d12d85495d735b72ada9cb125a3b9ce13db13561 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,9 @@
-require 'puppet_blacksmith/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
+require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 
+PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 
 desc 'Generate pooler nodesets'
 task :gen_nodeset do