Unverified Commit 6afb062c authored by Nathan Ward's avatar Nathan Ward Committed by GitHub
Browse files

Merge pull request #181 from sircubbi/update_pdk 

Update PDK to 2.6.1
parents e5e9a291 54a728cc

.devcontainer/README.md

+6 −2
Original line number Diff line number Diff line
@@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp 


	// Set *default* container specific settings.json values on container create.

	"settings": {

		"terminal.integrated.shell.linux": "/bin/bash"

		"terminal.integrated.profiles.linux": {

			"bash": {

				"path": "bash",

			}

		}

	},



	// Add the IDs of extensions you want installed when the container is created.

	"extensions": [

		"puppet.puppet-vscode",

		"rebornix.Ruby"

	]

	],



	// Use 'forwardPorts' to make a list of ports inside the container available locally.

	"forwardPorts": [],

.rubocop.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ require: 
- rubocop-rspec

AllCops:

  DisplayCopNames: true

  TargetRubyVersion: '2.4'

  TargetRubyVersion: '2.5'

  Include:

  - "**/*.rb"

  Exclude:

Gemfile

+22 −12
Original line number Diff line number Diff line
@@ -13,21 +13,31 @@ def location_for(place_or_version, fake_version = nil) 
  end

end



ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments

minor_version = ruby_version_segments[0..1].join('.')



group :development do

  gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))

  gem "json", '= 2.1.0',                               require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))

  gem "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))

  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]

  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]

  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]

  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]

  gem "json", '= 2.3.0',                               require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))

  gem "json", '= 2.5.1',                               require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))

  gem "json", '= 2.6.1',                               require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))

  gem "json", '= 2.6.3',                               require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))

  gem "voxpupuli-puppet-lint-plugins", '~> 3.1',       require: false

  gem "facterdb", '~> 1.18',                           require: false

  gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0',     require: false

  gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false

  gem "rspec-puppet-facts", '~> 2.0',                  require: false

  gem "codecov", '~> 0.2',                             require: false

  gem "dependency_checker", '~> 0.2',                  require: false

  gem "parallel_tests", '~> 3.4',                      require: false

  gem "pry", '~> 0.10',                                require: false

  gem "simplecov-console", '~> 0.5',                   require: false

  gem "puppet-debugger", '~> 1.0',                     require: false

  gem "rubocop", '= 1.6.1',                            require: false

  gem "rubocop-performance", '= 1.9.1',                require: false

  gem "rubocop-rspec", '= 2.0.1',                      require: false

  gem "rb-readline", '= 0.5.5',                        require: false, platforms: [:mswin, :mingw, :x64_mingw]

end

group :system_tests do

  gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]

  gem "puppet-module-win-system-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]

  gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]

  gem "serverspec", '~> 2.41',    require: false

end



puppet_version = ENV['PUPPET_GEM_VERSION']

manifests/home_server_pool.pp

+0 −1
Original line number Diff line number Diff line
@@ -14,4 +14,3 @@ define freeradius::home_server_pool ( 
    order   => 20,

  }

}

manifests/init.pp

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ class freeradius ( 
  Optional[String] $package_ensure = 'installed',

  String $radacctdir               = $freeradius::params::radacctdir,

) inherits freeradius::params {



  if $freeradius::fr_version !~ /^3/ {

    notify { 'This module is only compatible with FreeRADIUS 3.': }

  }
@@ -185,7 +184,6 @@ class freeradius ( 
    order   => '95',

  }





  # Set up concat proxy file

  concat { "${freeradius::fr_basepath}/proxy.conf":

    owner          => 'root',