diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2240a97..cace33e 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,281 +1,283 @@
 # Contribution guidelines
 
 ## Table of contents
 
 * [Contributing](#contributing)
 * [Writing proper commits - short version](#writing-proper-commits-short-version)
 * [Writing proper commits - long version](#writing-proper-commits-long-version)
 * [Dependencies](#dependencies)
   * [Note for OS X users](#note-for-os-x-users)
 * [The test matrix](#the-test-matrix)
 * [Syntax and style](#syntax-and-style)
 * [Running the unit tests](#running-the-unit-tests)
 * [Unit tests in docker](#unit-tests-in-docker)
 * [Integration tests](#integration-tests)
 
 This module has grown over time based on a range of contributions from
 people using it. If you follow these contributing guidelines your patch
 will likely make it into a release a little more quickly.
 
 ## Contributing
 
 Please note that this project is released with a Contributor Code of Conduct.
 By participating in this project you agree to abide by its terms.
 [Contributor Code of Conduct](https://voxpupuli.org/coc/).
 
 * Fork the repo.
 * Create a separate branch for your change.
 * We only take pull requests with passing tests, and documentation. [travis-ci](http://travis-ci.org) runs the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
 * Checkout [our docs](https://voxpupuli.org/docs/reviewing_pr/) we use to review a module and the [official styleguide](https://puppet.com/docs/puppet/6.0/style_guide.html). They provide some guidance for new code that might help you before you submit a pull request.
 * Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test.
 * Squash your commits down into logical components. Make sure to rebase against our current master.
 * Push the branch to your fork and submit a pull request.
 
 Please be prepared to repeat some of these steps as our contributors review your code.
 
+Also consider sending in your profile code that calls this component module as an acceptance test or provide it via an issue. This helps reviewers a lot to test your use case and prevents future regressions!
+
 ## Writing proper commits - short version
 
 * Make commits of logical units.
 * Check for unnecessary whitespace with "git diff --check" before committing.
 * Commit using Unix line endings (check the settings around "crlf" in git-config(1)).
 * Do not check in commented out code or unneeded files.
 * The first line of the commit message should be a short description (50 characters is the soft limit, excluding ticket number(s)), and should skip the full stop.
 * Associate the issue in the message. The first line should include the issue number in the form "(#XXXX) Rest of message".
 * The body should provide a meaningful commit message, which:
   *uses the imperative, present tense: `change`, not `changed` or `changes`.
   * includes motivation for the change, and contrasts its implementation with the previous behavior.
   * Make sure that you have tests for the bug you are fixing, or feature you are adding.
   * Make sure the test suites passes after your commit:
   * When introducing a new feature, make sure it is properly documented in the README.md
 
 ## Writing proper commits - long version
 
   1.  Make separate commits for logically separate changes.
 
       Please break your commits down into logically consistent units
       which include new or changed tests relevant to the rest of the
       change.  The goal of doing this is to make the diff easier to
       read for whoever is reviewing your code.  In general, the easier
       your diff is to read, the more likely someone will be happy to
       review it and get it into the code base.
 
       If you are going to refactor a piece of code, please do so as a
       separate commit from your feature or bug fix changes.
 
       We also really appreciate changes that include tests to make
       sure the bug is not re-introduced, and that the feature is not
       accidentally broken.
 
       Describe the technical detail of the change(s).  If your
       description starts to get too long, that is a good sign that you
       probably need to split up your commit into more finely grained
       pieces.
 
       Commits which plainly describe the things which help
       reviewers check the patch and future developers understand the
       code are much more likely to be merged in with a minimum of
       bike-shedding or requested changes.  Ideally, the commit message
       would include information, and be in a form suitable for
       inclusion in the release notes for the version of Puppet that
       includes them.
 
       Please also check that you are not introducing any trailing
       whitespace or other "whitespace errors".  You can do this by
       running "git diff --check" on your changes before you commit.
 
   2.  Sending your patches
 
       To submit your changes via a GitHub pull request, we _highly_
       recommend that you have them on a topic branch, instead of
       directly on `master`.
       It makes things much easier to keep track of, especially if
       you decide to work on another thing before your first change
       is merged in.
 
       GitHub has some pretty good
       [general documentation](http://help.github.com/) on using
       their site.  They also have documentation on
       [creating pull requests](http://help.github.com/send-pull-requests/).
 
       In general, after pushing your topic branch up to your
       repository on GitHub, you can switch to the branch in the
       GitHub UI and click "Pull Request" towards the top of the page
       in order to open a pull request.
 
 
   3.  Update the related GitHub issue.
 
       If there is a GitHub issue associated with the change you
       submitted, then you should update the ticket to include the
       location of your branch, along with any other commentary you
       may wish to make.
 
 ## Dependencies
 
 The testing and development tools have a bunch of dependencies,
 all managed by [bundler](http://bundler.io/) according to the
 [Puppet support matrix](http://docs.puppetlabs.com/guides/platforms.html#ruby-versions).
 
 By default the tests use a baseline version of Puppet.
 
 If you have Ruby 2.x or want a specific version of Puppet,
 you must set an environment variable such as:
 
 ```sh
 export PUPPET_VERSION="~> 5.5.6"
 ```
 
 You can install all needed gems for spec tests into the modules directory by
 running:
 
 ```sh
 bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
 ```
 
 If you also want to run acceptance tests:
 
 ```sh
 bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
 ```
 
 Our all in one solution if you don't know if you need to install or update gems:
 
 ```sh
 bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
 ```
 
 As an alternative to the `--jobs "$(nproc)` parameter, you can set an
 environment variable:
 
 ```sh
 BUNDLE_JOBS="$(nproc)"
 ```
 
 ### Note for OS X users
 
 `nproc` isn't a valid command under OS x. As an alternative, you can do:
 
 ```sh
 --jobs "$(sysctl -n hw.ncpu)"
 ```
 
 ## The test matrix
 
 ### Syntax and style
 
 The test suite will run [Puppet Lint](http://puppet-lint.com/) and
 [Puppet Syntax](https://github.com/gds-operations/puppet-syntax) to
 check various syntax and style things. You can run these locally with:
 
 ```sh
 bundle exec rake lint
 bundle exec rake validate
 ```
 
 It will also run some [Rubocop](http://batsov.com/rubocop/) tests
 against it. You can run those locally ahead of time with:
 
 ```sh
 bundle exec rake rubocop
 ```
 
 ### Running the unit tests
 
 The unit test suite covers most of the code, as mentioned above please
 add tests if you're adding new functionality. If you've not used
 [rspec-puppet](http://rspec-puppet.com/) before then feel free to ask
 about how best to test your new feature.
 
 To run the linter, the syntax checker and the unit tests:
 
 ```sh
 bundle exec rake test
 ```
 
 To run your all the unit tests
 
 ```sh
 bundle exec rake spec
 ```
 
 To run a specific spec test set the `SPEC` variable:
 
 ```sh
 bundle exec rake spec SPEC=spec/foo_spec.rb
 ```
 
 #### Unit tests in docker
 
 Some people don't want to run the dependencies locally or don't want to install
 ruby. We ship a Dockerfile that enables you to run all unit tests and linting.
 You only need to run:
 
 ```sh
 docker build .
 ```
 
 Please ensure that a docker daemon is running and that your user has the
 permission to talk to it. You can specify a remote docker host by setting the
 `DOCKER_HOST` environment variable. it will copy the content of the module into
 the docker image. So it will not work if a Gemfile.lock exists.
 
 ### Integration tests
 
 The unit tests just check the code runs, not that it does exactly what
 we want on a real machine. For that we're using
 [beaker](https://github.com/puppetlabs/beaker).
 
 This fires up a new virtual machine (using vagrant) and runs a series of
 simple tests against it after applying the module. You can run this
 with:
 
 ```sh
 bundle exec rake acceptance
 ```
 
 This will run the tests on the module's default nodeset. You can override the
 nodeset used, e.g.,
 
 ```sh
 BEAKER_set=centos-7-x64 bundle exec rake acceptance
 ```
 
 There are default rake tasks for the various acceptance test modules, e.g.,
 
 ```sh
 bundle exec rake beaker:centos-7-x64
 bundle exec rake beaker:ssh:centos-7-x64
 ```
 
 If you don't want to have to recreate the virtual machine every time you can
 use `BEAKER_destroy=no` and `BEAKER_provision=no`. On the first run you will at
 least need `BEAKER_provision` set to yes (the default). The Vagrantfile for the
 created virtual machines will be in `.vagrant/beaker_vagrant_files`.
 
 Beaker also supports docker containers. We also use that in our automated CI
 pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:
 
 ```sh
 PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian10-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
 ```
 
 You can replace the string `debian10` with any common operating system.
 The following strings are known to work:
 
 * ubuntu1604
 * ubuntu1804
-* debian8
+* ubuntu2004
 * debian9
 * debian10
 * centos6
 * centos7
 * centos8
 
 The easiest way to debug in a docker container is to open a shell:
 
 ```sh
 docker exec -it -u root ${container_id_or_name} bash
 ```
 
 The source of this file is in our [modulesync_config](https://github.com/voxpupuli/modulesync_config/blob/master/moduleroot/.github/CONTRIBUTING.md.erb)
 repository.
diff --git a/.msync.yml b/.msync.yml
index 4c7999c..5758ace 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1,2 @@
-modulesync_config_version: '3.0.0'
+---
+modulesync_config_version: '3.1.0'
diff --git a/.overcommit.yml b/.overcommit.yml
index 1b03fad..0af0fdc 100644
--- a/.overcommit.yml
+++ b/.overcommit.yml
@@ -1,64 +1,64 @@
 # Managed by https://github.com/voxpupuli/modulesync_configs
 #
 # Hooks are only enabled if you take action.
 #
 # To enable the hooks run:
 #
 # ```
 # bundle exec overcommit --install
 # # ensure .overcommit.yml does not harm to you and then
 # bundle exec overcommit --sign
 # ```
 #
 # (it will manage the .git/hooks directory):
 #
 # Examples howto skip a test for a commit or push:
 #
 # ```
 # SKIP=RuboCop git commit
 # SKIP=PuppetLint git commit
 # SKIP=RakeTask git push
 # ```
 #
 # Don't invoke overcommit at all:
 #
 # ```
 # OVERCOMMIT_DISABLE=1 git commit
 # ```
 #
 # Read more about overcommit: https://github.com/brigade/overcommit
 #
 # To manage this config yourself in your module add
 #
 # ```
 # .overcommit.yml:
 #   unmanaged: true
 # ```
 #
 # to your modules .sync.yml config
 ---
 PreCommit:
   RuboCop:
     enabled: true
     description: 'Runs rubocop on modified files only'
     command: ['bundle', 'exec', 'rubocop']
   PuppetLint:
     enabled: true
     description: 'Runs puppet-lint on modified files only'
     command: ['bundle', 'exec', 'puppet-lint']
   YamlSyntax:
     enabled: true
   JsonSyntax:
     enabled: true
   TrailingWhitespace:
     enabled: true
 
 PrePush:
   RakeTarget:
     enabled: true
     description: 'Run rake targets'
     targets:
       - 'validate'
       - 'test'
       - 'rubocop'
-    command: [ 'bundle', 'exec', 'rake' ]
+    command: ['bundle', 'exec', 'rake']
diff --git a/.rubocop.yml b/.rubocop.yml
index 316e4ec..198a359 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,549 +1,3 @@
-require: rubocop-rspec
-AllCops:
-# Puppet Server 5 defaults to jruby 1.7 so TargetRubyVersion must stay at 1.9 until we drop support for puppet 5
-  TargetRubyVersion: 1.9
-  Include:
-    - ./**/*.rb
-  Exclude:
-    - files/**/*
-    - vendor/**/*
-    - .vendor/**/*
-    - pkg/**/*
-    - spec/fixtures/**/*
-    - Gemfile
-    - Rakefile
-    - Guardfile
-    - Vagrantfile
-Lint/ConditionPosition:
-  Enabled: True
-
-Lint/ElseLayout:
-  Enabled: True
-
-Lint/UnreachableCode:
-  Enabled: True
-
-Lint/UselessComparison:
-  Enabled: True
-
-Lint/EnsureReturn:
-  Enabled: True
-
-Lint/HandleExceptions:
-  Enabled: True
-
-Lint/LiteralInCondition:
-  Enabled: True
-
-Lint/ShadowingOuterLocalVariable:
-  Enabled: True
-
-Lint/LiteralInInterpolation:
-  Enabled: True
-
-Style/HashSyntax:
-  Enabled: True
-
-Style/RedundantReturn:
-  Enabled: True
-
-Layout/EndOfLine:
-  Enabled: False
-
-Lint/AmbiguousOperator:
-  Enabled: True
-
-Lint/AssignmentInCondition:
-  Enabled: True
-
-Layout/SpaceBeforeComment:
-  Enabled: True
-
-Style/AndOr:
-  Enabled: True
-
-Style/RedundantSelf:
-  Enabled: True
-
-Metrics/BlockLength:
-  Enabled: False
-
-# Method length is not necessarily an indicator of code quality
-Metrics/MethodLength:
-  Enabled: False
-
-# Module length is not necessarily an indicator of code quality
-Metrics/ModuleLength:
-  Enabled: False
-
-Style/WhileUntilModifier:
-  Enabled: True
-
-Lint/AmbiguousRegexpLiteral:
-  Enabled: True
-
-Security/Eval:
-  Enabled: True
-
-Lint/BlockAlignment:
-  Enabled: True
-
-Lint/DefEndAlignment:
-  Enabled: True
-
-Lint/EndAlignment:
-  Enabled: True
-
-Lint/DeprecatedClassMethods:
-  Enabled: True
-
-Lint/Loop:
-  Enabled: True
-
-Lint/ParenthesesAsGroupedExpression:
-  Enabled: True
-
-Lint/RescueException:
-  Enabled: True
-
-Lint/StringConversionInInterpolation:
-  Enabled: True
-
-Lint/UnusedBlockArgument:
-  Enabled: True
-
-Lint/UnusedMethodArgument:
-  Enabled: True
-
-Lint/UselessAccessModifier:
-  Enabled: True
-
-Lint/UselessAssignment:
-  Enabled: True
-
-Lint/Void:
-  Enabled: True
-
-Layout/AccessModifierIndentation:
-  Enabled: True
-
-Style/AccessorMethodName:
-  Enabled: True
-
-Style/Alias:
-  Enabled: True
-
-Layout/AlignArray:
-  Enabled: True
-
-Layout/AlignHash:
-  Enabled: True
-
-Layout/AlignParameters:
-  Enabled: True
-
-Metrics/BlockNesting:
-  Enabled: True
-
-Style/AsciiComments:
-  Enabled: True
-
-Style/Attr:
-  Enabled: True
-
-Style/BracesAroundHashParameters:
-  Enabled: True
-
-Style/CaseEquality:
-  Enabled: True
-
-Layout/CaseIndentation:
-  Enabled: True
-
-Style/CharacterLiteral:
-  Enabled: True
-
-Style/ClassAndModuleCamelCase:
-  Enabled: True
-
-Style/ClassAndModuleChildren:
-  Enabled: False
-
-Style/ClassCheck:
-  Enabled: True
-
-# Class length is not necessarily an indicator of code quality
-Metrics/ClassLength:
-  Enabled: False
-
-Style/ClassMethods:
-  Enabled: True
-
-Style/ClassVars:
-  Enabled: True
-
-Style/WhenThen:
-  Enabled: True
-
-Style/WordArray:
-  Enabled: True
-
-Style/UnneededPercentQ:
-  Enabled: True
-
-Layout/Tab:
-  Enabled: True
-
-Layout/SpaceBeforeSemicolon:
-  Enabled: True
-
-Layout/TrailingBlankLines:
-  Enabled: True
-
-Layout/SpaceInsideBlockBraces:
-  Enabled: True
-
-Layout/SpaceInsideBrackets:
-  Enabled: True
-
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: True
-
-Layout/SpaceInsideParens:
-  Enabled: True
-
-Layout/LeadingCommentSpace:
-  Enabled: True
-
-Layout/SpaceBeforeFirstArg:
-  Enabled: True
-
-Layout/SpaceAfterColon:
-  Enabled: True
-
-Layout/SpaceAfterComma:
-  Enabled: True
-
-Layout/SpaceAfterMethodName:
-  Enabled: True
-
-Layout/SpaceAfterNot:
-  Enabled: True
-
-Layout/SpaceAfterSemicolon:
-  Enabled: True
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: True
-
-Layout/SpaceAroundOperators:
-  Enabled: True
-
-Layout/SpaceBeforeBlockBraces:
-  Enabled: True
-
-Layout/SpaceBeforeComma:
-  Enabled: True
-
-Style/CollectionMethods:
-  Enabled: True
-
-Layout/CommentIndentation:
-  Enabled: True
-
-Style/ColonMethodCall:
-  Enabled: True
-
-Style/CommentAnnotation:
-  Enabled: True
-
-# 'Complexity' is very relative
-Metrics/CyclomaticComplexity:
-  Enabled: False
-
-Style/ConstantName:
-  Enabled: True
-
-Style/Documentation:
-  Enabled: False
-
-Style/DefWithParentheses:
-  Enabled: True
-
-Style/PreferredHashMethods:
-  Enabled: True
-
-Layout/DotPosition:
-  EnforcedStyle: trailing
-
-Style/DoubleNegation:
-  Enabled: True
-
-Style/EachWithObject:
-  Enabled: True
-
-Layout/EmptyLineBetweenDefs:
-  Enabled: True
-
-Layout/IndentArray:
-  Enabled: True
-
-Layout/IndentHash:
-  Enabled: True
-
-Layout/IndentationConsistency:
-  Enabled: True
-
-Layout/IndentationWidth:
-  Enabled: True
-
-Layout/EmptyLines:
-  Enabled: True
-
-Layout/EmptyLinesAroundAccessModifier:
-  Enabled: True
-
-Style/EmptyLiteral:
-  Enabled: True
-
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Enabled: False
-
-Style/MethodCallWithoutArgsParentheses:
-  Enabled: True
-
-Style/MethodDefParentheses:
-  Enabled: True
-
-Style/LineEndConcatenation:
-  Enabled: True
-
-Layout/TrailingWhitespace:
-  Enabled: True
-
-Style/StringLiterals:
-  Enabled: True
-
-Style/TrailingCommaInArguments:
-  Enabled: True
-
-Style/TrailingCommaInLiteral:
-  Enabled: True
-
-Style/GlobalVars:
-  Enabled: True
-
-Style/GuardClause:
-  Enabled: True
-
-Style/IfUnlessModifier:
-  Enabled: True
-
-Style/MultilineIfThen:
-  Enabled: True
-
-Style/NegatedIf:
-  Enabled: True
-
-Style/NegatedWhile:
-  Enabled: True
-
-Style/Next:
-  Enabled: True
-
-Style/SingleLineBlockParams:
-  Enabled: True
-
-Style/SingleLineMethods:
-  Enabled: True
-
-Style/SpecialGlobalVars:
-  Enabled: True
-
-Style/TrivialAccessors:
-  Enabled: True
-
-Style/UnlessElse:
-  Enabled: True
-
-Style/VariableInterpolation:
-  Enabled: True
-
-Style/VariableName:
-  Enabled: True
-
-Style/WhileUntilDo:
-  Enabled: True
-
-Style/EvenOdd:
-  Enabled: True
-
-Style/FileName:
-  Enabled: True
-
-Style/For:
-  Enabled: True
-
-Style/Lambda:
-  Enabled: True
-
-Style/MethodName:
-  Enabled: True
-
-Style/MultilineTernaryOperator:
-  Enabled: True
-
-Style/NestedTernaryOperator:
-  Enabled: True
-
-Style/NilComparison:
-  Enabled: True
-
-Style/FormatString:
-  Enabled: True
-
-Style/MultilineBlockChain:
-  Enabled: True
-
-Style/Semicolon:
-  Enabled: True
-
-Style/SignalException:
-  Enabled: True
-
-Style/NonNilCheck:
-  Enabled: True
-
-Style/Not:
-  Enabled: True
-
-Style/NumericLiterals:
-  Enabled: True
-
-Style/OneLineConditional:
-  Enabled: True
-
-Style/OpMethod:
-  Enabled: True
-
-Style/ParenthesesAroundCondition:
-  Enabled: True
-
-Style/PercentLiteralDelimiters:
-  Enabled: True
-
-Style/PerlBackrefs:
-  Enabled: True
-
-Style/PredicateName:
-  Enabled: True
-
-Style/RedundantException:
-  Enabled: True
-
-Style/SelfAssignment:
-  Enabled: True
-
-Style/Proc:
-  Enabled: True
-
-Style/RaiseArgs:
-  Enabled: True
-
-Style/RedundantBegin:
-  Enabled: True
-
-Style/RescueModifier:
-  Enabled: True
-
-# based on https://github.com/voxpupuli/modulesync_config/issues/168
-Style/RegexpLiteral:
-  EnforcedStyle: percent_r
-  Enabled: True
-
-Lint/UnderscorePrefixedVariableName:
-  Enabled: True
-
-Metrics/ParameterLists:
-  Enabled: False
-
-Lint/RequireParentheses:
-  Enabled: True
-
-Style/ModuleFunction:
-  Enabled: True
-
-Lint/Debugger:
-  Enabled: True
-
-Style/IfWithSemicolon:
-  Enabled: True
-
-Style/Encoding:
-  Enabled: True
-
-Style/BlockDelimiters:
-  Enabled: True
-
-Layout/MultilineBlockLayout:
-  Enabled: True
-
-# 'Complexity' is very relative
-Metrics/AbcSize:
-  Enabled: False
-
-# 'Complexity' is very relative
-Metrics/PerceivedComplexity:
-  Enabled: False
-
-Lint/UselessAssignment:
-  Enabled: True
-
-Layout/ClosingParenthesisIndentation:
-  Enabled: True
-
-# RSpec
-
-RSpec/BeforeAfterAll:
-  Exclude:
-    - spec/acceptance/**/*
-
-# We don't use rspec in this way
-RSpec/DescribeClass:
-  Enabled: False
-
-# Example length is not necessarily an indicator of code quality
-RSpec/ExampleLength:
-  Enabled: False
-
-RSpec/NamedSubject:
-  Enabled: False
-
-# disabled for now since they cause a lot of issues
-# these issues aren't easy to fix
-RSpec/RepeatedDescription:
-  Enabled: False
-
-RSpec/NestedGroups:
-  Enabled: False
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
-# this is broken on ruby1.9
-Layout/IndentHeredoc:
-  Enabled: False
-
-# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
-Security/YAMLLoad:
-  Enabled: false
-
-# This affects hiera interpolation, as well as some configs that we push.
-Style/FormatStringToken:
-  Enabled: false
-
-# This is useful, but sometimes a little too picky about where unit tests files
-# are located.
-RSpec/FilePath:
-  Enabled: false
+---
+inherit_gem:
+  voxpupuli-test: rubocop.yml
diff --git a/.travis.yml b/.travis.yml
index 12a7329..017ebab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,108 +1,109 @@
 ---
+# yamllint disable rule:line-length rule:truthy
 os: linux
-dist: bionic
+dist: focal
 language: ruby
 cache: bundler
 before_install:
   - yes | gem update --system
   - bundle --version
 script:
   - 'bundle exec rake $CHECK'
 jobs:
   fast_finish: true
   include:
-  - rvm: 2.4.4
-    bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 5.0" CHECK=test
-  - rvm: 2.5.3
-    bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 6.0" CHECK=test_with_coveralls
-  - rvm: 2.5.3
-    bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 6.0" CHECK=rubocop
-  - rvm: 2.4.4
-    bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=ubuntu1604-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php56_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1604-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php56_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=centos7-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php56_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos7-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php56_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=ubuntu1804-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1804-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=ubuntu1604-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1604-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=centos7-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos7-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian9-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php_spec.rb
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian9-64 CHECK=beaker
-    script: bundle exec rspec spec/acceptance/php_spec.rb
-    services: docker
+    - rvm: 2.4.4
+      bundler_args: --without system_tests development release
+      env: PUPPET_VERSION="~> 5.0" CHECK=test
+    - rvm: 2.5.3
+      bundler_args: --without system_tests development release
+      env: PUPPET_VERSION="~> 6.0" CHECK=test_with_coveralls
+    - rvm: 2.5.3
+      bundler_args: --without system_tests development release
+      env: PUPPET_VERSION="~> 6.0" CHECK=rubocop
+    - rvm: 2.4.4
+      bundler_args: --without system_tests development release
+      env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=ubuntu1604-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php56_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1604-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php56_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=centos7-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php56_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos7-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php56_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=ubuntu1804-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1804-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=ubuntu1604-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1604-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=centos7-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos7-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian9-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php_spec.rb
+      services: docker
+    - rvm: 2.5.3
+      bundler_args: --without development release
+      env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian9-64 CHECK=beaker
+      script: bundle exec rspec spec/acceptance/php_spec.rb
+      services: docker
 branches:
   only:
-  - master
-  - /^v\d/
+    - master
+    - /^v\d/
 notifications:
   email: false
   webhooks: https://voxpupu.li/incoming/travis
   irc:
     on_success: always
     on_failure: always
     channels:
       - "chat.freenode.org#voxpupuli-notifications"
 deploy:
   provider: puppetforge
   username: puppet
   password:
     secure: "GOhttACuJt+3s38m4WnW5RuTgwqaAoeEQnNT+X1Ukn7KdcIk4KV8NzYU/CC0VIm8lUOnBWYJKEC4ixX/J/4Wbxox2RAoKMQrO++L0DB1zTCJnq9SfoUBMaQhXvLu+PbxAR0p3P47ozra0C+pOWDpOaxT9ecufrPQt9W9Z4aY/bs="
   on:
     tags: true
     # all_branches is required to use tags
     all_branches: true
     # Only publish the build marked with "DEPLOY_TO_FORGE"
     condition: "$DEPLOY_TO_FORGE = yes"
diff --git a/Gemfile b/Gemfile
index 8592cd6..2fce93c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,48 +1,48 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 def location_for(place, fake_version = nil)
   if place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place =~ /^file:\/\/(.*)/
     ['>= 0', { :path => File.expand_path($1), :require => false }]
   else
     [place, { :require => false }]
   end
 end
 
 group :test do
-  gem 'voxpupuli-test', '~> 2.0',  :require => false
+  gem 'voxpupuli-test', '~> 2.1',  :require => false
   gem 'coveralls',                 :require => false
   gem 'simplecov-console',         :require => false
 end
 
 group :development do
   gem 'travis',                   :require => false
   gem 'travis-lint',              :require => false
   gem 'guard-rake',               :require => false
   gem 'overcommit', '>= 0.39.1',  :require => false
 end
 
 group :system_tests do
   gem 'voxpupuli-acceptance',  :require => false
 end
 
 group :release do
   gem 'github_changelog_generator',  :require => false, :git => 'https://github.com/voxpupuli/github-changelog-generator', :branch => 'voxpupuli_essential_fixes'
   gem 'puppet-blacksmith',           :require => false
   gem 'voxpupuli-release',           :require => false
   gem 'puppet-strings', '>= 2.2',    :require => false
 end
 
 
 
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion.to_s, :require => false, :groups => [:test]
 else
   gem 'facter', :require => false, :groups => [:test]
 end
 
 ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 6.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby
diff --git a/manifests/composer/auto_update.pp b/manifests/composer/auto_update.pp
index 2a924c9..2a58c6a 100644
--- a/manifests/composer/auto_update.pp
+++ b/manifests/composer/auto_update.pp
@@ -1,55 +1,55 @@
 # Install composer package manager
 #
 # === Parameters
 #
 # [*max_age*]
 #   Defines number of days after which Composer should be updated
 #
 # [*source*]
 #   Holds URL to the Composer source file
 #
 # [*path*]
 #   Holds path to the Composer executable
 #
 # [*channel*]
 #   Holds the Update channel (stable|preview|snapshot|1|2)
 #
 # [*proxy_type*]
 #    proxy server type (none|http|https|ftp)
 #
 # [*proxy_server*]
 #   specify a proxy server, with port number if needed. ie: https://example.com:8080.
 #
 #
 # === Examples
 #
 #  include php::composer::auto_update
 #  class { "php::composer::auto_update":
 #    "max_age" => 90
 #  }
 #
 class php::composer::auto_update (
   $max_age,
   $source,
   $path,
   Php::ComposerChannel  $channel = 'stable',
   $proxy_type                    = undef,
   $proxy_server                  = undef,
 ) {
   assert_private()
 
   if $proxy_type and $proxy_server {
     $env = ['HOME=/root', "${proxy_type}_proxy=${proxy_server}"]
   } else {
     $env = ['HOME=/root']
   }
 
   exec { 'update composer':
     # touch binary when an update is attempted to update its mtime for idempotency when no update is available
     command     => "${path} --no-interaction --quiet self-update --${channel}; touch ${path}",
     environment => $env,
     onlyif      => "test `find '${path}' -mtime +${max_age}`",
     path        => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin'],
-    require     => [File[$path], Class['::php::cli']],
+    require     => [File[$path], Class['php::cli']],
   }
 }
diff --git a/manifests/dev.pp b/manifests/dev.pp
index 3beb3f8..383a9b8 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -1,42 +1,42 @@
 # Install the development package with headers for PHP
 #
 # === Parameters
 #
 # [*ensure*]
 #   The PHP ensure of PHP dev to install
 #
 # [*package*]
 #   The package name for the PHP development files
 #
 class php::dev (
   String $ensure        = $php::ensure,
   String $package       = "${php::package_prefix}${php::params::dev_package_suffix}",
   Boolean $manage_repos = $php::manage_repos,
 ) inherits php::params {
   assert_private()
 
   # On FreeBSD there is no 'devel' package.
   $real_package = $facts['os']['family'] ? {
     'FreeBSD' => [],
     default   => $package,
   }
 
   if $facts['os']['family'] == 'Debian' {
     # we can set the dependency only if we manage repos
     $require = $manage_repos ? {
-      true  => Class['::apt::update'],
+      true  => Class['apt::update'],
       false => undef,
     }
   } else {
     $require = undef
   }
 
   # Default PHP come with xml module and no seperate package for it
   if $facts['os']['name'] == 'Ubuntu' {
     ensure_packages(["${php::package_prefix}xml"], { ensure  => present, require => $require, })
   }
   package { $real_package:
     ensure  => $ensure,
     require => Class['php::packages'],
   }
 }
diff --git a/manifests/extension/install.pp b/manifests/extension/install.pp
index d7ddba0..9f8f8ae 100644
--- a/manifests/extension/install.pp
+++ b/manifests/extension/install.pp
@@ -1,99 +1,99 @@
 # Install a PHP extension package
 #
 # === Parameters
 #
 # [*ensure*]
 #   The ensure of the package to install
 #   Could be "latest", "installed" or a pinned version
 #
 # [*package_prefix*]
 #   Prefix to prepend to the package name for the package provider
 #
 # [*package_name*]
 #   Full package name for the package provider (e.g. php7.2-xml for
 #   simlexml extension)
 #
 # [*provider*]
 #   The provider used to install the package
 #   Could be "pecl", "apt", "dpkg" or any other OS package provider
 #   If set to "none", no package will be installed
 #
 # [*source*]
 #   The source to install the extension from. Possible values
 #   depend on the *provider* used
 #
 # [*header_packages*]
 #   System packages dependencies to install for extensions (e.g. for
 #   memcached libmemcached-dev on Debian)
 #
 # [*compiler_packages*]
 #   System packages dependencies to install for compiling extensions
 #   (e.g. build-essential on Debian)
 #
 # [*responsefile*]
 #   File containing answers for interactive extension setup. Supported
 #   *providers*: pear, pecl.
 #
 # [*install_options*]
 #   Array of String or Hash options to pass to the provider.
 #
 define php::extension::install (
   String           $ensure                          = 'installed',
   Optional[Php::Provider] $provider                 = undef,
   Optional[String] $source                          = undef,
   String           $package_prefix                  = $php::package_prefix,
   Optional[String[1]] $package_name                 = undef,
   Optional[Stdlib::AbsolutePath] $responsefile      = undef,
   Variant[String, Array[String]] $header_packages   = [],
   Variant[String, Array[String]] $compiler_packages = $php::params::compiler_packages,
   Php::InstallOptions $install_options              = undef,
 ) {
   if ! defined(Class['php']) {
     warning('php::extension::install is private')
   }
 
   case $provider {
     /pecl|pear/: {
       $real_package = $title
 
       unless empty($header_packages) {
         ensure_resource('package', $header_packages)
         Package[$header_packages] -> Package[$real_package]
       }
       unless empty($compiler_packages) {
         ensure_resource('package', $compiler_packages)
         Package[$compiler_packages] -> Package[$real_package]
       }
 
       $package_require      = [
-        Class['::php::pear'],
-        Class['::php::dev'],
+        Class['php::pear'],
+        Class['php::dev'],
       ]
     }
 
     'none' : {
       debug("No package installed for php::extension: `${title}`.")
     }
 
     default: {
       $real_package = $package_name ? {
         undef   => "${package_prefix}${title}",
         default => $package_name,
       }
       $package_require = undef
     }
   }
 
   unless $provider == 'none' {
     if ! defined(Package[$real_package]) {
       package { $real_package:
         ensure          => $ensure,
         provider        => $provider,
         source          => $source,
         responsefile    => $responsefile,
         install_options => $install_options,
         require         => $package_require,
       }
     }
   }
 }
diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp
index d97337c..67ac575 100644
--- a/manifests/fpm/pool.pp
+++ b/manifests/fpm/pool.pp
@@ -1,206 +1,206 @@
 # Configure fpm pools
 #
 # === Parameters
 #
 # See the official php-fpm documentation for parameters that are not
 # documented here: http://php.net/manual/en/install.fpm.configuration.php.
 #
 # [*ensure*]
 #   Remove pool if set to `'absent'`, add otherwise
 #
 # [*listen*]
 #   On what socket to listen for FastCGI connections, i.e.
 #   `'127.0.0.1:9000'' or `'/var/run/php5-fpm.sock'`
 #
 # [*listen_backlog*]
 #
 # [*listen_allowed_clients*]
 #
 # [*listen_owner*]
 #   Set owner of the Unix socket
 #
 # [*listen_group*]
 #   Set the group of the Unix socket
 #
 # [*listen_mode*]
 #
 # [*user*]
 #   The user that php-fpm should run as
 #
 # [*group*]
 #   The group that php-fpm should run as
 #
 # [*apparmor_hat*]
 #   The Apparmor hat to use
 #
 # [*pm*]
 #
 # [*pm_max_children*]
 #
 # [*pm_start_servers*]
 #
 # [*pm_min_spare_servers*]
 #
 # [*pm_max_spare_servers*]
 #
 # [*pm_max_requests*]
 #
 # [*pm_process_idle_timeout*]
 #
 # [*pm_status_path*]
 #
 # [*ping_path*]
 #
 # [*ping_response*]
 #
 # [*access_log*]
 #   The path to the file to write access log requests to
 #
 # [*access_log_format*]
 #   The format to save the access log entries as
 #
 # [*request_terminate_timeout*]
 #
 # [*request_slowlog_timeout*]
 #
 # [*security_limit_extensions*]
 #
 # [*slowlog*]
 #
 # [*template*]
 #   The template to use for the pool
 #
 # [*rlimit_files*]
 #
 # [*rlimit_core*]
 #
 # [*chroot*]
 #
 # [*chdir*]
 #
 # [*catch_workers_output*]
 #
 # [*include*]
 #   Other configuration files to include on this pool
 #
 # [*env*]
 #   List of environment variables that are passed to the php-fpm from the
 #   outside and will be available to php scripts in this pool
 #
 # [*env_value*]
 #   Hash of environment variables and values as strings to use in php
 #   scripts in this pool
 #
 # [*clear_env*]
 #   Whether the environment should be cleared.
 #
 # [*options*]
 #   An optional hash for any other data.
 #
 # [*php_value*]
 #   Hash of php_value directives
 #
 # [*php_flag*]
 #   Hash of php_flag directives
 #
 # [*php_admin_value*]
 #   Hash of php_admin_value directives
 #
 # [*php_admin_flag*]
 #   Hash of php_admin_flag directives
 #
 # [*php_directives*]
 #   List of custom directives that are appended to the pool config
 #
 # [*root_group*]
 #   UNIX group of the root user
 #
 # [*base_dir*]
 #   The folder that contains the php-fpm pool configs. This defaults to a
 #   sensible default depending on your operating system, like
 #   '/etc/php5/fpm/pool.d' or '/etc/php-fpm.d'
 #
 define php::fpm::pool (
   $ensure                                  = 'present',
   $listen                                  = '127.0.0.1:9000',
   $listen_backlog                          = '-1',
   $listen_allowed_clients                  = undef,
   $listen_owner                            = undef,
   $listen_group                            = undef,
   $listen_mode                             = undef,
   $user                                    = $php::fpm::config::user,
   $group                                   = $php::fpm::config::group,
   Optional[String[1]] $apparmor_hat        = undef,
   $pm                                      = 'dynamic',
   $pm_max_children                         = '50',
   $pm_start_servers                        = '5',
   $pm_min_spare_servers                    = '5',
   $pm_max_spare_servers                    = '35',
   $pm_max_requests                         = '0',
   $pm_process_idle_timeout                 = '10s',
   $pm_status_path                          = undef,
   $ping_path                               = undef,
   $ping_response                           = 'pong',
   $access_log                              = undef,
   $access_log_format                       = '"%R - %u %t \"%m %r\" %s"',
   $request_terminate_timeout               = '0',
   $request_slowlog_timeout                 = '0',
   $security_limit_extensions               = undef,
   $slowlog                                 = "/var/log/php-fpm/${name}-slow.log",
   $template                                = 'php/fpm/pool.conf.erb',
   $rlimit_files                            = undef,
   $rlimit_core                             = undef,
   $chroot                                  = undef,
   $chdir                                   = undef,
   $catch_workers_output                    = 'no',
   $include                                 = undef,
   $env                                     = [],
   $env_value                               = {},
   $clear_env                               = true,
   $options                                 = {},
   $php_value                               = {},
   $php_flag                                = {},
   $php_admin_value                         = {},
   $php_admin_flag                          = {},
   $php_directives                          = [],
   $root_group                              = $php::params::root_group,
   Optional[Stdlib::Absolutepath] $base_dir = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['php']) {
     warning('You must include the php base class before using any php defined resources')
   }
 
   $pool = $title
 
   # Hack-ish to default to user for group too
   $group_final = $group ? {
     undef   => $user,
     default => $group
   }
 
   # On FreeBSD fpm is not a separate package, but included in the 'php' package.
   # Implies that the option SET+=FPM was set when building the port.
   $real_package = $facts['os']['name'] ? {
     'FreeBSD' => [],
     default   => $php::fpm::package,
   }
 
   $pool_base_dir = pick_default($base_dir, $php::fpm::config::pool_base_dir, $php::params::fpm_pool_dir)
   if ($ensure == 'absent') {
     file { "${pool_base_dir}/${pool}.conf":
       ensure => absent,
-      notify => Class['::php::fpm::service'],
+      notify => Class['php::fpm::service'],
     }
   } else {
     file { "${pool_base_dir}/${pool}.conf":
       ensure  => file,
-      notify  => Class['::php::fpm::service'],
+      notify  => Class['php::fpm::service'],
       require => Package[$real_package],
       content => template($template),
       owner   => root,
       group   => $root_group,
       mode    => '0640',
     }
   }
 }
diff --git a/manifests/global.pp b/manifests/global.pp
index 5ccdbde..41d27db 100644
--- a/manifests/global.pp
+++ b/manifests/global.pp
@@ -1,27 +1,27 @@
 # Install and configure mod_php for fpm
 #
 # === Parameters
 #
 # [*inifile*]
 #   Absolute path to the global php.ini file. Defaults
 #   to the OS specific default location as defined in params.
 # [*settings*]
 #   Hash of settings to apply to the global php.ini file.
 #   Defaults to OS specific defaults (i.e. add nothing)
 #
 
 #
 class php::global (
   Stdlib::Absolutepath $inifile = $php::config_root_inifile,
   Hash $settings                = {}
-) inherits ::php {
+) inherits php {
   assert_private()
 
   # No deep merging required since the settings we have are the global settings.
   $real_settings = $settings
 
   php::config { 'global':
     file   => $inifile,
     config => $real_settings,
   }
 }
diff --git a/manifests/packages.pp b/manifests/packages.pp
index 86bcafa..2cc0f2e 100644
--- a/manifests/packages.pp
+++ b/manifests/packages.pp
@@ -1,37 +1,37 @@
 # Install common PHP packages
 #
 # === Parameters
 #
 # [*ensure*]
 #   Specify which version of PHP packages to install
 #
 # [*names*]
 #   List of the names of the package to install
 #
 # [*names_to_prefix*]
 #   List of packages names that should be prefixed with the common
 #   package prefix `$php::package_prefix`
 #
 class php::packages (
   String $ensure         = $php::ensure,
   Boolean $manage_repos  = $php::manage_repos,
   Array $names_to_prefix = prefix($php::params::common_package_suffixes, $php::package_prefix),
   Array $names           = $php::params::common_package_names,
 ) inherits php::params {
   assert_private()
 
   $real_names = union($names, $names_to_prefix)
   if $facts['os']['family'] == 'Debian' {
     if $manage_repos {
       include apt
-      Class['::apt::update'] -> Package[$real_names]
+      Class['apt::update'] -> Package[$real_names]
     }
     package { $real_names:
       ensure => $ensure,
     }
   } else {
     package { $real_names:
       ensure => $ensure,
     }
   }
 }
diff --git a/manifests/pear.pp b/manifests/pear.pp
index 556ac5c..45f03d4 100644
--- a/manifests/pear.pp
+++ b/manifests/pear.pp
@@ -1,62 +1,62 @@
 # Install PEAR package manager
 #
 # === Parameters
 #
 # [*ensure*]
 #   The package ensure of PHP pear to install and run pear auto_discover
 #
 # [*package*]
 #   The package name for PHP pear
 #
 class php::pear (
   String $ensure            = $php::pear_ensure,
   Optional[String] $package = undef,
   Boolean $manage_repos     = $php::manage_repos,
 ) inherits php::params {
   assert_private()
 
   # Defaults for the pear package name
   if $package {
     $package_name = $package
   } else {
     if $facts['os']['name'] == 'Amazon' {
       # On Amazon Linux the package name is also just 'php-pear'.
       # This would normally not be problematic but if you specify a
       # package_prefix other than 'php' then it will fail.
       $package_name = "php-${php::params::pear_package_suffix}"
     }
     else {
       case $facts['os']['family'] {
         'Debian': {
           # Debian is a litte stupid: The pear package is called 'php-pear'
           # even though others are called 'php5-fpm' or 'php5-dev'
           $package_name = "php-${php::params::pear_package_suffix}"
         }
         default: {
           # This is the default for all other architectures
           $package_name = "${php::package_prefix}${php::params::pear_package_suffix}"
         }
       }
     }
   }
 
   # the apt module provides apt::update. apt is only included if we manage any repos
   $require = $manage_repos ? {
-    true  => Class['::apt::update'],
+    true  => Class['apt::update'],
     false => undef,
   }
   # Default PHP come with xml module and no seperate package for it
   if $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '16.04') >= 0 {
     ensure_packages(["${php::package_prefix}xml"], { ensure  => present, require => $require, })
 
     package { $package_name:
       ensure  => $ensure,
       require => [$require,Class['php::cli'],Package["${php::package_prefix}xml"]],
     }
   } else {
     package { $package_name:
       ensure  => $ensure,
       require => Class['php::cli'],
     }
   }
 }
diff --git a/spec/acceptance/nodesets/archlinux-2-x64.yml b/spec/acceptance/nodesets/archlinux-2-x64.yml
deleted file mode 100644
index 89b6300..0000000
--- a/spec/acceptance/nodesets/archlinux-2-x64.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# This file is managed via modulesync
-# https://github.com/voxpupuli/modulesync
-# https://github.com/voxpupuli/modulesync_config
-HOSTS:
-  archlinux-2-x64:
-    roles:
-      - master
-    platform: archlinux-2-x64
-    box: archlinux/archlinux
-    hypervisor: vagrant
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml b/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml
deleted file mode 100644
index 19dd43e..0000000
--- a/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# This file is managed via modulesync
-# https://github.com/voxpupuli/modulesync
-# https://github.com/voxpupuli/modulesync_config
-#
-# Additional ~/.fog config file with AWS EC2 credentials
-# required.
-#
-# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
-#
-# Amazon Linux is not a RHEL clone.
-#
-HOSTS:
-  amazonlinux-2016091-x64:
-    roles:
-      - master
-    platform: centos-6-x86_64
-    hypervisor: ec2
-    # refers to image_tempaltes.yaml AMI[vmname] entry:
-    vmname: amazonlinux-2016091-eu-central-1
-    # refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
-    snapshot: aio
-    # t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
-    amisize: t2.micro
-    # required so that beaker sanitizes sshd_config and root authorized_keys:
-    user: ec2-user
-CONFIG:
-  type: aio
-  :ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
-...
-# vim: syntax=yaml
diff --git a/spec/acceptance/nodesets/ec2/image_templates.yaml b/spec/acceptance/nodesets/ec2/image_templates.yaml
deleted file mode 100644
index e50593e..0000000
--- a/spec/acceptance/nodesets/ec2/image_templates.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file is managed via modulesync
-# https://github.com/voxpupuli/modulesync
-# https://github.com/voxpupuli/modulesync_config
-#
-# see also: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
-#
-# Hint: image IDs (ami-*) for the same image are different per location.
-#
-AMI:
-  # Amazon Linux AMI 2016.09.1 (HVM), SSD Volume Type
-  amazonlinux-2016091-eu-central-1:
-    :image:
-      :aio: ami-af0fc0c0
-    :region: eu-central-1
-  # Red Hat Enterprise Linux 7.3 (HVM), SSD Volume Type
-  rhel-73-eu-central-1:
-    :image:
-      :aio: ami-e4c63e8b
-    :region: eu-central-1
-  # SUSE Linux Enterprise Server 12 SP2 (HVM), SSD Volume Type
-  sles-12sp2-eu-central-1:
-    :image:
-      :aio: ami-c425e4ab
-    :region: eu-central-1
-  # Ubuntu Server 16.04 LTS (HVM), SSD Volume Type
-  ubuntu-1604-eu-central-1:
-    :image:
-      :aio: ami-fe408091
-    :region: eu-central-1
-  # Microsoft Windows Server 2016 Base
-  windows-2016-base-eu-central-1:
-    :image:
-      :aio: ami-88ec20e7
-    :region: eu-central-1
diff --git a/spec/acceptance/nodesets/ec2/rhel-73-x64.yml b/spec/acceptance/nodesets/ec2/rhel-73-x64.yml
deleted file mode 100644
index 7fac823..0000000
--- a/spec/acceptance/nodesets/ec2/rhel-73-x64.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# This file is managed via modulesync
-# https://github.com/voxpupuli/modulesync
-# https://github.com/voxpupuli/modulesync_config
-#
-# Additional ~/.fog config file with AWS EC2 credentials
-# required.
-#
-# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
-#
-HOSTS:
-  rhel-73-x64:
-    roles:
-      - master
-    platform: el-7-x86_64
-    hypervisor: ec2
-    # refers to image_tempaltes.yaml AMI[vmname] entry:
-    vmname: rhel-73-eu-central-1
-    # refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
-    snapshot: aio
-    # t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
-    amisize: t2.micro
-    # required so that beaker sanitizes sshd_config and root authorized_keys:
-    user: ec2-user
-CONFIG:
-  type: aio
-  :ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
-...
-# vim: syntax=yaml
diff --git a/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml b/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml
deleted file mode 100644
index 8542154..0000000
--- a/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# This file is managed via modulesync
-# https://github.com/voxpupuli/modulesync
-# https://github.com/voxpupuli/modulesync_config
-#
-# Additional ~/.fog config file with AWS EC2 credentials
-# required.
-#
-# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
-#
-HOSTS:
-  sles-12sp2-x64:
-    roles:
-      - master
-    platform: sles-12-x86_64
-    hypervisor: ec2
-    # refers to image_tempaltes.yaml AMI[vmname] entry:
-    vmname: sles-12sp2-eu-central-1
-    # refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
-    snapshot: aio
-    # t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
-    amisize: t2.micro
-    # required so that beaker sanitizes sshd_config and root authorized_keys:
-    user: ec2-user
-CONFIG:
-  type: aio
-  :ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
-...
-# vim: syntax=yaml
diff --git a/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml b/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml
deleted file mode 100644
index 9cf59d5..0000000
--- a/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# This file is managed via modulesync
-# https://github.com/voxpupuli/modulesync
-# https://github.com/voxpupuli/modulesync_config
-#
-# Additional ~/.fog config file with AWS EC2 credentials
-# required.
-#
-# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
-#
-HOSTS:
-  ubuntu-1604-x64:
-    roles:
-      - master
-    platform: ubuntu-16.04-amd64
-    hypervisor: ec2
-    # refers to image_tempaltes.yaml AMI[vmname] entry:
-    vmname: ubuntu-1604-eu-central-1
-    # refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
-    snapshot: aio
-    # t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
-    amisize: t2.micro
-    # required so that beaker sanitizes sshd_config and root authorized_keys:
-    user: ubuntu
-CONFIG:
-  type: aio
-  :ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
-...
-# vim: syntax=yaml
diff --git a/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml b/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml
deleted file mode 100644
index 0932e29..0000000
--- a/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# This file is managed via modulesync
-# https://github.com/voxpupuli/modulesync
-# https://github.com/voxpupuli/modulesync_config
-#
-# Additional ~/.fog config file with AWS EC2 credentials
-# required.
-#
-# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
-#
-HOSTS:
-  windows-2016-base-x64:
-    roles:
-      - master
-    platform: windows-2016-64
-    hypervisor: ec2
-    # refers to image_tempaltes.yaml AMI[vmname] entry:
-    vmname: windows-2016-base-eu-central-1
-    # refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
-    snapshot: aio
-    # t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
-    amisize: t2.micro
-    # required so that beaker sanitizes sshd_config and root authorized_keys:
-    user: ec2-user
-CONFIG:
-  type: aio
-  :ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
-...
-# vim: syntax=yaml
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b2b2704..d266f6b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,18 +1,18 @@
 # This file is managed via modulesync
 # https://github.com/voxpupuli/modulesync
 # https://github.com/voxpupuli/modulesync_config
 
 # puppetlabs_spec_helper will set up coverage if the env variable is set.
 # We want to do this if lib exists and it hasn't been explicitly set.
 ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../../lib', __FILE__))
 
 require 'voxpupuli/test/spec_helper'
 
 if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
-  facts = YAML.load(File.read(File.join(__dir__, 'default_module_facts.yml')))
+  facts = YAML.safe_load(File.read(File.join(__dir__, 'default_module_facts.yml')))
   if facts
     facts.each do |name, value|
       add_custom_fact name.to_sym, value
     end
   end
 end