diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index cc4675e5ddb912f2284a6741ec440ed812730d37..a719361689897b67e53c12da1c50e68c5b8c7dc8 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -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": [],
diff --git a/.rubocop.yml b/.rubocop.yml
index 8f782e741528905cd59743f73283f8a39e9bf210..31e8248ff813e956702d5c67844aeb0e2affc917 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,7 @@ require:
- rubocop-rspec
AllCops:
DisplayCopNames: true
- TargetRubyVersion: '2.4'
+ TargetRubyVersion: '2.5'
Include:
- "**/*.rb"
Exclude:
diff --git a/Gemfile b/Gemfile
index 18272fd72e8b95feb3fe64e34a51a9b75a7af794..2feeaf745a85e24148a31ab31fcee42607088d86 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,28 +13,35 @@ 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 "puppet-lint-absolute_classname-check", '3.0.1', require: false
- gem "puppet-lint-absolute_template_path", '1.0.1', require: false
- gem "puppet-lint-empty_trailing_lines", '0.0.1', require: false
- gem "puppet-lint-file_ensure-check", '1.0.0', require: false
- gem "puppet-lint-strict_indent-check", '2.0.8', require: false
- gem "puppet-lint-trailing_comma-check", '0.4.2', require: false
- gem "puppet-lint-unquoted_string-check", '2.1.0', require: false
+ gem "json", '~> 2.0', require: false
+ gem "voxpupuli-puppet-lint-plugins", '~> 3.0', 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]
+ gem "concurrent-ruby", '< 1.2.0', require: false
+ gem "puppet-lint-absolute_classname-check", '>= 3.0.1', require: false
+ gem "puppet-lint-absolute_template_path", '>= 1.0.1', require: false
+ gem "puppet-lint-empty_trailing_lines", '>= 0.0.1', require: false
+ gem "puppet-lint-file_ensure-check", '>= 1.0.0', require: false
+ gem "puppet-lint-strict_indent-check", '>= 2.0.8', require: false
+ gem "puppet-lint-trailing_comma-check", '>= 0.4.3', require: false
+ gem "puppet-lint-unquoted_string-check", '>= 2.1.0', require: false
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']
diff --git a/manifests/init.pp b/manifests/init.pp
index 7c4e4cd6ff41a501ec80e4358232962f4475ff42..b59f75d50ce0afe8ffa6f3ce27e8a63053d48bf8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,5 +1,3 @@
-
-
# @summary A short summary of the purpose of this class
#
# A description of what this class does
@@ -7,29 +5,32 @@
# @example
# include vacceval
class vacceval {
- include certdist
+ $hostname = fact( 'networking.fqdn' )
+ profiles::letsencrypt::cert { $hostname :
+ common_name => $hostname,
+ }
firewalld_service { 'Allow SSH in the liu zone':
ensure => present,
zone => 'liu',
service => 'ssh',
}
- firewalld_service {'Allow http in the liu Zone':
+ firewalld_service { 'Allow http in the liu Zone':
ensure => present,
zone => 'liu',
service => 'http',
}
- firewalld_service {'Allow https in the liu Zone':
+ firewalld_service { 'Allow https in the liu Zone':
ensure => present,
zone => 'liu',
service => 'https',
}
- firewalld_service {'Allow http in the public Zone':
+ firewalld_service { 'Allow http in the public Zone':
ensure => present,
zone => 'public',
service => 'http',
}
- firewalld_service {'Allow https in the public Zone':
+ firewalld_service { 'Allow https in the public Zone':
ensure => present,
zone => 'public',
service => 'https',
@@ -39,4 +40,3 @@ class vacceval {
content => "hello world!",
}
}
-
diff --git a/metadata.json b/metadata.json
index f6e39a24d6ce602ff207e9d41fff0f736daaa4b1..7ca2a6e8809c3a8e27618e31321de4ac436167e7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -52,7 +52,7 @@
"version_requirement": ">= 6.21.0 < 8.0.0"
}
],
- "pdk-version": "2.3.0",
+ "pdk-version": "2.6.1",
"template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
- "template-ref": "heads/liu-0-g76c91ed"
+ "template-ref": "heads/liu-0-g77baf11"
}