Merge pull request #3 from jantman/bump-sudo

Bump sudo

Author: jantman

.fixtures.yml

@@ -13,10 +13,5 @@ fixtures:
     sysctl: "https://github.com/duritong/puppet-sysctl.git"
     inifile: "https://github.com/puppetlabs/puppetlabs-inifile.git"
     ssh: "https://github.com/saz/puppet-ssh.git"
-    ##############################################
-    ### jantman personal module - private repo ###
-    ##############################################
-    privatepuppet:
-      repo: "git@github.com:jantman/privatepuppet.git"
   symlinks:
     workstation_bootstrap: "#{source_dir}"

.ruby-version

@@ -1 +1 @@
-ruby-2.1.1
+ruby-2.2.5

.travis.yml

@@ -2,13 +2,11 @@
 sudo: false
 language: ruby
 bundler_args: --without system_tests
+before_install: rm Gemfile.lock || true
 script: "bundle exec rake validate lint spec SPEC_OPTS='--format documentation'"
-matrix:
-  fast_finish: true
-  include:
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.8" FUTURE_PARSER="yes"
-  - rvm: 2.1.6
-    env: PUPPET_GEM_VERSION="~> 4.2.1" STRICT_VARIABLES="yes"
+rvm:
+  - 2.3
+env:
+  - PUPPET_VERSION="~> 4.0"
 notifications:
   email: false

CHANGELOG

@@ -1,3 +1,6 @@
+2017-07-09 Release 1.1.0
+- bump saz/sudo requirement per jantman/puppet-archlinux-workstation
+
 2017-05-07 Release 1.0.0
 - allow disabling global firewall module purge via hiera setting
 

Gemfile

@@ -11,16 +11,22 @@ def location_for(place, fake_version = nil)
 end
 
 group :development, :unit_tests do
-  gem 'rspec-core', '3.1.7',     :require => false
+  if RUBY_VERSION < '1.9'
+    gem 'rspec-core', '3.1.7'
+  else
+    # newer version required to avoid BKR-537
+    gem 'rspec-core', '>= 3.4'
+  end
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'simplecov',               :require => false
   gem 'puppet_facts',            :require => false
   gem 'json',                    :require => false
   gem 'metadata-json-lint',      :require => false
+  gem 'rake', '< 11.0',          :require => false
 end
 
 group :system_tests do
-  gem 'beaker', :git => 'https://github.com/jantman/beaker.git', :branch => 'archlinux'
+  gem 'beaker', '~> 3.7.0'
   if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
@@ -38,7 +44,7 @@ else
   gem 'facter', :require => false
 end
 
-if puppetversion = ENV['PUPPET_GEM_VERSION']
+if puppetversion = ENV['PUPPET_VERSION']
   gem 'puppet', puppetversion, :require => false
 else
   gem 'puppet', :require => false

manifests/firewall_pre.pp

@@ -8,24 +8,24 @@
   firewall { '000 accept all icmp':
     proto  => 'icmp',
     action => 'accept',
-  }->
-  firewall { '001 accept all to lo interface':
+  }
+  -> firewall { '001 accept all to lo interface':
     proto   => 'all',
     iniface => 'lo',
     action  => 'accept',
-  }->
-  firewall { '002 reject local traffic not on loopback interface':
+  }
+  -> firewall { '002 reject local traffic not on loopback interface':
     iniface     => '! lo',
     proto       => 'all',
     destination => '127.0.0.1/8',
     action      => 'reject',
-  }->
-  firewall { '003 accept related established rules':
+  }
+  -> firewall { '003 accept related established rules':
     proto   => 'all',
     ctstate => ['RELATED', 'ESTABLISHED'],
     action  => 'accept',
-  }->
-  firewall { '004 accept SSH':
+  }
+  -> firewall { '004 accept SSH':
     dport  => 22,
     proto  => 'tcp',
     action => 'accept',

puppet/Puppetfile

@@ -25,7 +25,7 @@ mod 'archlinux_macbookretina',
 
 ### module dependencies ###
 mod 'puppetlabs/stdlib', '4.9.0'
-mod 'saz/sudo', '3.1.0' # dependency of jantman/archlinux_workstation
+mod 'saz/sudo', '4.2.0' # dependency of jantman/archlinux_workstation
 mod 'saz/ssh', '2.8.1' # dependency of jantman/archlinux_macbookretina
 mod 'puppetlabs/concat', '1.2.4' # dependency of saz/ssh
 mod 'puppetlabs/firewall', '1.8.0'

puppet/hiera/user_config.yaml

@@ -13,7 +13,6 @@ archlinux_workstation::ssh::extra_options:
   PubkeyAcceptedKeyTypes: +ssh-dss
 archlinux_workstation::ssh::allow_users:
   - jantman
-  - jackie
 
 classes:
   - privatepuppet