diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
new file mode 100644
index 0000000..c25a80d
--- /dev/null
+++ b/.github/workflows/auto_release.yml
@@ -0,0 +1,90 @@
+name: "Auto release"
+
+on:
+  workflow_dispatch:
+
+env:
+  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6 
+  HONEYCOMB_DATASET: litmus tests
+  CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  auto_release:
+    name: "Automatic release prep"
+    runs-on: ubuntu-20.04
+
+    steps:
+    - name: "Honeycomb: Start recording"
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+
+    - name: "Honeycomb: start first step"
+      run: |
+        echo STEP_ID="auto-release" >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: "Checkout Source"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        persist-credentials: false
+
+    - name: "PDK Release prep"
+      uses: docker://puppet/iac_release:ci
+      with:
+        args: 'release prep --force'
+      env:
+        CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: "Get Version"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      id: gv
+      run: |
+        echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
+
+    - name: "Check if a release is necessary"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      id: check
+      run: |
+        git diff --quiet CHANGELOG.md && echo "::set-output name=release::false" || echo "::set-output name=release::true"
+
+    - name: "Commit changes"
+      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
+      run: |
+        git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
+        git config --local user.name "GitHub Action"
+        git add .
+        git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
+
+    - name: Create Pull Request
+      id: cpr
+      uses: puppetlabs/peter-evans-create-pull-request@v3
+      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
+        branch: "release-prep"
+        delete-branch: true
+        title: "Release prep v${{ steps.gv.outputs.ver }}"
+        body: |
+          Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}. 
+          Please verify before merging:
+          - [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
+          - [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
+          - [ ] Ensure the [changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) version and [metadata](https://github.com/${{ github.repository }}/blob/release-prep/metadata.json) version match
+        labels: "maintenance"
+
+    - name: PR outputs
+      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
+      run: |
+        echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+        echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
+    - name: "Honeycomb: Record finish step"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Finished auto release workflow'
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
new file mode 100644
index 0000000..865578c
--- /dev/null
+++ b/.github/workflows/nightly.yml
@@ -0,0 +1,204 @@
+name: "nightly"
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+env:
+  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+  HONEYCOMB_DATASET: litmus tests
+
+jobs:
+  setup_matrix:
+    name: "Setup Test Matrix"
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.get-matrix.outputs.matrix }}
+
+    steps:
+    - name: "Honeycomb: Start recording"
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+
+    - name: "Honeycomb: Start first step"
+      run: |
+        echo STEP_ID=setup-environment >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: Checkout Source
+      uses: actions/checkout@v2
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+
+    - name: Activate Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      with:
+        ruby-version: "2.7"
+        bundler-cache: true
+
+    - name: Print bundle environment
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
+
+    - name: "Honeycomb: Record Setup Environment time"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: Setup Acceptance Test Matrix
+      id: get-matrix
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
+        else
+          echo  "::set-output name=matrix::{}"
+        fi
+
+    - name: "Honeycomb: Record Setup Test Matrix time"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
+
+  Acceptance:
+    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
+    needs:
+      - setup_matrix
+
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
+
+    env:
+      BUILDEVENT_FILE: '../buildevents.txt'
+
+    steps:
+    - run: |
+        echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
+        echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
+        echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
+
+
+    - name: "Honeycomb: Start recording"
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+        matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
+
+    - name: "Honeycomb: start first step"
+      run: |
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: Checkout Source
+      uses: actions/checkout@v2
+
+    - name: Activate Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "2.7"
+        bundler-cache: true
+
+    - name: Print bundle environment
+      run: |
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
+
+    - name: "Honeycomb: Record Setup Environment time"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: Provision test environment
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
+        echo ::group::=== REQUEST ===
+        cat request.json || true
+        echo
+        echo ::endgroup::
+        echo ::group::=== INVENTORY ===
+        if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
+        then
+          FILE='spec/fixtures/litmus_inventory.yaml'
+        elif [ -f 'inventory.yaml' ];
+        then
+          FILE='inventory.yaml'
+        fi
+        sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
+        echo ::endgroup::
+
+    - name: Install agent
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+
+    - name: Install module
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
+
+    - name: "Honeycomb: Record deployment times"
+      if: ${{ always() }}
+      run: |
+        echo ::group::honeycomb step
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+        echo ::endgroup::
+
+    - name: Run acceptance tests
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
+
+    - name: "Honeycomb: Record acceptance testing times"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: Remove test environment
+      if: ${{ always() }}
+      continue-on-error: true
+      run: |
+        if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
+          buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
+          echo ::group::=== REQUEST ===
+          cat request.json || true
+          echo
+          echo ::endgroup::
+        fi
+
+    - name: "Honeycomb: Record removal times"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
+
+  slack-workflow-status:
+    if: always()
+    name: Post Workflow Status To Slack
+    needs:
+      - Acceptance
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Slack Workflow Notification
+        uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
+        with:
+          # Required Input
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
+          # Optional Input
+          channel: '#team-ia-bots'
+          name: 'GABot'
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
new file mode 100644
index 0000000..e37a153
--- /dev/null
+++ b/.github/workflows/pr_test.yml
@@ -0,0 +1,189 @@
+name: "PR Testing"
+
+on: [pull_request]
+
+env:
+  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+  HONEYCOMB_DATASET: litmus tests
+
+jobs:
+  setup_matrix:
+    name: "Setup Test Matrix"
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.get-matrix.outputs.matrix }}
+
+    steps:
+    - name: "Honeycomb: Start recording"
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+
+    - name: "Honeycomb: Start first step"
+      run: |
+        echo STEP_ID=setup-environment >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: Checkout Source
+      uses: actions/checkout@v2
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+
+    - name: Activate Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      with:
+        ruby-version: "2.7"
+        bundler-cache: true
+
+    - name: Print bundle environment
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
+
+    - name: "Honeycomb: Record Setup Environment time"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: Run validation steps
+      run: |
+        bundle exec rake validate
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+
+    - name: Setup Acceptance Test Matrix
+      id: get-matrix
+      run: |
+        if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
+        else
+          echo  "::set-output name=matrix::{}"
+        fi
+
+    - name: "Honeycomb: Record Setup Test Matrix time"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
+
+  Acceptance:
+    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
+    needs:
+      - setup_matrix
+    if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
+
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
+
+    env:
+      BUILDEVENT_FILE: '../buildevents.txt'
+
+    steps:
+    - run: |
+        echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
+        echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
+        echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
+
+    - name: "Honeycomb: Start recording"
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+        matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
+
+    - name: "Honeycomb: start first step"
+      run: |
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: Checkout Source
+      uses: actions/checkout@v2
+
+    - name: Activate Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "2.7"
+        bundler-cache: true
+
+    - name: Print bundle environment
+      run: |
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
+
+    - name: "Honeycomb: Record Setup Environment time"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: Provision test environment
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
+        echo ::group::=== REQUEST ===
+        cat request.json || true
+        echo
+        echo ::endgroup::
+        echo ::group::=== INVENTORY ===
+        if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
+        then
+          FILE='spec/fixtures/litmus_inventory.yaml'
+        elif [ -f 'inventory.yaml' ];
+        then
+          FILE='inventory.yaml'
+        fi
+        sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
+        echo ::endgroup::
+
+    - name: Install agent
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+
+    - name: Install module
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
+
+    - name: "Honeycomb: Record deployment times"
+      if: ${{ always() }}
+      run: |
+        echo ::group::honeycomb step
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+        echo ::endgroup::
+
+    - name: Run acceptance tests
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
+
+    - name: "Honeycomb: Record acceptance testing times"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+    - name: Remove test environment
+      if: ${{ always() }}
+      continue-on-error: true
+      run: |
+        if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
+          buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
+          echo ::group::=== REQUEST ===
+          cat request.json || true
+          echo
+          echo ::endgroup::
+        fi
+
+    - name: "Honeycomb: Record removal times"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..1509f6e
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,47 @@
+name: "Publish module"
+
+on:
+  workflow_dispatch:
+  
+jobs:
+  create-github-release:
+    name: Deploy GitHub Release
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.ref }}
+          clean: true
+          fetch-depth: 0
+      - name: Get Version
+        id: gv
+        run: |
+          echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
+      - name: Create Release
+        uses: actions/create-release@v1
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: "v${{ steps.gv.outputs.ver }}"
+          draft: false
+          prerelease: false
+
+  deploy-forge:
+    name: Deploy to Forge
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.ref }}
+          clean: true
+      - name: "PDK Build"
+        uses: docker://puppet/pdk:nightly
+        with:
+          args: 'build'
+      - name: "Push to Forge"
+        uses: docker://puppet/pdk:nightly
+        with:
+          args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
new file mode 100644
index 0000000..7da4f3d
--- /dev/null
+++ b/.github/workflows/spec.yml
@@ -0,0 +1,130 @@
+name: "Spec Tests"
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+  pull_request:
+
+env:
+  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+  HONEYCOMB_DATASET: litmus tests
+
+jobs:
+  setup_matrix:
+    name: "Setup Test Matrix"
+    runs-on: ubuntu-20.04
+    outputs:
+      spec_matrix: ${{ steps.get-matrix.outputs.spec_matrix }}
+
+    steps:
+      - name: "Honeycomb: Start recording"
+        uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+        with:
+          apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+          dataset: ${{ env.HONEYCOMB_DATASET }}
+          job-status: ${{ job.status }}
+
+      - name: "Honeycomb: Start first step"
+        run: |
+          echo STEP_ID=setup-environment >> $GITHUB_ENV
+          echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+      - name: Checkout Source
+        uses: actions/checkout@v2
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+
+      - name: Activate Ruby 2.7
+        uses: ruby/setup-ruby@v1
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        with:
+          ruby-version: "2.7"
+          bundler-cache: true
+
+      - name: Print bundle environment
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          echo ::group::bundler environment
+          buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+          echo ::endgroup::
+
+      - name: "Honeycomb: Record Setup Environment time"
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+          echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+          echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+      - name: Run Static & Syntax Tests
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+
+      - name: Setup Spec Test Matrix
+        id: get-matrix
+        run: |
+          if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
+            buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
+          else
+            echo  "::set-output name=spec_matrix::{}"
+          fi
+
+      - name: "Honeycomb: Record Setup Test Matrix time"
+        if: ${{ always() }}
+        run: |
+          buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
+
+  Spec:
+    name: "Spec Tests (Puppet: ${{matrix.puppet_version}}, Ruby Ver: ${{matrix.ruby_version}})"
+    needs:
+      - setup_matrix
+    if: ${{ needs.setup_matrix.outputs.spec_matrix != '{}' }}
+
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.setup_matrix.outputs.spec_matrix)}}
+
+    env:
+      BUILDEVENT_FILE: '../buildevents.txt'
+      PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
+      FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'
+
+    steps:
+      - run: |
+          echo "SANITIZED_PUPPET_VERSION=$(echo '${{ matrix.puppet_version }}' | sed 's/~> //g')" >> $GITHUB_ENV
+
+      - run: |
+          echo 'puppet_version=${{ env.SANITIZED_PUPPET_VERSION }}' >> $BUILDEVENT_FILE
+
+      - name: "Honeycomb: Start first step"
+        run: |
+          echo "STEP_ID=${{ env.SANITIZED_PUPPET_VERSION }}-spec" >> $GITHUB_ENV
+          echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+      - name: "Honeycomb: Start recording"
+        uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+        with:
+          apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+          dataset: ${{ env.HONEYCOMB_DATASET }}
+          job-status: ${{ job.status }}
+          matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
+
+      - name: Checkout Source
+        uses: actions/checkout@v2
+
+      - name: "Activate Ruby ${{ matrix.ruby_version }}"
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby_version}}
+          bundler-cache: true
+
+      - name: Print bundle environment
+        run: |
+          echo ::group::bundler environment
+          buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+          echo ::endgroup::
+
+      - name: Run parallel_spec tests
+        run: |
+          buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 0000000..0814c5e
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,18 @@
+FROM gitpod/workspace-full
+RUN sudo wget https://apt.puppet.com/puppet-tools-release-bionic.deb && \
+    wget https://apt.puppetlabs.com/puppet6-release-bionic.deb && \
+    sudo dpkg -i puppet6-release-bionic.deb && \
+    sudo dpkg -i puppet-tools-release-bionic.deb && \
+    sudo apt-get update && \
+    sudo apt-get install -y pdk zsh puppet-agent && \
+    sudo apt-get clean && \
+    sudo rm -rf /var/lib/apt/lists/*
+RUN sudo usermod -s $(which zsh) gitpod && \
+    sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \
+    echo "plugins=(git gitignore github gem pip bundler python ruby docker docker-compose)" >> /home/gitpod/.zshrc && \
+    echo 'PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin"'  >> /home/gitpod/.zshrc && \
+    sudo /opt/puppetlabs/puppet/bin/gem install puppet-debugger hub -N && \
+    mkdir -p /home/gitpod/.config/puppet && \
+    /opt/puppetlabs/puppet/bin/ruby -r yaml -e "puts ({'disabled' => true}).to_yaml" > /home/gitpod/.config/puppet/analytics.yml
+RUN rm -f puppet6-release-bionic.deb  puppet-tools-release-bionic.deb
+ENTRYPOINT /usr/bin/zsh
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 0000000..9d89d9f
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,9 @@
+image:
+  file: .gitpod.Dockerfile
+
+tasks:
+  - init: pdk bundle install
+
+vscode:
+  extensions:
+    - puppet.puppet-vscode@1.2.0:f5iEPbmOj6FoFTOV6q8LTg==
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 0000000..23d36fa
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,2 @@
+GetText/DecorateString:
+  Enabled: false
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f830d38..895fc12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,232 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v8.3.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v8.3.0) (2021-10-04)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v8.2.0...v8.3.0)
+
+### Added
+
+- \(MODULES-11173\) Add per-host overrides for apt::proxy [\#1007](https://github.com/puppetlabs/puppetlabs-apt/pull/1007) ([maturnbull](https://github.com/maturnbull))
+
+### Fixed
+
+- pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#1008](https://github.com/puppetlabs/puppetlabs-apt/pull/1008) ([david22swan](https://github.com/david22swan))
+
+## [v8.2.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v8.2.0) (2021-08-25)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v8.1.0...v8.2.0)
+
+### Added
+
+- \(maint\) Add support for Debian 11 [\#1001](https://github.com/puppetlabs/puppetlabs-apt/pull/1001) ([smortex](https://github.com/smortex))
+
+### Fixed
+
+- \(main\) Allow stdlib 8.0.0 [\#1000](https://github.com/puppetlabs/puppetlabs-apt/pull/1000) ([smortex](https://github.com/smortex))
+
+## [v8.1.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v8.1.0) (2021-07-26)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v8.0.2...v8.1.0)
+
+### Added
+
+- \[MODULES-9695\] - Add support for signed-by in source entries [\#991](https://github.com/puppetlabs/puppetlabs-apt/pull/991) ([johanfleury](https://github.com/johanfleury))
+
+### Fixed
+
+- apt::source: pass the weak\_ssl param to apt::key [\#993](https://github.com/puppetlabs/puppetlabs-apt/pull/993) ([kenyon](https://github.com/kenyon))
+- \(IAC-1597\) Increasing MAX\_RETRY\_COUNT [\#987](https://github.com/puppetlabs/puppetlabs-apt/pull/987) ([pmcmaw](https://github.com/pmcmaw))
+
+## [v8.0.2](https://github.com/puppetlabs/puppetlabs-apt/tree/v8.0.2) (2021-03-29)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v8.0.1...v8.0.2)
+
+### Fixed
+
+- \(MODULES-10971\) - Ensure `apt::keyserver` is considered when creating a default apt:source [\#981](https://github.com/puppetlabs/puppetlabs-apt/pull/981) ([david22swan](https://github.com/david22swan))
+- \(IAC-1497\) - Removal of unsupported `translate` dependency [\#979](https://github.com/puppetlabs/puppetlabs-apt/pull/979) ([david22swan](https://github.com/david22swan))
+
+## [v8.0.1](https://github.com/puppetlabs/puppetlabs-apt/tree/v8.0.1) (2021-03-15)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v8.0.0...v8.0.1)
+
+### Fixed
+
+- MODULES-10956 remove redundant code in provider apt\_key [\#973](https://github.com/puppetlabs/puppetlabs-apt/pull/973) ([moritz-makandra](https://github.com/moritz-makandra))
+
+## [v8.0.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v8.0.0) (2021-03-01)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.7.1...v8.0.0)
+
+### Changed
+
+- pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [\#969](https://github.com/puppetlabs/puppetlabs-apt/pull/969) ([carabasdaniel](https://github.com/carabasdaniel))
+
+## [v7.7.1](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.7.1) (2021-02-15)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.7.0...v7.7.1)
+
+### Fixed
+
+- Use modern os facts [\#964](https://github.com/puppetlabs/puppetlabs-apt/pull/964) ([kenyon](https://github.com/kenyon))
+
+## [v7.7.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.7.0) (2020-12-08)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.6.0...v7.7.0)
+
+### Added
+
+- pdksync - \(feat\) - Add support for Puppet 7 [\#958](https://github.com/puppetlabs/puppetlabs-apt/pull/958) ([daianamezdrea](https://github.com/daianamezdrea))
+- Make auth.conf contents Sensitive [\#953](https://github.com/puppetlabs/puppetlabs-apt/pull/953) ([suchpuppet](https://github.com/suchpuppet))
+
+## [v7.6.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.6.0) (2020-09-15)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.5.0...v7.6.0)
+
+### Added
+
+- \(MODULES-10804\) option to force purge source.lists file [\#948](https://github.com/puppetlabs/puppetlabs-apt/pull/948) ([sheenaajay](https://github.com/sheenaajay))
+
+### Fixed
+
+- \(IAC-978\) - Removal of inappropriate terminology [\#947](https://github.com/puppetlabs/puppetlabs-apt/pull/947) ([david22swan](https://github.com/david22swan))
+
+## [v7.5.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.5.0) (2020-08-12)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.4.2...v7.5.0)
+
+### Added
+
+- pdksync - \(IAC-973\) - Update travis/appveyor to run on new default branch main [\#940](https://github.com/puppetlabs/puppetlabs-apt/pull/940) ([david22swan](https://github.com/david22swan))
+- patch-acng-ssl-support [\#938](https://github.com/puppetlabs/puppetlabs-apt/pull/938) ([mdklapwijk](https://github.com/mdklapwijk))
+- \(IAC-746\) - Add ubuntu 20.04 support [\#936](https://github.com/puppetlabs/puppetlabs-apt/pull/936) ([david22swan](https://github.com/david22swan))
+
+### Fixed
+
+- \(MODULES-10763\) loglevel won't affect reports [\#942](https://github.com/puppetlabs/puppetlabs-apt/pull/942) ([gguillotte](https://github.com/gguillotte))
+
+## [v7.4.2](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.4.2) (2020-05-14)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.4.1...v7.4.2)
+
+### Fixed
+
+- fix apt-mark syntax [\#927](https://github.com/puppetlabs/puppetlabs-apt/pull/927) ([tryfunc](https://github.com/tryfunc))
+- Do not specify file modes unless relevant [\#923](https://github.com/puppetlabs/puppetlabs-apt/pull/923) ([anarcat](https://github.com/anarcat))
+
+## [v7.4.1](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.4.1) (2020-03-10)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.4.0...v7.4.1)
+
+### Fixed
+
+- \(MODULES-10583\) Revert "MODULES-10548: make files readonly" [\#920](https://github.com/puppetlabs/puppetlabs-apt/pull/920) ([carabasdaniel](https://github.com/carabasdaniel))
+
+## [v7.4.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.4.0) (2020-03-03)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.3.0...v7.4.0)
+
+### Added
+
+- Add 'include' param to apt::backports [\#910](https://github.com/puppetlabs/puppetlabs-apt/pull/910) ([paladox](https://github.com/paladox))
+- pdksync - \(FM-8581\) - Debian 10 added to travis and provision file refactored [\#902](https://github.com/puppetlabs/puppetlabs-apt/pull/902) ([david22swan](https://github.com/david22swan))
+
+### Fixed
+
+- MODULES-10548: make files readonly [\#906](https://github.com/puppetlabs/puppetlabs-apt/pull/906) ([anarcat](https://github.com/anarcat))
+- MODULES-10543: only consider lsbdistcodename for apt-transport-https [\#905](https://github.com/puppetlabs/puppetlabs-apt/pull/905) ([anarcat](https://github.com/anarcat))
+- MODULES-10543: remove sources.list file on purging [\#904](https://github.com/puppetlabs/puppetlabs-apt/pull/904) ([anarcat](https://github.com/anarcat))
+- Include apt in apt::backports [\#891](https://github.com/puppetlabs/puppetlabs-apt/pull/891) ([zivis](https://github.com/zivis))
+
+## [v7.3.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.3.0) (2019-12-11)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.2.0...v7.3.0)
+
+### Added
+
+- Adding a new parameter for dist [\#890](https://github.com/puppetlabs/puppetlabs-apt/pull/890) ([luckyraul](https://github.com/luckyraul))
+
+### Fixed
+
+- MODULES-10063, extend apt::key to support deeplinks, this time with f… [\#894](https://github.com/puppetlabs/puppetlabs-apt/pull/894) ([atarax](https://github.com/atarax))
+- MODULES-10063, extend apt::key to support deeplinks [\#892](https://github.com/puppetlabs/puppetlabs-apt/pull/892) ([atarax](https://github.com/atarax))
+
+## [v7.2.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.2.0) (2019-10-29)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.1.0...v7.2.0)
+
+### Added
+
+- Add apt::mark defined type [\#879](https://github.com/puppetlabs/puppetlabs-apt/pull/879) ([tuxmea](https://github.com/tuxmea))
+- \(FM-8394\) add debian 10 testing [\#876](https://github.com/puppetlabs/puppetlabs-apt/pull/876) ([ThoughtCrhyme](https://github.com/ThoughtCrhyme))
+- Add apt::key\_options for default apt::key options [\#873](https://github.com/puppetlabs/puppetlabs-apt/pull/873) ([raphink](https://github.com/raphink))
+- implement apt.conf.d purging [\#869](https://github.com/puppetlabs/puppetlabs-apt/pull/869) ([lelutin](https://github.com/lelutin))
+
+### Fixed
+
+- Install gnupg instead of dirmngr [\#866](https://github.com/puppetlabs/puppetlabs-apt/pull/866) ([martijndegouw](https://github.com/martijndegouw))
+
+## [v7.1.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.1.0) (2019-07-30)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.0.1...v7.1.0)
+
+### Added
+
+- \(FM-8215\) Convert to using litmus [\#864](https://github.com/puppetlabs/puppetlabs-apt/pull/864) ([florindragos](https://github.com/florindragos))
+
+## [v7.0.1](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.0.1) (2019-05-13)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/7.0.0...v7.0.1)
+
+## [7.0.0](https://github.com/puppetlabs/puppetlabs-apt/tree/7.0.0) (2019-04-24)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/6.3.0...7.0.0)
+
+### Changed
+
+- pdksync - \(MODULES-8444\) - Raise lower Puppet bound [\#853](https://github.com/puppetlabs/puppetlabs-apt/pull/853) ([david22swan](https://github.com/david22swan))
+
+### Added
+
+- Allow weak SSL verification for apt\_key [\#849](https://github.com/puppetlabs/puppetlabs-apt/pull/849) ([tuxmea](https://github.com/tuxmea))
+
+## [6.3.0](https://github.com/puppetlabs/puppetlabs-apt/tree/6.3.0) (2019-01-21)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/6.2.1...6.3.0)
+
+### Added
+
+- Add support for dist-upgrade & autoremove action [\#832](https://github.com/puppetlabs/puppetlabs-apt/pull/832) ([aboks](https://github.com/aboks))
+- \(MODULES-8321\) - Add manage\_auth\_conf parameter [\#831](https://github.com/puppetlabs/puppetlabs-apt/pull/831) ([eimlav](https://github.com/eimlav))
+
+### Fixed
+
+- \(MODULES-8418\) Fix /etc/apt/auth.conf owner changing endlessly [\#836](https://github.com/puppetlabs/puppetlabs-apt/pull/836) ([antaflos](https://github.com/antaflos))
+- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#835](https://github.com/puppetlabs/puppetlabs-apt/pull/835) ([tphoney](https://github.com/tphoney))
+- \(MODULES-8326\) - apt-transport-https not ensured properly [\#830](https://github.com/puppetlabs/puppetlabs-apt/pull/830) ([eimlav](https://github.com/eimlav))
+
+## [6.2.1](https://github.com/puppetlabs/puppetlabs-apt/tree/6.2.1) (2018-11-20)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/6.2.0...6.2.1)
+
+### Fixed
+
+- \(MODULES-8272\) - Revert "Autorequire dirmngr in apt\_key types" [\#825](https://github.com/puppetlabs/puppetlabs-apt/pull/825) ([eimlav](https://github.com/eimlav))
+
+## [6.2.0](https://github.com/puppetlabs/puppetlabs-apt/tree/6.2.0) (2018-11-19)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/6.1.1...6.2.0)
+
+### Added
+
+- \(MODULES-8081\): add support for hkps:// protocol in apt::key [\#815](https://github.com/puppetlabs/puppetlabs-apt/pull/815) ([simondeziel](https://github.com/simondeziel))
+
+### Fixed
+
+- Apt-key fixes to properly work on Debian 9 [\#822](https://github.com/puppetlabs/puppetlabs-apt/pull/822) ([ekohl](https://github.com/ekohl))
+- \(maint\) - Update Link to REFERENCE.md [\#811](https://github.com/puppetlabs/puppetlabs-apt/pull/811) ([pmcmaw](https://github.com/pmcmaw))
+
 ## [6.1.1](https://github.com/puppetlabs/puppetlabs-apt/tree/6.1.1) (2018-10-01)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/6.1.0...6.1.1)
@@ -734,4 +960,4 @@ This release includes Ubuntu 12.10 (Quantal) support for PPAs.
 [4.2.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.1.0...4.2.0
 
 
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..a5d109e
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# Setting ownership to the modules team
+* @puppetlabs/modules
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1a9fb3a..e7a3a7c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,271 +1,3 @@
 # Contributing to Puppet modules
 
-So you want to contribute to a Puppet module: Great! Below are some instructions to get you started doing
-that very thing while setting expectations around code quality as well as a few tips for making the
-process as easy as possible. 
-
-### Table of Contents
-
-1. [Getting Started](#getting-started)
-1. [Commit Checklist](#commit-checklist)
-1. [Submission](#submission)
-1. [More about commits](#more-about-commits)
-1. [Testing](#testing)
-    - [Running Tests](#running-tests)
-    - [Writing Tests](#writing-tests)
-1. [Get Help](#get-help)
-
-## Getting Started
-
-- Fork the module repository on GitHub and clone to your workspace
-
-- Make your changes!
-
-## Commit Checklist
-
-### The Basics
-
-- [x] my commit is a single logical unit of work
-
-- [x] I have checked for unnecessary whitespace with "git diff --check" 
-
-- [x] my commit does not include commented out code or unneeded files
-
-### The Content
-
-- [x] my commit includes tests for the bug I fixed or feature I added
-
-- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality
-    
-- [x] my code passes existing test suites
-
-### The Commit Message
-
-- [x] the first line of my commit message includes:
-
-  - [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" 
-  
-  - [x] a short description (50 characters is the soft limit, excluding ticket number(s))
-
-- [x] the body of my commit message:
-
-  - [x] is meaningful
-
-  - [x] uses the imperative, present tense: "change", not "changed" or "changes"
-
-  - [x] includes motivation for the change, and contrasts its implementation with the previous behavior
-
-## Submission
-
-### Pre-requisites
-
-- Make sure you have a [GitHub account](https://github.com/join)
-
-- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.
-
-### Push and PR
-
-- Push your changes to your fork
-
-- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository in the puppetlabs organization
-
-## More about commits 
-
-  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](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).
-
-      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 JIRA issue.
-
-      If there is a JIRA 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.
-
-# Testing
-
-## Getting Started
-
-Our Puppet modules provide [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages,
-or Gems, are required to build, develop, and test this software.
-
-Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to 
-install all dependencies needed for this project in the project root by running
-
-```shell
-% bundle install --path .bundle/gems
-Fetching gem metadata from https://rubygems.org/........
-Fetching gem metadata from https://rubygems.org/..
-Using rake (10.1.0)
-Using builder (3.2.2)
--- 8><-- many more --><8 --
-Using rspec-system-puppet (2.2.0)
-Using serverspec (0.6.3)
-Using rspec-system-serverspec (1.0.0)
-Using bundler (1.3.5)
-Your bundle is complete!
-Use `bundle show [gemname]` to see where a bundled gem is installed.
-```
-
-NOTE: some systems may require you to run this command with sudo.
-
-If you already have those gems installed, make sure they are up-to-date:
-
-```shell
-% bundle update
-```
-
-## Running Tests
-
-With all dependencies in place and up-to-date, run the tests:
-
-### Unit Tests
-
-```shell
-% bundle exec rake spec
-```
-
-This executes all the [rspec tests](http://rspec-puppet.com/) in the directories defined [here](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/699d9fbca1d2489bff1736bb254bb7b7edb32c74/lib/puppetlabs_spec_helper/rake_tasks.rb#L17) and so on. 
-rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json),
-rspec tests define them in [.fixtures.yml](./fixtures.yml).
-
-### Acceptance Tests
-
-Some Puppet modules also come with acceptance tests, which use [beaker][]. These tests spin up a virtual machine under
-[VirtualBox](https://www.virtualbox.org/), controlled with [Vagrant](http://www.vagrantup.com/), to simulate scripted test
-scenarios. In order to run these, you need both Virtualbox and Vagrant installed on your system.
-
-Run the tests by issuing the following command
-
-```shell
-% bundle exec rake spec_clean
-% bundle exec rspec spec/acceptance
-```
-
-This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
-install Puppet, copy this module, and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
-and then run all the tests under [spec/acceptance](./spec/acceptance).
-
-## Writing Tests
-
-### Unit Tests
-
-When writing unit tests for Puppet, [rspec-puppet][] is your best friend. It provides tons of helper methods for testing your manifests against a 
-catalog (e.g. contain_file, contain_package, with_params, etc). It would be ridiculous to try and top rspec-puppet's [documentation][rspec-puppet_docs] 
-but here's a tiny sample:
-
-Sample manifest:
-
-```puppet
-file { "a test file":
-  ensure => present,
-  path   => "/etc/sample",
-}
-```
-
-Sample test:
-
-```ruby
-it 'does a thing' do
-  expect(subject).to contain_file("a test file").with({:path => "/etc/sample"})
-end
-```
-
-### Acceptance Tests
-
-Writing acceptance tests for Puppet involves [beaker][] and its cousin [beaker-rspec][]. A common pattern for acceptance tests is to create a test manifest, apply it
-twice to check for idempotency or errors, then run expectations.
-
-```ruby
-it 'does an end-to-end thing' do
-  pp = <<-EOF
-    file { 'a test file': 
-      ensure  => present,
-      path    => "/etc/sample",
-      content => "test string",
-    }
-    
-  apply_manifest(pp, :catch_failures => true)
-  apply_manifest(pp, :catch_changes => true)
-  
-end
-
-describe file("/etc/sample") do
-  it { is_expected.to contain "test string" }
-end
-
-```
-
-# If you have commit access to the repository
-
-Even if you have commit access to the repository, you still need to go through the process above, and have someone else review and merge
-in your changes.  The rule is that **all changes must be reviewed by a project developer that did not write the code to ensure that
-all changes go through a code review process.**
-
-The record of someone performing the merge is the record that they performed the code review. Again, this should be someone other than the author of the topic branch.
-
-# Get Help
-
-### On the web
-* [Puppet help messageboard](http://puppet.com/community/get-help)
-* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-
-### On chat
-* Slack (slack.puppet.com) #forge-modules, #puppet-dev, #windows, #voxpupuli
-* IRC (freenode) #puppet-dev, #voxpupuli
-
-
-[rspec-puppet]: http://rspec-puppet.com/
-[rspec-puppet_docs]: http://rspec-puppet.com/documentation/
-[beaker]: https://github.com/puppetlabs/beaker
-[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec
+Check out our [Contributing to Supported Modules Blog Post](https://puppetlabs.github.io/iac/docs/contributing_to_a_module.html) to find all the information that you will need.
diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index d85a609..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,76 +0,0 @@
-source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-
-def location_for(place_or_version, fake_version = nil)
-  git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
-  file_url_regex = %r{\Afile:\/\/(?<path>.*)}
-
-  if place_or_version && (git_url = place_or_version.match(git_url_regex))
-    [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
-  elsif place_or_version && (file_url = place_or_version.match(file_url_regex))
-    ['>= 0', { path: File.expand_path(file_url[:path]), require: false }]
-  else
-    [place_or_version, { require: false }]
-  end
-end
-
-ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
-minor_version = ruby_version_segments[0..1].join('.')
-
-group :development do
-  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 "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
-  gem "json", '<= 2.0.4',                              require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4')
-  gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "github_changelog_generator",                    require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
-  gem "puppet-lint-i18n",                              require: false
-end
-group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
-  gem "puppet-module-win-system-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-end
-
-puppet_version = ENV['PUPPET_GEM_VERSION']
-facter_version = ENV['FACTER_GEM_VERSION']
-hiera_version = ENV['HIERA_GEM_VERSION']
-
-gems = {}
-
-gems['puppet'] = location_for(puppet_version)
-
-# If facter or hiera versions have been specified via the environment
-# variables
-
-gems['facter'] = location_for(facter_version) if facter_version
-gems['hiera'] = location_for(hiera_version) if hiera_version
-
-if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
-  # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
-  # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
-  gems['win32-dir'] =      ['<= 0.4.9', require: false]
-  gems['win32-eventlog'] = ['<= 0.6.5', require: false]
-  gems['win32-process'] =  ['<= 0.7.5', require: false]
-  gems['win32-security'] = ['<= 0.2.5', require: false]
-  gems['win32-service'] =  ['0.8.8', require: false]
-end
-
-gems.each do |gem_name, gem_params|
-  gem gem_name, *gem_params
-end
-
-# Evaluate Gemfile.local and ~/.gemfile if they exist
-extra_gemfiles = [
-  "#{__FILE__}.local",
-  File.join(Dir.home, '.gemfile'),
-]
-
-extra_gemfiles.each do |gemfile|
-  if File.file?(gemfile) && File.readable?(gemfile)
-    eval(File.read(gemfile), binding)
-  end
-end
-# vim: syntax=ruby
diff --git a/README.md b/README.md
index b1ca0ee..c37101f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 
 #### Table of Contents
 
-
 1. [Module Description - What the module does and why it is useful](#module-description)
 1. [Setup - The basics of getting started with apt](#setup)
     * [What apt affects](#what-apt-affects)
@@ -19,24 +18,35 @@
 1. [Limitations - OS compatibility, etc.](#limitations)
 1. [Development - Guide for contributing to the module](#development)
 
+<a id="module-description"></a>
+
 ## Module Description
 
 The apt module lets you use Puppet to manage APT (Advanced Package Tool) sources, keys, and other configuration options.
 
 APT is a package manager available on Debian, Ubuntu, and several other operating systems. The apt module provides a series of classes, defines, types, and facts to help you automate APT package management.
 
-**Note**: For this module to correctly autodetect which version of Debian/Ubuntu (or derivative) you're running, you need to make sure the 'lsb-release' package is installed. We highly recommend you either make this part of your provisioning layer, if you run many Debian or derivative systems, or ensure that you have Facter 2.2.0 or later installed, which will pull this dependency in for you.
+**Note**: Prior to Puppet 7, for this module to correctly autodetect which version of
+Debian/Ubuntu (or derivative) you're running, you need to make sure the `lsb-release` package is
+installed. With Puppet 7 the `lsb-release` package is not needed.
+
+<a id="setup"></a>
 
 ## Setup
 
+<a id="what-apt-affects"></a>
+
 ### What apt affects
 
 * Your system's `preferences` file and `preferences.d` directory
 * Your system's `sources.list` file and `sources.list.d` directory
+* Your system's `apt.conf.d` directory
 * System repositories
 * Authentication keys
 
-**Note:** This module offers `purge` parameters which, if set to `true`, **destroy** any configuration on the node's `sources.list(.d)` and `preferences(.d)` that you haven't declared through Puppet. The default for these parameters is `false`.
+**Note:** This module offers `purge` parameters which, if set to `true`, **destroy** any configuration on the node's `sources.list(.d)`, `preferences(.d)` and `apt.conf.d` that you haven't declared through Puppet. The default for these parameters is `false`.
+
+<a id="beginning-with-apt"></a>
 
 ### Beginning with apt
 
@@ -48,8 +58,12 @@ include apt
 
 **Note:** The main `apt` class is required by all other classes, types, and defined types in this module. You must declare it whenever you use the module.
 
+<a id="usage"></a>
+
 ## Usage
 
+<a id="add-gpg-keys"></a>
+
 ### Add GPG keys
 
 **Warning:** Using short key IDs presents a serious security issue, potentially leaving you open to collision attacks. We recommend you always use full fingerprints to identify your GPG keys. This module allows short keys, but issues a security warning if you use them.
@@ -64,6 +78,8 @@ apt::key { 'puppetlabs':
 }
 ```
 
+<a id="prioritize-backports"></a>
+
 ### Prioritize backports
 
 ```puppet
@@ -76,9 +92,11 @@ By default, the `apt::backports` class drops a pin file for backports, pinning i
 
 If you raise the priority through the `pin` parameter to 500, normal policy goes into effect and Apt installs or upgrades to the newest version. This means that if a package is available from backports, it and its dependencies are pulled in from backports unless you explicitly set the `ensure` attribute of the `package` resource to `installed`/`present` or a specific version.
 
+<a id="update-the-list-of-packages"></a>
+
 ### Update the list of packages
 
-By default, Puppet runs `apt-get update` on the first Puppet run after you include the `apt` class, and anytime `notify  => Exec['apt_update']` occurs; i.e., whenever config files get updated or other relevant changes occur. If you set `update['frequency']` to 'always', the update runs on every Puppet run. You can also set `update['frequency']` to 'daily' or 'weekly':
+By default, Puppet runs `apt-get update` on the first Puppet run after you include the `apt` class, and anytime `notify => Exec['apt_update']` occurs; i.e., whenever config files get updated or other relevant changes occur. If you set `update['frequency']` to 'always', the update runs on every Puppet run. You can also set `update['frequency']` to 'daily' or 'weekly':
 
 ```puppet
 class { 'apt':
@@ -87,7 +105,8 @@ class { 'apt':
   },
 }
 ```
-When `Exec['apt_update']` is triggered, it generates a `Notice` message. Because the default [logging level for agents](https://docs.puppet.com/puppet/latest/configuration.html#loglevel) is `notice`, this causes the repository update to appear in logs and agent reports. Some tools, such as [The Foreman](https://www.theforeman.org), report the update notice as a significant change. To eliminate these updates from reports, set the [loglevel](https://docs.puppet.com/puppet/latest/metaparameter.html#loglevel) metaparameter for `Exec['apt_update']` above the agent logging level:
+
+When `Exec['apt_update']` is triggered, it generates a `notice`-level message. Because the default [logging level for agents](https://puppet.com/docs/puppet/latest/configuration.html#loglevel) is `notice`, this causes the repository update to appear in agent logs. To silence these updates from the default log output, set the [loglevel](https://puppet.com/docs/puppet/latest/metaparameter.html#loglevel) metaparameter for `Exec['apt_update']` above the agent logging level:
 
 ```puppet
 class { 'apt':
@@ -98,6 +117,10 @@ class { 'apt':
 }
 ```
 
+> **NOTE:** Every `Exec['apt_update']` run will generate a corrective change, even if the apt caches are not updated. For example, setting an update frequency of `always` can result in every Puppet run resulting in a corrective change. This is a known issue. For details, see [MODULES-10763](https://tickets.puppetlabs.com/browse/MODULES-10763).
+
+<a id="pin-a-specific-release"></a>
+
 ### Pin a specific release
 
 ```puppet
@@ -120,6 +143,8 @@ apt::pin { 'stable':
 
 To pin multiple packages, pass them to the `packages` parameter as an array or a space-delimited string.
 
+<a id="add-a-personal-package-archive-repository"></a>
+
 ### Add a Personal Package Archive (PPA) repository
 
 ```puppet
@@ -159,6 +184,8 @@ apt::source { 'puppetlabs':
 }
 ```
 
+<a id="configure-apt-from-hiera"></a>
+
 ### Configure Apt from Hiera
 
 Instead of specifying your sources directly as resources, you can instead just include the `apt` class, which will pick up the values automatically from hiera.
@@ -186,36 +213,38 @@ apt::sources:
       server: 'pgp.mit.edu'
 ```
 
+<a id="replace-the-default-sourceslist-file"></a>
+
 ### Replace the default `sources.list` file
 
 The following example replaces the default `/etc/apt/sources.list`. Along with this code, be sure to use the `purge` parameter, or you might get duplicate source warnings when running Apt.
 
 ```puppet
-apt::source { "archive.ubuntu.com-${lsbdistcodename}":
+apt::source { "archive.ubuntu.com-${facts['os']['distro']['codename']}":
   location => 'http://archive.ubuntu.com/ubuntu',
   key      => '630239CC130E1A7FD81A27B140976EAF437D05B5',
   repos    => 'main universe multiverse restricted',
 }
 
-apt::source { "archive.ubuntu.com-${lsbdistcodename}-security":
+apt::source { "archive.ubuntu.com-${facts['os']['distro']['codename']}-security":
   location => 'http://archive.ubuntu.com/ubuntu',
   key      => '630239CC130E1A7FD81A27B140976EAF437D05B5',
   repos    => 'main universe multiverse restricted',
-  release  => "${lsbdistcodename}-security"
+  release  => "${facts['os']['distro']['codename']}-security"
 }
 
-apt::source { "archive.ubuntu.com-${lsbdistcodename}-updates":
+apt::source { "archive.ubuntu.com-${facts['os']['distro']['codename']}-updates":
   location => 'http://archive.ubuntu.com/ubuntu',
   key      => '630239CC130E1A7FD81A27B140976EAF437D05B5',
   repos    => 'main universe multiverse restricted',
-  release  => "${lsbdistcodename}-updates"
+  release  => "${facts['os']['distro']['codename']}-updates"
 }
 
-apt::source { "archive.ubuntu.com-${lsbdistcodename}-backports":
+apt::source { "archive.ubuntu.com-${facts['os']['distro']['codename']}-backports":
  location => 'http://archive.ubuntu.com/ubuntu',
  key      => '630239CC130E1A7FD81A27B140976EAF437D05B5',
  repos    => 'main universe multiverse restricted',
- release  => "${lsbdistcodename}-backports"
+ release  => "${facts['os']['distro']['codename']}-backports"
 }
 ```
 
@@ -248,6 +277,8 @@ class { 'apt':
 }
 ```
 
+<a id="reference"></a>
+
 ## Reference
 
 ### Facts
@@ -270,13 +301,15 @@ class { 'apt':
 
 ### More Information
 
-See [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-motd/blob/master/REFERENCE.md) for all other reference documentation.
+See [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-apt/blob/main/REFERENCE.md) for all other reference documentation.
+
+<a id="limitations"></a>
 
 ## Limitations
 
 This module is not designed to be split across [run stages](https://docs.puppetlabs.com/puppet/latest/reference/lang_run_stages.html).
 
-For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-apt/blob/master/metadata.json)
+For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-apt/blob/main/metadata.json)
 
 ### Adding new sources or PPAs
 
@@ -288,8 +321,17 @@ Class['apt::update'] -> Package <| provider == 'apt' |>
 
 ## Development
 
-Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can't access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve. We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+Acceptance tests for this module leverage [puppet_litmus](https://github.com/puppetlabs/puppet_litmus).
+To run the acceptance tests follow the instructions [here](https://puppetlabs.github.io/litmus/Running-acceptance-tests.html).
+You can also find a tutorial and walkthrough of using Litmus and the PDK on [YouTube](https://www.youtube.com/watch?v=FYfR7ZEGHoE).
+
+If you run into an issue with this module, or if you would like to request a feature, please [file a ticket](https://tickets.puppetlabs.com/browse/MODULES/).
+Every Monday the Puppet IA Content Team has [office hours](https://puppet.com/community/office-hours) in the [Puppet Community Slack](http://slack.puppet.com/), alternating between an EMEA friendly time (1300 UTC) and an Americas friendly time (0900 Pacific, 1700 UTC).
 
-For more information, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)
+If you have problems getting this module up and running, please [contact Support](http://puppetlabs.com/services/customer-support).
 
-To see who's already involved, see the [list of contributors.](https://github.com/puppetlabs/puppetlabs-apt/graphs/contributors)
+If you submit a change to this module, be sure to regenerate the reference documentation as follows:
+
+```bash
+puppet strings generate --format markdown --out REFERENCE.md
+```
diff --git a/REFERENCE.md b/REFERENCE.md
index faef86c..674ec22 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -1,92 +1,141 @@
 # Reference
+
 <!-- DO NOT EDIT: This document was generated by Puppet Strings -->
 
 ## Table of Contents
 
-**Classes**
+### Classes
 
-_Public Classes_
+#### Public Classes
 
 * [`apt`](#apt): Main class, includes all other classes.
 * [`apt::backports`](#aptbackports): Manages backports.
 
-_Private Classes_
+#### Private Classes
 
 * `apt::params`: Provides defaults for the Apt module parameters.
 * `apt::update`: Updates the list of available packages using apt-get update.
 
-**Defined types**
+### Defined types
 
 * [`apt::conf`](#aptconf): Specifies a custom Apt configuration file.
 * [`apt::key`](#aptkey): Manages the GPG keys that Apt uses to authenticate packages.
+* [`apt::mark`](#aptmark): Manages apt-mark settings
 * [`apt::pin`](#aptpin): Manages Apt pins. Does not trigger an apt-get update run.
 * [`apt::ppa`](#aptppa): Manages PPA repositories using `add-apt-repository`. Not supported on Debian.
 * [`apt::setting`](#aptsetting): Manages Apt configuration files.
 * [`apt::source`](#aptsource): Manages the Apt sources in /etc/apt/sources.list.d/.
 
-**Resource types**
+### Resource types
 
-_Public Resource types_
+#### Public Resource types
 
 
-_Private Resource types_
+#### Private Resource types
 
 * `apt_key`: This type provides Puppet with the capabilities to manage GPG keys needed
 by apt to perform package validation. Apt has it's own GPG keyring that can
 be manipulated through the `apt-key` command.
 
-**Tasks**
+### Data types
+
+* [`Apt::Auth_conf_entry`](#aptauth_conf_entry): Login configuration settings that are recorded in the file `/etc/apt/auth.conf`.
+* [`Apt::Proxy`](#aptproxy): Configures Apt to connect to a proxy server.
+* [`Apt::Proxy_Per_Host`](#aptproxy_per_host): Adds per-host overrides to the system default APT proxy configuration
+
+### Tasks
 
 * [`init`](#init): Allows you to perform apt functions
 
 ## Classes
 
-### apt
+### <a name="apt"></a>`apt`
 
 Main class, includes all other classes.
 
 * **See also**
-https://docs.puppetlabs.com/references/latest/function.html#createresources
-for the create resource function
+  * https://docs.puppetlabs.com/references/latest/function.html#createresources
+    * for the create resource function
 
 #### Parameters
 
-The following parameters are available in the `apt` class.
-
-##### `provider`
+The following parameters are available in the `apt` class:
+
+* [`provider`](#provider)
+* [`keyserver`](#keyserver)
+* [`key_options`](#key_options)
+* [`ppa_options`](#ppa_options)
+* [`ppa_package`](#ppa_package)
+* [`backports`](#backports)
+* [`confs`](#confs)
+* [`update`](#update)
+* [`purge`](#purge)
+* [`proxy`](#proxy)
+* [`sources`](#sources)
+* [`keys`](#keys)
+* [`ppas`](#ppas)
+* [`pins`](#pins)
+* [`settings`](#settings)
+* [`manage_auth_conf`](#manage_auth_conf)
+* [`auth_conf_entries`](#auth_conf_entries)
+* [`auth_conf_owner`](#auth_conf_owner)
+* [`root`](#root)
+* [`sources_list`](#sources_list)
+* [`sources_list_d`](#sources_list_d)
+* [`conf_d`](#conf_d)
+* [`preferences`](#preferences)
+* [`preferences_d`](#preferences_d)
+* [`config_files`](#config_files)
+* [`sources_list_force`](#sources_list_force)
+* [`update_defaults`](#update_defaults)
+* [`purge_defaults`](#purge_defaults)
+* [`proxy_defaults`](#proxy_defaults)
+* [`include_defaults`](#include_defaults)
+* [`apt_conf_d`](#apt_conf_d)
+* [`source_key_defaults`](#source_key_defaults)
+
+##### <a name="provider"></a>`provider`
 
 Data type: `String`
 
 Specifies the provider that should be used by apt::update.
 
-Default value: $apt::params::provider
+Default value: `$apt::params::provider`
 
-##### `keyserver`
+##### <a name="keyserver"></a>`keyserver`
 
 Data type: `String`
 
 Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or
 hkp://).
 
-Default value: $apt::params::keyserver
+Default value: `$apt::params::keyserver`
+
+##### <a name="key_options"></a>`key_options`
+
+Data type: `Optional[String]`
+
+Specifies the default options for apt::key resources.
 
-##### `ppa_options`
+Default value: `$apt::params::key_options`
+
+##### <a name="ppa_options"></a>`ppa_options`
 
 Data type: `Optional[String]`
 
 Supplies options to be passed to the `add-apt-repository` command.
 
-Default value: $apt::params::ppa_options
+Default value: `$apt::params::ppa_options`
 
-##### `ppa_package`
+##### <a name="ppa_package"></a>`ppa_package`
 
 Data type: `Optional[String]`
 
 Names the package that provides the `apt-add-repository` command.
 
-Default value: $apt::params::ppa_package
+Default value: `$apt::params::ppa_package`
 
-##### `backports`
+##### <a name="backports"></a>`backports`
 
 Data type: `Optional[Hash]`
 
@@ -98,17 +147,17 @@ Options:
 * **:repos** `String`: See apt::backports for documentation.
 * **:key** `String`: See apt::backports for documentation.
 
-Default value: $apt::params::backports
+Default value: `$apt::params::backports`
 
-##### `confs`
+##### <a name="confs"></a>`confs`
 
 Data type: `Hash`
 
 Creates new `apt::conf` resources. Valid options: a hash to be passed to the create_resources function linked above.
 
-Default value: $apt::params::confs
+Default value: `$apt::params::confs`
 
-##### `update`
+##### <a name="update"></a>`update`
 
 Data type: `Hash`
 
@@ -124,9 +173,9 @@ Valid options: 'always' (at every Puppet run); 'daily' (if the value of `apt_upd
 * **:timeout** `Integer`: Specifies how long to wait for the update to complete before canceling it. Valid options: an integer, in seconds. Default: undef.
 * **:tries** `Integer`: Specifies how many times to retry the update after receiving a DNS or HTTP error. Default: undef.
 
-Default value: $apt::params::update
+Default value: `$apt::params::update`
 
-##### `purge`
+##### <a name="purge"></a>`purge`
 
 Data type: `Hash`
 
@@ -139,188 +188,233 @@ Options:
 * **:preferences** `Boolean`: Specifies whether to purge any unmanaged entries from preferences. Default false.
 * **:preferences.d.** `Boolean`: Specifies whether to purge any unmanaged entries from preferences.d. Default false.
 
-Default value: $apt::params::purge
+Default value: `$apt::params::purge`
 
-##### `proxy`
+##### <a name="proxy"></a>`proxy`
 
 Data type: `Apt::Proxy`
 
 Configures Apt to connect to a proxy server. Valid options: a hash matching the locally defined type apt::proxy.
 
-Default value: $apt::params::proxy
+Default value: `$apt::params::proxy`
 
-##### `sources`
+##### <a name="sources"></a>`sources`
 
 Data type: `Hash`
 
 Creates new `apt::source` resources. Valid options: a hash to be passed to the create_resources function linked above.
 
-Default value: $apt::params::sources
+Default value: `$apt::params::sources`
 
-##### `keys`
+##### <a name="keys"></a>`keys`
 
 Data type: `Hash`
 
 Creates new `apt::key` resources. Valid options: a hash to be passed to the create_resources function linked above.
 
-Default value: $apt::params::keys
+Default value: `$apt::params::keys`
 
-##### `ppas`
+##### <a name="ppas"></a>`ppas`
 
 Data type: `Hash`
 
 Creates new `apt::ppa` resources. Valid options: a hash to be passed to the create_resources function linked above.
 
-Default value: $apt::params::ppas
+Default value: `$apt::params::ppas`
 
-##### `pins`
+##### <a name="pins"></a>`pins`
 
 Data type: `Hash`
 
 Creates new `apt::pin` resources. Valid options: a hash to be passed to the create_resources function linked above.
 
-Default value: $apt::params::pins
+Default value: `$apt::params::pins`
 
-##### `settings`
+##### <a name="settings"></a>`settings`
 
 Data type: `Hash`
 
 Creates new `apt::setting` resources. Valid options: a hash to be passed to the create_resources function linked above.
 
-Default value: $apt::params::settings
+Default value: `$apt::params::settings`
+
+##### <a name="manage_auth_conf"></a>`manage_auth_conf`
+
+Data type: `Boolean`
+
+Specifies whether to manage the /etc/apt/auth.conf file. When true, the file will be overwritten with the entries specified in
+the auth_conf_entries parameter. When false, the file will be ignored (note that this does not set the file to absent.
+
+Default value: `$apt::params::manage_auth_conf`
 
-##### `auth_conf_entries`
+##### <a name="auth_conf_entries"></a>`auth_conf_entries`
 
 Data type: `Array[Apt::Auth_conf_entry]`
 
 An optional array of login configuration settings (hashes) that are recorded in the file /etc/apt/auth.conf. This file has a netrc-like
 format (similar to what curl uses) and contains the login configuration for APT sources and proxies that require authentication. See
 https://manpages.debian.org/testing/apt/apt_auth.conf.5.en.html for details. If specified each hash must contain the keys machine, login and
-password and no others.
+password and no others. Specifying manage_auth_conf and not specifying this parameter will set /etc/apt/auth.conf to absent.
+
+Default value: `$apt::params::auth_conf_entries`
+
+##### <a name="auth_conf_owner"></a>`auth_conf_owner`
 
-Default value: $apt::params::auth_conf_entries
+Data type: `String`
+
+The owner of the file /etc/apt/auth.conf. Default: '_apt' or 'root' on old releases.
 
-##### `root`
+Default value: `$apt::params::auth_conf_owner`
+
+##### <a name="root"></a>`root`
 
 Data type: `String`
 
 Specifies root directory of Apt executable.
 
-Default value: $apt::params::root
+Default value: `$apt::params::root`
 
-##### `sources_list`
+##### <a name="sources_list"></a>`sources_list`
 
 Data type: `String`
 
 Specifies the path of the sources_list file to use.
 
-Default value: $apt::params::sources_list
+Default value: `$apt::params::sources_list`
 
-##### `sources_list_d`
+##### <a name="sources_list_d"></a>`sources_list_d`
 
 Data type: `String`
 
 Specifies the path of the sources_list.d file to use.
 
-Default value: $apt::params::sources_list_d
+Default value: `$apt::params::sources_list_d`
 
-##### `conf_d`
+##### <a name="conf_d"></a>`conf_d`
 
 Data type: `String`
 
 Specifies the path of the conf.d file to use.
 
-Default value: $apt::params::conf_d
+Default value: `$apt::params::conf_d`
 
-##### `preferences`
+##### <a name="preferences"></a>`preferences`
 
 Data type: `String`
 
 Specifies the path of the preferences file to use.
 
-Default value: $apt::params::preferences
+Default value: `$apt::params::preferences`
 
-##### `preferences_d`
+##### <a name="preferences_d"></a>`preferences_d`
 
 Data type: `String`
 
 Specifies the path of the preferences.d file to use.
 
-Default value: $apt::params::preferences_d
+Default value: `$apt::params::preferences_d`
 
-##### `config_files`
+##### <a name="config_files"></a>`config_files`
 
 Data type: `Hash`
 
 A hash made up of the various configuration files used by Apt.
 
-Default value: $apt::params::config_files
+Default value: `$apt::params::config_files`
+
+##### <a name="sources_list_force"></a>`sources_list_force`
+
+Data type: `Boolean`
+
+Specifies whether to perform force purge or delete. Default false.
+
+Default value: `$apt::params::sources_list_force`
 
-##### `update_defaults`
+##### <a name="update_defaults"></a>`update_defaults`
 
 Data type: `Hash`
 
 
 
-Default value: $apt::params::update_defaults
+Default value: `$apt::params::update_defaults`
 
-##### `purge_defaults`
+##### <a name="purge_defaults"></a>`purge_defaults`
 
 Data type: `Hash`
 
 
 
-Default value: $apt::params::purge_defaults
+Default value: `$apt::params::purge_defaults`
 
-##### `proxy_defaults`
+##### <a name="proxy_defaults"></a>`proxy_defaults`
 
 Data type: `Hash`
 
 
 
-Default value: $apt::params::proxy_defaults
+Default value: `$apt::params::proxy_defaults`
 
-##### `include_defaults`
+##### <a name="include_defaults"></a>`include_defaults`
 
 Data type: `Hash`
 
 
 
-Default value: $apt::params::include_defaults
+Default value: `$apt::params::include_defaults`
 
-##### `source_key_defaults`
+##### <a name="apt_conf_d"></a>`apt_conf_d`
+
+Data type: `String`
+
+
+
+Default value: `$apt::params::apt_conf_d`
+
+##### <a name="source_key_defaults"></a>`source_key_defaults`
 
 Data type: `Hash`
 
 
 
-Default value: $apt::params::source_key_defaults
+Default value: `{
+    'server'  => $keyserver,
+    'options' => undef,
+    'content' => undef,
+    'source'  => undef,
+  }`
 
-### apt::backports
+### <a name="aptbackports"></a>`apt::backports`
 
 Manages backports.
 
 #### Examples
 
-##### Set up a backport for linuxmint qiana
+##### Set up a backport source for Linux Mint qiana
 
 ```puppet
-apt::backports { 'qiana':
+class { 'apt::backports':
   location => 'http://us.archive.ubuntu.com/ubuntu',
   release  => 'trusty-backports',
   repos    => 'main universe multiverse restricted',
   key      => {
     id     => '630239CC130E1A7FD81A27B140976EAF437D05B5',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
 }
 ```
 
 #### Parameters
 
-The following parameters are available in the `apt::backports` class.
+The following parameters are available in the `apt::backports` class:
 
-##### `location`
+* [`location`](#location)
+* [`release`](#release)
+* [`repos`](#repos)
+* [`key`](#key)
+* [`pin`](#pin)
+* [`include`](#include)
+
+##### <a name="location"></a>`location`
 
 Data type: `Optional[String]`
 
@@ -331,19 +425,19 @@ Ubuntu varies:
 
 - Ubuntu: 'http://archive.ubuntu.com/ubuntu'
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `release`
+##### <a name="release"></a>`release`
 
 Data type: `Optional[String]`
 
 Specifies a distribution of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file.
-Default: on Debian and Ubuntu, '${lsbdistcodename}-backports'. We recommend keeping this default, except on other operating
+Default: on Debian and Ubuntu, `${facts['os']['distro']['codename']}-backports`. We recommend keeping this default, except on other operating
 systems.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `repos`
+##### <a name="repos"></a>`repos`
 
 Data type: `Optional[String]`
 
@@ -354,9 +448,9 @@ Default value for Debian and Ubuntu varies:
 
 - Ubuntu: 'main universe multiverse restricted'
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `key`
+##### <a name="key"></a>`key`
 
 Data type: `Optional[Variant[String, Hash]]`
 
@@ -368,61 +462,74 @@ for Debian and Ubuntu varies:
 
 - Ubuntu: '630239CC130E1A7FD81A27B140976EAF437D05B5'
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `pin`
+##### <a name="pin"></a>`pin`
 
 Data type: `Optional[Variant[Integer, String, Hash]]`
 
 Specifies a pin priority for the backports. Valid options: a number or string to be passed to the `id` parameter of the `apt::pin` defined
 type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters.
 
-Default value: 200
+Default value: `200`
+
+##### <a name="include"></a>`include`
+
+Data type: `Optional[Variant[Hash]]`
+
+Specifies whether to include 'deb' or 'src', or both.
+
+Default value: `{}`
 
 ## Defined types
 
-### apt::conf
+### <a name="aptconf"></a>`apt::conf`
 
 Specifies a custom Apt configuration file.
 
 #### Parameters
 
-The following parameters are available in the `apt::conf` defined type.
+The following parameters are available in the `apt::conf` defined type:
 
-##### `content`
+* [`content`](#content)
+* [`ensure`](#ensure)
+* [`priority`](#priority)
+* [`notify_update`](#notify_update)
+
+##### <a name="content"></a>`content`
 
 Data type: `Optional[String]`
 
 Required unless `ensure` is set to 'absent'. Directly supplies content for the configuration file.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `ensure`
+##### <a name="ensure"></a>`ensure`
 
 Data type: `Enum['present', 'absent']`
 
 Specifies whether the configuration file should exist. Valid options: 'present' and 'absent'.
 
-Default value: present
+Default value: `present`
 
-##### `priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Variant[String, Integer]`
 
 Determines the order in which Apt processes the configuration file. Files with lower priority numbers are loaded first.
 Valid options: a string containing an integer or an integer.
 
-Default value: 50
+Default value: `50`
 
-##### `notify_update`
+##### <a name="notify_update"></a>`notify_update`
 
 Data type: `Optional[Boolean]`
 
 Specifies whether to trigger an `apt-get update` run.
 
-Default value: `undef`
+Default value: ``undef``
 
-### apt::key
+### <a name="aptkey"></a>`apt::key`
 
 Manages the GPG keys that Apt uses to authenticate packages.
 
@@ -435,185 +542,233 @@ Manages the GPG keys that Apt uses to authenticate packages.
 ```puppet
 apt::key { 'puppetlabs':
   id      => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-  server  => 'hkps.pool.sks-keyservers.net',
+  server  => 'keyserver.ubuntu.com',
   options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
 }
 ```
 
 #### Parameters
 
-The following parameters are available in the `apt::key` defined type.
+The following parameters are available in the `apt::key` defined type:
+
+* [`id`](#id)
+* [`ensure`](#ensure)
+* [`content`](#content)
+* [`source`](#source)
+* [`server`](#server)
+* [`weak_ssl`](#weak_ssl)
+* [`options`](#options)
 
-##### `id`
+##### <a name="id"></a>`id`
 
 Data type: `Pattern[/\A(0x)?[0-9a-fA-F]{8}\Z/, /\A(0x)?[0-9a-fA-F]{16}\Z/, /\A(0x)?[0-9a-fA-F]{40}\Z/]`
 
 Specifies a GPG key to authenticate Apt package signatures. Valid options: a string containing a key ID (8 or 16 hexadecimal
 characters, optionally prefixed with "0x") or a full key fingerprint (40 hexadecimal characters).
 
-Default value: $title
+Default value: `$title`
 
-##### `ensure`
+##### <a name="ensure"></a>`ensure`
 
 Data type: `Enum['present', 'absent', 'refreshed']`
 
 Specifies whether the key should exist. Valid options: 'present', 'absent' or 'refreshed'. Using 'refreshed' will make keys auto
 update when they have expired (assuming a new key exists on the key server).
 
-Default value: present
+Default value: `present`
 
-##### `content`
+##### <a name="content"></a>`content`
 
 Data type: `Optional[String]`
 
 Supplies the entire GPG key. Useful in case the key can't be fetched from a remote location and using a file resource is inconvenient.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `source`
+##### <a name="source"></a>`source`
 
 Data type: `Optional[Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/]]`
 
 Specifies the location of an existing GPG key file to copy. Valid options: a string containing a URL (ftp://, http://, or https://) or
 an absolute path.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `server`
+##### <a name="server"></a>`server`
 
-Data type: `Pattern[/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/]`
+Data type: `Pattern[/\A((hkp|hkps|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?(\/[a-zA-Z\d\-_.]+)*\/?$/]`
 
-Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or
-hkp://).
+Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://,
+hkp:// or hkps://). The hkps:// protocol is currently only supported on Ubuntu 18.04.
 
-Default value: $::apt::keyserver
+Default value: `$::apt::keyserver`
 
-##### `options`
+##### <a name="weak_ssl"></a>`weak_ssl`
+
+Data type: `Boolean`
+
+Specifies whether strict SSL verification on a https URL should be disabled. Valid options: true or false.
+
+Default value: ``false``
+
+##### <a name="options"></a>`options`
 
 Data type: `Optional[String]`
 
 Passes additional options to `apt-key adv --keyserver-options`.
 
-Default value: `undef`
+Default value: `$::apt::key_options`
+
+### <a name="aptmark"></a>`apt::mark`
 
-### apt::pin
+Manages apt-mark settings
+
+#### Parameters
+
+The following parameters are available in the `apt::mark` defined type:
+
+* [`setting`](#setting)
+
+##### <a name="setting"></a>`setting`
+
+Data type: `Enum['auto','manual','hold','unhold']`
+
+auto, manual, hold, unhold
+specifies the behavior of apt in case of no more dependencies installed
+https://manpages.debian.org/stable/apt/apt-mark.8.en.html
+
+### <a name="aptpin"></a>`apt::pin`
 
 Manages Apt pins. Does not trigger an apt-get update run.
 
 * **See also**
-http://linux.die.net/man/5/apt_preferences
-for context on these parameters
+  * http://linux.die.net/man/5/apt_preferences
+    * for context on these parameters
 
 #### Parameters
 
-The following parameters are available in the `apt::pin` defined type.
+The following parameters are available in the `apt::pin` defined type:
 
-##### `ensure`
+* [`ensure`](#ensure)
+* [`explanation`](#explanation)
+* [`order`](#order)
+* [`packages`](#packages)
+* [`priority`](#priority)
+* [`release`](#release)
+* [`release_version`](#release_version)
+* [`component`](#component)
+* [`originator`](#originator)
+* [`label`](#label)
+* [`origin`](#origin)
+* [`version`](#version)
+* [`codename`](#codename)
+
+##### <a name="ensure"></a>`ensure`
 
 Data type: `Optional[Enum['file', 'present', 'absent']]`
 
 Specifies whether the pin should exist. Valid options: 'file', 'present', and 'absent'.
 
-Default value: present
+Default value: `present`
 
-##### `explanation`
+##### <a name="explanation"></a>`explanation`
 
 Data type: `Optional[String]`
 
 Supplies a comment to explain the pin. Default: "${caller_module_name}: ${name}".
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `order`
+##### <a name="order"></a>`order`
 
 Data type: `Variant[Integer]`
 
 Determines the order in which Apt processes the pin file. Files with lower order numbers are loaded first.
 
-Default value: 50
+Default value: `50`
 
-##### `packages`
+##### <a name="packages"></a>`packages`
 
 Data type: `Variant[String, Array]`
 
 Specifies which package(s) to pin.
 
-Default value: '*'
+Default value: `'*'`
 
-##### `priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Variant[Numeric, String]`
 
 Sets the priority of the package. If multiple versions of a given package are available, `apt-get` installs the one with the highest
 priority number (subject to dependency constraints). Valid options: an integer.
 
-Default value: 0
+Default value: `0`
 
-##### `release`
+##### <a name="release"></a>`release`
 
 Data type: `Optional[String]`
 
 Tells APT to prefer packages that support the specified release. Typical values include 'stable', 'testing', and 'unstable'.
 
-Default value: ''
+Default value: `''`
 
-##### `release_version`
+##### <a name="release_version"></a>`release_version`
 
 Data type: `Optional[String]`
 
 Tells APT to prefer packages that support the specified operating system release version (such as Debian release version 7).
 
-Default value: ''
+Default value: `''`
 
-##### `component`
+##### <a name="component"></a>`component`
 
 Data type: `Optional[String]`
 
 Names the licensing component associated with the packages in the directory tree of the Release file.
 
-Default value: ''
+Default value: `''`
 
-##### `originator`
+##### <a name="originator"></a>`originator`
 
 Data type: `Optional[String]`
 
 Names the originator of the packages in the directory tree of the Release file.
 
-Default value: ''
+Default value: `''`
 
-##### `label`
+##### <a name="label"></a>`label`
 
 Data type: `Optional[String]`
 
 Names the label of the packages in the directory tree of the Release file.
 
-Default value: ''
+Default value: `''`
 
-##### `origin`
+##### <a name="origin"></a>`origin`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ''
+Default value: `''`
 
-##### `version`
+##### <a name="version"></a>`version`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ''
+Default value: `''`
 
-##### `codename`
+##### <a name="codename"></a>`codename`
 
 Data type: `Optional[String]`
 
 
 
-Default value: ''
+Default value: `''`
 
-### apt::ppa
+### <a name="aptppa"></a>`apt::ppa`
 
 Manages PPA repositories using `add-apt-repository`. Not supported on Debian.
 
@@ -627,104 +782,126 @@ apt::ppa{ 'ppa:openstack-ppa/bleeding-edge': }
 
 #### Parameters
 
-The following parameters are available in the `apt::ppa` defined type.
+The following parameters are available in the `apt::ppa` defined type:
+
+* [`ensure`](#ensure)
+* [`options`](#options)
+* [`release`](#release)
+* [`dist`](#dist)
+* [`package_name`](#package_name)
+* [`package_manage`](#package_manage)
 
-##### `ensure`
+##### <a name="ensure"></a>`ensure`
 
 Data type: `String`
 
 Specifies whether the PPA should exist. Valid options: 'present' and 'absent'.
 
-Default value: 'present'
+Default value: `'present'`
 
-##### `options`
+##### <a name="options"></a>`options`
 
 Data type: `Optional[String]`
 
 Supplies options to be passed to the `add-apt-repository` command. Default: '-y'.
 
-Default value: $::apt::ppa_options
+Default value: `$::apt::ppa_options`
 
-##### `release`
+##### <a name="release"></a>`release`
 
 Data type: `Optional[String]`
 
-Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint).
 Specifies the operating system of your node. Valid options: a string containing a valid LSB distribution codename.
+Optional if `puppet facts show os.distro.codename` returns your correct distribution release codename.
 
-Default value: $facts['lsbdistcodename']
+Default value: `$facts['os']['distro']['codename']`
 
-##### `package_name`
+##### <a name="dist"></a>`dist`
+
+Data type: `Optional[String]`
+
+Specifies the distribution of your node. Valid options: a string containing a valid distribution codename.
+Optional if `puppet facts show os.name` returns your correct distribution name.
+
+Default value: `$facts['os']['name']`
+
+##### <a name="package_name"></a>`package_name`
 
 Data type: `Optional[String]`
 
 Names the package that provides the `apt-add-repository` command. Default: 'software-properties-common'.
 
-Default value: $::apt::ppa_package
+Default value: `$::apt::ppa_package`
 
-##### `package_manage`
+##### <a name="package_manage"></a>`package_manage`
 
 Data type: `Boolean`
 
 Specifies whether Puppet should manage the package that provides `apt-add-repository`.
 
-Default value: `false`
+Default value: ``false``
 
-### apt::setting
+### <a name="aptsetting"></a>`apt::setting`
 
 Manages Apt configuration files.
 
 * **See also**
-https://docs.puppetlabs.com/references/latest/type.html#file-attributes
-for more information on source and content parameters
+  * https://docs.puppetlabs.com/references/latest/type.html#file-attributes
+    * for more information on source and content parameters
 
 #### Parameters
 
-The following parameters are available in the `apt::setting` defined type.
+The following parameters are available in the `apt::setting` defined type:
+
+* [`priority`](#priority)
+* [`ensure`](#ensure)
+* [`source`](#source)
+* [`content`](#content)
+* [`notify_update`](#notify_update)
 
-##### `priority`
+##### <a name="priority"></a>`priority`
 
 Data type: `Variant[String, Integer, Array]`
 
 Determines the order in which Apt processes the configuration file. Files with higher priority numbers are loaded first.
 
-Default value: 50
+Default value: `50`
 
-##### `ensure`
+##### <a name="ensure"></a>`ensure`
 
 Data type: `Optional[Enum['file', 'present', 'absent']]`
 
 Specifies whether the file should exist. Valid options: 'present', 'absent', and 'file'.
 
-Default value: file
+Default value: `file`
 
-##### `source`
+##### <a name="source"></a>`source`
 
 Data type: `Optional[String]`
 
 Required, unless `content` is set. Specifies a source file to supply the content of the configuration file. Cannot be used in combination
 with `content`. Valid options: see link above for Puppet's native file type source attribute.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `content`
+##### <a name="content"></a>`content`
 
 Data type: `Optional[String]`
 
 Required, unless `source` is set. Directly supplies content for the configuration file. Cannot be used in combination with `source`. Valid
 options: see link above for Puppet's native file type content attribute.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `notify_update`
+##### <a name="notify_update"></a>`notify_update`
 
 Data type: `Boolean`
 
 Specifies whether to trigger an `apt-get update` run.
 
-Default value: `true`
+Default value: ``true``
 
-### apt::source
+### <a name="aptsource"></a>`apt::source`
 
 Manages the Apt sources in /etc/apt/sources.list.d/.
 
@@ -738,56 +915,69 @@ apt::source { 'puppetlabs':
   repos    => 'main',
   key      => {
     id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
 }
 ```
 
 #### Parameters
 
-The following parameters are available in the `apt::source` defined type.
+The following parameters are available in the `apt::source` defined type:
+
+* [`location`](#location)
+* [`comment`](#comment)
+* [`ensure`](#ensure)
+* [`release`](#release)
+* [`repos`](#repos)
+* [`include`](#include)
+* [`key`](#key)
+* [`keyring`](#keyring)
+* [`pin`](#pin)
+* [`architecture`](#architecture)
+* [`allow_unsigned`](#allow_unsigned)
+* [`notify_update`](#notify_update)
 
-##### `location`
+##### <a name="location"></a>`location`
 
 Data type: `Optional[String]`
 
 Required, unless ensure is set to 'absent'. Specifies an Apt repository. Valid options: a string containing a repository URL.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `comment`
+##### <a name="comment"></a>`comment`
 
 Data type: `String`
 
 Supplies a comment for adding to the Apt source file.
 
-Default value: $name
+Default value: `$name`
 
-##### `ensure`
+##### <a name="ensure"></a>`ensure`
 
 Data type: `String`
 
 Specifies whether the Apt source file should exist. Valid options: 'present' and 'absent'.
 
-Default value: present
+Default value: `present`
 
-##### `release`
+##### <a name="release"></a>`release`
 
 Data type: `Optional[String]`
 
 Specifies a distribution of the Apt repository.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `repos`
+##### <a name="repos"></a>`repos`
 
 Data type: `String`
 
 Specifies a component of the Apt repository.
 
-Default value: 'main'
+Default value: `'main'`
 
-##### `include`
+##### <a name="include"></a>`include`
 
 Data type: `Optional[Variant[Hash]]`
 
@@ -798,28 +988,37 @@ Options:
 * **:deb** `Boolean`: Specifies whether to request the distribution's compiled binaries. Default true.
 * **:src** `Boolean`: Specifies whether to request the distribution's uncompiled source code. Default false.
 
-Default value: {}
+Default value: `{}`
 
-##### `key`
+##### <a name="key"></a>`key`
 
 Data type: `Optional[Variant[String, Hash]]`
 
 Creates a declaration of the apt::key defined type. Valid options: a string to be passed to the `id` parameter of the `apt::key`
-defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, and/or
-`options` parameters.
+defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, `weak_ssl`,
+and/or `options` parameters.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `pin`
+##### <a name="keyring"></a>`keyring`
+
+Data type: `Optional[Stdlib::AbsolutePath]`
+
+Absolute path to a file containing the PGP keyring used to sign this repository. Value is used to set signed-by on the source entry.
+See https://wiki.debian.org/DebianRepository/UseThirdParty for details.
+
+Default value: ``undef``
+
+##### <a name="pin"></a>`pin`
 
 Data type: `Optional[Variant[Hash, Numeric, String]]`
 
 Creates a declaration of the apt::pin defined type. Valid options: a number or string to be passed to the `id` parameter of the
 `apt::pin` defined type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters.
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `architecture`
+##### <a name="architecture"></a>`architecture`
 
 Data type: `Optional[String]`
 
@@ -827,29 +1026,163 @@ Tells Apt to only download information for specified architectures. Valid option
 separated by commas (e.g., 'i386' or 'i386,alpha,powerpc'). Default: undef (if unspecified, Apt downloads information for all architectures
 defined in the Apt::Architectures option).
 
-Default value: `undef`
+Default value: ``undef``
 
-##### `allow_unsigned`
+##### <a name="allow_unsigned"></a>`allow_unsigned`
 
 Data type: `Boolean`
 
 Specifies whether to authenticate packages from this release, even if the Release file is not signed or the signature can't be checked.
 
-Default value: `false`
+Default value: ``false``
 
-##### `notify_update`
+##### <a name="notify_update"></a>`notify_update`
 
 Data type: `Boolean`
 
 Specifies whether to trigger an `apt-get update` run.
 
-Default value: `true`
+Default value: ``true``
 
 ## Resource types
 
+## Data types
+
+### <a name="aptauth_conf_entry"></a>`Apt::Auth_conf_entry`
+
+Login configuration settings that are recorded in the file `/etc/apt/auth.conf`.
+
+* **See also**
+  * https://manpages.debian.org/testing/apt/apt_auth.conf.5.en.html
+  * for more information
+
+Alias of
+
+```puppet
+Struct[{
+    machine => String[1],
+    login => String,
+    password => String
+  }]
+```
+
+#### Parameters
+
+The following parameters are available in the `Apt::Auth_conf_entry` data type:
+
+* [`machine`](#machine)
+* [`login`](#login)
+* [`password`](#password)
+
+##### <a name="machine"></a>`machine`
+
+Hostname of machine to connect to.
+
+##### <a name="login"></a>`login`
+
+Specifies the username to connect with.
+
+##### <a name="password"></a>`password`
+
+Specifies the password to connect with.
+
+### <a name="aptproxy"></a>`Apt::Proxy`
+
+Configures Apt to connect to a proxy server.
+
+Alias of
+
+```puppet
+Struct[{
+    ensure     => Optional[Enum['file', 'present', 'absent']],
+    host       => Optional[String],
+    port       => Optional[Integer[0, 65535]],
+    https      => Optional[Boolean],
+    https_acng => Optional[Boolean],
+    direct     => Optional[Boolean],
+    perhost    => Optional[Array[Apt::Proxy_Per_Host]],
+  }]
+```
+
+#### Parameters
+
+The following parameters are available in the `Apt::Proxy` data type:
+
+* [`ensure`](#ensure)
+* [`host`](#host)
+* [`port`](#port)
+* [`https`](#https)
+* [`direct`](#direct)
+
+##### <a name="ensure"></a>`ensure`
+
+Specifies whether the proxy should exist. Valid options: 'file', 'present', and 'absent'. Prefer 'file' over 'present'.
+
+##### <a name="host"></a>`host`
+
+Specifies a proxy host to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: a string containing a hostname.
+
+##### <a name="port"></a>`port`
+
+Specifies a proxy port to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: an integer containing a port number.
+
+##### <a name="https"></a>`https`
+
+Specifies whether to enable https proxies.
+
+##### <a name="direct"></a>`direct`
+
+Specifies whether or not to use a `DIRECT` https proxy if http proxy is used but https is not.
+
+### <a name="aptproxy_per_host"></a>`Apt::Proxy_Per_Host`
+
+Adds per-host overrides to the system default APT proxy configuration
+
+Alias of
+
+```puppet
+Struct[{
+    scope      => String,
+    host       => Optional[String],
+    port       => Optional[Integer[1, 65535]],
+    https      => Optional[Boolean],
+    direct     => Optional[Boolean],
+  }]
+```
+
+#### Parameters
+
+The following parameters are available in the `Apt::Proxy_Per_Host` data type:
+
+* [`scope`](#scope)
+* [`host`](#host)
+* [`port`](#port)
+* [`https`](#https)
+* [`direct`](#direct)
+
+##### <a name="scope"></a>`scope`
+
+Specifies the scope of the override.  Valid options: a string containing a hostname.
+
+##### <a name="host"></a>`host`
+
+Specifies a proxy host to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: a string containing a hostname.
+
+##### <a name="port"></a>`port`
+
+Specifies a proxy port to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: an integer containing a port number.
+
+##### <a name="https"></a>`https`
+
+Specifies whether to enable https for this override.
+
+##### <a name="direct"></a>`direct`
+
+Specifies whether or not to use a `DIRECT` target to bypass the system default proxy.
+
 ## Tasks
 
-### init
+### <a name="init"></a>`init`
 
 Allows you to perform apt functions
 
@@ -859,7 +1192,7 @@ Allows you to perform apt functions
 
 ##### `action`
 
-Data type: `Enum[update, upgrade]`
+Data type: `Enum[update, upgrade, dist-upgrade, autoremove]`
 
 Action to perform 
 
diff --git a/Rakefile b/Rakefile
deleted file mode 100644
index 112dc42..0000000
--- a/Rakefile
+++ /dev/null
@@ -1,76 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-syntax/tasks/puppet-syntax'
-require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
-require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
-require 'puppet_pot_generator/rake_tasks'
-
-def changelog_user
-  return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['author']
-  raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
-  puts "GitHubChangelogGenerator user:#{returnVal}"
-  returnVal
-end
-
-def changelog_project
-  return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['name']
-  raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
-  puts "GitHubChangelogGenerator project:#{returnVal}"
-  returnVal
-end
-
-def changelog_future_release
-  return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = JSON.load(File.read('metadata.json'))['version']
-  raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
-  puts "GitHubChangelogGenerator future_release:#{returnVal}"
-  returnVal
-end
-
-PuppetLint.configuration.send('disable_relative')
-
-if Bundler.rubygems.find_name('github_changelog_generator').any?
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
-    config.user = "#{changelog_user}"
-    config.project = "#{changelog_project}"
-    config.future_release = "#{changelog_future_release}"
-    config.exclude_labels = ['maintenance']
-    config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
-    config.add_pr_wo_labels = true
-    config.issues = false
-    config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM"
-    config.configure_sections = {
-      "Changed" => {
-        "prefix" => "### Changed",
-        "labels" => ["backwards-incompatible"],
-      },
-      "Added" => {
-        "prefix" => "### Added",
-        "labels" => ["feature", "enhancement"],
-      },
-      "Fixed" => {
-        "prefix" => "### Fixed",
-        "labels" => ["bugfix"],
-      },
-    }
-  end
-else
-  desc 'Generate a Changelog from GitHub'
-  task :changelog do
-    raise <<EOM
-The changelog tasks depends on unreleased features of the github_changelog_generator gem.
-Please manually add it to your .sync.yml for now, and run `pdk update`:
----
-Gemfile:
-  optional:
-    ':development':
-      - gem: 'github_changelog_generator'
-        git: 'https://github.com/skywinder/github-changelog-generator'
-        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
-        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
-EOM
-  end
-end
-
diff --git a/checksums.json b/checksums.json
deleted file mode 100644
index b971dc5..0000000
--- a/checksums.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "CHANGELOG.md": "6be8e4cecc0686e7b9635d5560a72973",
-  "CONTRIBUTING.md": "4d17f3c942e7c93d1577cc4438a231e4",
-  "Gemfile": "e35aeaf9f7e4200bbd4ef8fbbde3a3f2",
-  "HISTORY.md": "0e80b98698dacc680a1af56fd0566b3b",
-  "LICENSE": "3b83ef96387f14655fc854ddc3c6bd57",
-  "MAINTAINERS.md": "35674b233c6d12c0f56ee8afbdae29e4",
-  "NOTICE": "9533d13591355591f69619be28e9cfce",
-  "README.md": "f77626d04a66ec5265fd02441e050032",
-  "REFERENCE.md": "027eb3115ec96c780b877ddcc58ea5ec",
-  "Rakefile": "5a645b196705e2e8d973114d1552e5ef",
-  "examples/backports.pp": "af57ea62ed1b73f540858e00327e6517",
-  "examples/builddep.pp": "eddb8b7d7c0ef7383d85a74c1cd0de3f",
-  "examples/debian_testing.pp": "2e50a41180e2afeac2de15ade05ddaa1",
-  "examples/debian_unstable.pp": "82890803cc4423443db8f40353e16262",
-  "examples/disable_keys.pp": "3d4e7ac49946d961ff51a719ee713293",
-  "examples/fancy_progress.pp": "9a55d4ea52be4ebd670befff7ca3b87f",
-  "examples/force.pp": "f71857eba704a0eb3d8d6b146e80da6d",
-  "examples/hold.pp": "5e58e0a30d6407a05691d96c7647ae14",
-  "examples/key.pp": "d85507365bd2753e14e04c344c2f7703",
-  "examples/pin.pp": "4b4c3612d75a19dba8eb7227070fa4ab",
-  "examples/ppa.pp": "b902cce8159128b5e8b21bed540743ff",
-  "examples/release.pp": "2bc960babf8c4dd24b7ffa4220a601f8",
-  "examples/source.pp": "c79817e129305f86a495f7558de3d3ec",
-  "examples/unattended_upgrades.pp": "e7a797388ef03077f110f4f268f5ecd1",
-  "lib/facter/apt_reboot_required.rb": "e7dbcd3849c380cdd08dbc866079c211",
-  "lib/facter/apt_update_last_success.rb": "f259aac4abdf82c1c6f13e0031bf551a",
-  "lib/facter/apt_updates.rb": "11be6c6ace6c11cef55127564ecc6d91",
-  "lib/puppet/provider/apt_key/apt_key.rb": "22b0747873120a29f7a51a2dc21e65d4",
-  "lib/puppet/type/apt_key.rb": "f9c0befebd9261aa1945b02d45695b7d",
-  "locales/config.yaml": "bda37c45d7414bd4e2a6e1c01044e2e6",
-  "locales/ja/puppetlabs-apt.po": "69899f56f361d43b709cce860f04a5bf",
-  "locales/puppetlabs-apt.pot": "ce6a37eaa3865b2d36b4d4cb549a326f",
-  "manifests/backports.pp": "0940aab318d22cdd25ad400719a3018f",
-  "manifests/conf.pp": "b1ce82c9f2e16f6580a49cf1d81aa5c6",
-  "manifests/init.pp": "7de676f9d915be704c708d127401d968",
-  "manifests/key.pp": "a9a519aad883d8104f52ad094b5f2710",
-  "manifests/params.pp": "b654f48b63388ce4d44c779d2a2be538",
-  "manifests/pin.pp": "23fc805f31b56eb52466487f7ceb065a",
-  "manifests/ppa.pp": "b2a686c6ed43b1dcc1def3b1c3d6a79c",
-  "manifests/setting.pp": "6715dbb5fb795415294d55f45577ec85",
-  "manifests/source.pp": "f003da1ea7314904c3624e330c76ba02",
-  "manifests/update.pp": "93ef29d0da40610a36205821229d3304",
-  "metadata.json": "178177abba0f0db34b879d1bf4012525",
-  "spec/acceptance/01_apt_class_spec.rb": "b63ac7a092085ee607aa74c55963004f",
-  "spec/acceptance/apt_key_provider_spec.rb": "30ab42ebb6a14213d6441fb1b315c05a",
-  "spec/acceptance/apt_spec.rb": "5ac45a8bd80652788fccf40d504b2aa7",
-  "spec/acceptance/init_task_spec.rb": "0a9d390d5e801bf0ac5be96a3d90c2b4",
-  "spec/acceptance/locales_spec.rb": "dfe832c34c9ddf542449130edfad9a3b",
-  "spec/acceptance/nodesets/centos-7-x64.yml": "a713f3abd3657f0ae2878829badd23cd",
-  "spec/acceptance/nodesets/debian-8-x64.yml": "d2d2977900989f30086ad251a14a1f39",
-  "spec/acceptance/nodesets/default.yml": "b42da5a1ea0c964567ba7495574b8808",
-  "spec/acceptance/nodesets/docker/centos-7.yml": "8a3892807bdd62306ae4774f41ba11ae",
-  "spec/acceptance/nodesets/docker/debian-8.yml": "ac8e871d1068c96de5e85a89daaec6df",
-  "spec/acceptance/nodesets/docker/ubuntu-14.04.yml": "dc42ee922a96908d85b8f0f08203ce58",
-  "spec/classes/apt_backports_spec.rb": "8b68574926585ba042934d936fa42281",
-  "spec/classes/apt_spec.rb": "bdca7b975f8a85f7ec045f999af40fc1",
-  "spec/classes/apt_update_spec.rb": "6b0e1dcc4bc46e089037a6aebcf9316c",
-  "spec/default_facts.yml": "b1ca07fac7dcb249d641d8b63239ef7c",
-  "spec/defines/conf_spec.rb": "81dab32425ed53d0cb48a63c6f2c8ab3",
-  "spec/defines/key_compat_spec.rb": "e49cadca852b67fac314f16daabca9f5",
-  "spec/defines/key_spec.rb": "cc08433e453dd379aabf1189e9adac8f",
-  "spec/defines/pin_spec.rb": "44513118fde2543e2677addea6f82ff5",
-  "spec/defines/ppa_spec.rb": "252fa211f18e31d3abaa98ae741e2fb6",
-  "spec/defines/setting_spec.rb": "cd32f17ce45e39efbbb9c58a17297f84",
-  "spec/defines/source_compat_spec.rb": "caa5f2b48a0988bbac8f26c824c3e073",
-  "spec/defines/source_spec.rb": "bcb121e3efd1cdfeb6f7befa7627dfe5",
-  "spec/spec_helper.rb": "52436bc6f6442debdf72b83b3fa4c281",
-  "spec/spec_helper_acceptance.rb": "22560818f1a7399b339c42a7c308e2fa",
-  "spec/unit/facter/apt_dist_has_updates_spec.rb": "6b85d39d586e7654ad2f0ee3af5a2787",
-  "spec/unit/facter/apt_dist_package_security_updates_spec.rb": "ad738e3a1193b1b3e0052a9130f283c8",
-  "spec/unit/facter/apt_dist_package_updates_spec.rb": "063821fc13e3b217a853577b6a94a224",
-  "spec/unit/facter/apt_dist_security_updates_spec.rb": "393a47f50ff6c43aa6ba80d7848cd96a",
-  "spec/unit/facter/apt_dist_updates_spec.rb": "f96e477aa5c6fd913c2352dba8f40b53",
-  "spec/unit/facter/apt_has_updates_spec.rb": "cdc8486f14c4c3f35df0c38c2cc72c83",
-  "spec/unit/facter/apt_package_security_updates_spec.rb": "395761ebec3cd3b3c2ad4dfc7990adc8",
-  "spec/unit/facter/apt_package_updates_spec.rb": "62708ded28f92c049a38ededa61a7d77",
-  "spec/unit/facter/apt_reboot_required_spec.rb": "80e860984fc538bede7a2c24625ee234",
-  "spec/unit/facter/apt_security_updates_spec.rb": "a6d6985e4dcce5839119618d91726c64",
-  "spec/unit/facter/apt_update_last_success_spec.rb": "0e6cf8b5bec4d91ccfe4b83d088a5b10",
-  "spec/unit/facter/apt_updates_spec.rb": "6d3fb0763e8133b014838f504ce26f08",
-  "spec/unit/puppet/type/apt_key_spec.rb": "cba6c11a7a75d2a4c6260f8cbec6692b",
-  "tasks/init.json": "f6aed51e207a15340d5258d1fab47a69",
-  "tasks/init.rb": "e65e10bc5d44188a64a03078ae6ceebd",
-  "templates/15update-stamp.epp": "b9de0ac9e2c9854b1bb213e362dc4e41",
-  "templates/_conf_header.epp": "6f3077f2eabd3e929a44d55bc1c5446e",
-  "templates/_header.epp": "9300ac105fe777787ac9e793b8df8d25",
-  "templates/auth_conf.epp": "5ecb28d31ee897d51b1b29cfe59c8b54",
-  "templates/pin.pref.epp": "58d462f3ec74c3755a2bd804d7b22207",
-  "templates/proxy.epp": "7353f09fa5fdb1819517446ec58c9ad5",
-  "templates/source.list.epp": "c32995778d056f204d51a6d79505a5aa",
-  "types/auth_conf_entry.pp": "8484d7777144fe7ed87a6e3830cf694a",
-  "types/proxy.pp": "4bb8b0ad03264cdedb673d1580282b37"
-}
\ No newline at end of file
diff --git a/data/common.yaml b/data/common.yaml
new file mode 100644
index 0000000..2fbf0ff
--- /dev/null
+++ b/data/common.yaml
@@ -0,0 +1 @@
+--- {}
diff --git a/debian/changelog b/debian/changelog
index 2ce4150..d111287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+puppet-module-puppetlabs-apt (8.3.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 14 Mar 2022 21:59:52 -0000
+
 puppet-module-puppetlabs-apt (6.1.1-1) unstable; urgency=medium
 
   * New upstream version 6.1.1
diff --git a/examples/backports.pp b/examples/backports.pp
index 5f1f1ee..ff56666 100644
--- a/examples/backports.pp
+++ b/examples/backports.pp
@@ -1,11 +1,11 @@
-# Set up a backport for linuxmint qiana
+# Set up a backport for Linux Mint qiana
 class { 'apt': }
-apt::backports { 'qiana':
+class { 'apt::backports':
   location => 'http://us.archive.ubuntu.com/ubuntu',
   release  => 'trusty-backports',
   repos    => 'main universe multiverse restricted',
   key      => {
     id     => '630239CC130E1A7FD81A27B140976EAF437D05B5',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
 }
diff --git a/examples/key.pp b/examples/key.pp
index dc2401b..478073c 100644
--- a/examples/key.pp
+++ b/examples/key.pp
@@ -1,6 +1,6 @@
 # Declare Apt key for apt.puppetlabs.com source
 apt::key { 'puppetlabs':
-  id      => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-  server  => 'hkps.pool.sks-keyservers.net',
+  id      => 'D6811ED3ADEEB8441AF5AA8F4528B6CD9E61EF26',
+  server  => 'keyserver.ubuntu.com',
   options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
 }
diff --git a/examples/source.pp b/examples/source.pp
index a3648c3..c4791af 100644
--- a/examples/source.pp
+++ b/examples/source.pp
@@ -2,13 +2,13 @@
 class { 'apt': }
 
 # Install the puppetlabs apt source
-# Release is automatically obtained from lsbdistcodename fact if available.
+# Release is automatically obtained from facts.
 apt::source { 'puppetlabs':
   location => 'http://apt.puppetlabs.com',
   repos    => 'main',
   key      => {
     id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
 }
 
@@ -19,7 +19,7 @@ apt::source { 'debian_testing':
   repos    => 'main contrib non-free',
   key      => {
     id     => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
   pin      => '-10',
 }
@@ -29,7 +29,7 @@ apt::source { 'debian_unstable':
   repos    => 'main contrib non-free',
   key      => {
     id     => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
   pin      => '-10',
 }
diff --git a/hiera.yaml b/hiera.yaml
new file mode 100644
index 0000000..545fff3
--- /dev/null
+++ b/hiera.yaml
@@ -0,0 +1,21 @@
+---
+version: 5
+
+defaults:  # Used for any hierarchy level that omits these keys.
+  datadir: data         # This path is relative to hiera.yaml's directory.
+  data_hash: yaml_data  # Use the built-in YAML backend.
+
+hierarchy:
+  - name: "osfamily/major release"
+    paths:
+        # Used to distinguish between Debian and Ubuntu
+      - "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
+      - "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
+        # Used for Solaris
+      - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
+  - name: "osfamily"
+    paths:
+      - "os/%{facts.os.name}.yaml"
+      - "os/%{facts.os.family}.yaml"
+  - name: 'common'
+    path: 'common.yaml'
diff --git a/lib/facter/apt_reboot_required.rb b/lib/facter/apt_reboot_required.rb
index 1e1650a..7656f70 100644
--- a/lib/facter/apt_reboot_required.rb
+++ b/lib/facter/apt_reboot_required.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # apt_reboot_required.rb
 Facter.add(:apt_reboot_required) do
   confine osfamily: 'Debian'
diff --git a/lib/facter/apt_update_last_success.rb b/lib/facter/apt_update_last_success.rb
index 9866a2b..84acec1 100644
--- a/lib/facter/apt_update_last_success.rb
+++ b/lib/facter/apt_update_last_success.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'facter'
 
 # This is derived from the file /var/lib/apt/periodic/update-success-stamp
diff --git a/lib/facter/apt_updates.rb b/lib/facter/apt_updates.rb
index 7a701c1..e3b17d9 100644
--- a/lib/facter/apt_updates.rb
+++ b/lib/facter/apt_updates.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 apt_package_updates = nil
 apt_dist_updates = nil
 
@@ -11,7 +13,7 @@ def get_updates(upgrade_option)
     unless apt_get_result.nil?
       apt_updates = [[], []]
       apt_get_result.each_line do |line|
-        next unless line =~ %r{^Inst\s}
+        next unless %r{^Inst\s}.match?(line)
         package = line.gsub(%r{^Inst\s([^\s]+)\s.*}, '\1').strip
         apt_updates[0].push(package)
         security_matches = [
@@ -26,66 +28,54 @@ def get_updates(upgrade_option)
       end
     end
   end
-
-  setcode do
-    if !apt_updates.nil? && apt_updates.length == 2
-      apt_updates != [[], []]
-    end
-  end
   apt_updates
 end
 
 Facter.add('apt_has_updates') do
   confine osfamily: 'Debian'
-  apt_package_updates = get_updates('upgrade')
+  setcode do
+    apt_package_updates = get_updates('upgrade')
+    if !apt_package_updates.nil? && apt_package_updates.length == 2
+      apt_package_updates != [[], []]
+    end
+  end
 end
 
 Facter.add('apt_has_dist_updates') do
   confine osfamily: 'Debian'
-  apt_dist_updates = get_updates('dist-upgrade')
+  setcode do
+    apt_dist_updates = get_updates('dist-upgrade')
+    if !apt_dist_updates.nil? && apt_dist_updates.length == 2
+      apt_dist_updates != [[], []]
+    end
+  end
 end
 
 Facter.add('apt_package_updates') do
   confine apt_has_updates: true
   setcode do
-    if Facter.version < '2.0.0'
-      apt_package_updates[0].join(',')
-    else
-      apt_package_updates[0]
-    end
+    apt_package_updates[0]
   end
 end
 
 Facter.add('apt_package_dist_updates') do
   confine apt_has_dist_updates: true
   setcode do
-    if Facter.version < '2.0.0'
-      apt_dist_updates[0].join(',')
-    else
-      apt_dist_updates[0]
-    end
+    apt_dist_updates[0]
   end
 end
 
 Facter.add('apt_package_security_updates') do
   confine apt_has_updates: true
   setcode do
-    if Facter.version < '2.0.0'
-      apt_package_updates[1].join(',')
-    else
-      apt_package_updates[1]
-    end
+    apt_package_updates[1]
   end
 end
 
 Facter.add('apt_package_security_dist_updates') do
   confine apt_has_dist_updates: true
   setcode do
-    if Facter.version < '2.0.0'
-      apt_dist_updates[1].join(',')
-    else
-      apt_dist_updates[1]
-    end
+    apt_dist_updates[1]
   end
 end
 
diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb
index 5a66e34..56f9a07 100644
--- a/lib/puppet/provider/apt_key/apt_key.rb
+++ b/lib/puppet/provider/apt_key/apt_key.rb
@@ -1,15 +1,9 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'net/ftp'
 require 'tempfile'
 
-if RUBY_VERSION == '1.8.7'
-  # Mothers cry, puppies die and Ruby 1.8.7's open-uri needs to be
-  # monkeypatched to support passing in :ftp_passive_mode.
-  require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
-                                     'puppet_x', 'apt_key', 'patch_openuri.rb'))
-  OpenURI::Options[:ftp_active_mode] = false
-end
-
 Puppet::Type.type(:apt_key).provide(:apt_key) do
   desc 'apt-key provider for apt_key resource'
 
@@ -19,7 +13,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
   commands   gpg: '/usr/bin/gpg'
 
   def self.instances
-    cli_args = ['adv', '--list-keys', '--with-colons', '--fingerprint', '--fixed-list-mode']
+    cli_args = ['adv', '--no-tty', '--list-keys', '--with-colons', '--fingerprint', '--fixed-list-mode']
 
     key_output = apt_key(cli_args).encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
 
@@ -134,7 +128,11 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
         # Only send basic auth if URL contains userinfo
         # Some webservers (e.g. Amazon S3) return code 400 if empty basic auth is sent
         if parsed_value.userinfo.nil?
-          key = parsed_value.read
+          key = if parsed_value.scheme == 'https' && resource[:weak_ssl] == true
+                  open(parsed_value, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE).read
+                else
+                  parsed_value.read
+                end
         else
           user_pass = parsed_value.userinfo.split(':')
           parsed_value.userinfo = ''
@@ -160,7 +158,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
     # confirm that the fingerprint from the file, matches the long key that is in the manifest
     if name.size == 40
       if File.executable? command(:gpg)
-        extracted_key = execute(["#{command(:gpg)} --with-fingerprint --with-colons #{file.path} | awk -F: '/^fpr:/ { print $10 }'"], failonfail: false)
+        extracted_key = execute(["#{command(:gpg)} --no-tty --with-fingerprint --with-colons #{file.path} | awk -F: '/^fpr:/ { print $10 }'"], failonfail: false)
         extracted_key = extracted_key.chomp
 
         found_match = false
@@ -170,7 +168,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
           end
         end
         unless found_match
-          raise(_('The id in your manifest %{_resource} and the fingerprint from content/source don\'t match. Check for an error in the id and content/source is legitimate.') % { _resource: resource[:name] }) # rubocop:disable Metrics/LineLength
+          raise(_('The id in your manifest %{_resource} and the fingerprint from content/source don\'t match. Check for an error in the id and content/source is legitimate.') % { _resource: resource[:name] }) # rubocop:disable Layout/LineLength
         end
       else
         warning('/usr/bin/gpg cannot be found for verification of the id.')
@@ -179,29 +177,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
     file
   end
 
-  # Update a key if it is expired
-  def update_expired_key
-    # Return without doing anything if refresh or expired is false
-    return unless resource[:refresh] == true && resource[:expired] == true
-
-    # Execute command to update key
-    command = []
-
-    unless resource[:source].nil? && resource[:content].nil?
-      raise(_('an unexpected condition occurred while trying to add the key: %{_resource}') % { _resource: resource[:id] })
-    end
-
-    # Breaking up the command like this is needed because it blows up
-    # if --recv-keys isn't the last argument.
-    command.push('adv', '--keyserver', resource[:server])
-    unless resource[:options].nil?
-      command.push('--keyserver-options', resource[:options])
-    end
-    command.push('--recv-keys', resource[:id])
-  end
-
   def exists?
-    update_expired_key
     # report expired keys as non-existing when refresh => true
     @property_hash[:ensure] == :present && !(resource[:refresh] && @property_hash[:expired])
   end
@@ -211,7 +187,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
     if resource[:source].nil? && resource[:content].nil?
       # Breaking up the command like this is needed because it blows up
       # if --recv-keys isn't the last argument.
-      command.push('adv', '--keyserver', resource[:server])
+      command.push('adv', '--no-tty', '--keyserver', resource[:server])
       unless resource[:options].nil?
         command.push('--keyserver-options', resource[:options])
       end
@@ -245,12 +221,6 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
 
   mk_resource_methods
 
-  # Needed until PUP-1470 is fixed and we can drop support for Puppet versions
-  # before that.
-  def expired
-    @property_hash[:expired]
-  end
-
   # Alias the setters of read-only properties
   # to the read_only function.
   alias_method :created=, :read_only
diff --git a/lib/puppet/type/apt_key.rb b/lib/puppet/type/apt_key.rb
index e192077..c78ba8f 100644
--- a/lib/puppet/type/apt_key.rb
+++ b/lib/puppet/type/apt_key.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'puppet/parameter/boolean'
 
@@ -68,7 +70,7 @@ Puppet::Type.newtype(:apt_key) do
     desc 'The key server to fetch the key from based on the ID. It can either be a domain name or url.'
     defaultto :'keyserver.ubuntu.com'
 
-    newvalues(%r{\A((hkp|http|https)://)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$})
+    newvalues(%r{\A((hkp|hkps|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?(\/[a-zA-Z\d\-_.]+)*\/?$})
   end
 
   newparam(:options) do
@@ -77,6 +79,12 @@ Puppet::Type.newtype(:apt_key) do
 
   newparam(:refresh, boolean: true, parent: Puppet::Parameter::Boolean) do
     desc 'When true, recreate an existing expired key'
+    defaultto false
+  end
+
+  newparam(:weak_ssl, boolean: true, parent: Puppet::Parameter::Boolean) do
+    desc 'When true and source uses https, accepts download of keys without SSL verification'
+    defaultto false
   end
 
   newproperty(:fingerprint) do
diff --git a/locales/config.yaml b/locales/config.yaml
deleted file mode 100644
index 3f64263..0000000
--- a/locales/config.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# This is the project-specific configuration file for setting up
-# fast_gettext for your project.
-gettext:
-  # This is used for the name of the .pot and .po files; they will be
-  # called <project_name>.pot?
-  project_name: puppetlabs-apt
-  # This is used in comments in the .pot and .po files to indicate what
-  # project the files belong to and should bea little more desctiptive than
-  # <project_name>
-  package_name: puppetlabs-apt
-  # The locale that the default messages in the .pot file are in
-  default_locale: en
-  # The email used for sending bug reports.
-  bugs_address: docs@puppet.com
-  # The holder of the copyright.
-  copyright_holder: Puppet, Inc.
-  # This determines which comments in code should be eligible for translation.
-  # Any comments that start with this string will be externalized. (Leave
-  # empty to include all.)
-  comments_tag: TRANSLATOR
-  # Patterns for +Dir.glob+ used to find all files that might contain
-  # translatable content, relative to the project root directory
-  source_files:
-      - './lib/**/*.rb'
-  
diff --git a/locales/ja/puppetlabs-apt.po b/locales/ja/puppetlabs-apt.po
deleted file mode 100644
index 59a0613..0000000
--- a/locales/ja/puppetlabs-apt.po
+++ /dev/null
@@ -1,275 +0,0 @@
-# #-#-#-#-#  accounts.pot (PACKAGE VERSION)  #-#-#-#-#
-# #-#-#-#-#  accounts.pot (PACKAGE VERSION)  #-#-#-#-#
-# #-#-#-#-#  puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2018 Puppet, Inc.
-# This file is distributed under the same license as the puppetlabs-apt package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
-#
-# #-#-#-#-#  puppetlabs-apt_metadata.pot (PACKAGE VERSION)  #-#-#-#-#
-#
-# #-#-#-#-#  puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2018 Puppet, Inc.
-# This file is distributed under the same license as the puppetlabs-apt package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
-#
-# #-#-#-#-#  puppetlabs-apt_metadata.pot (PACKAGE VERSION)  #-#-#-#-#
-#
-# #-#-#-#-#  puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2018 Puppet, Inc.
-# This file is distributed under the same license as the puppetlabs-apt package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
-#
-# #-#-#-#-#  puppetlabs-apt_metadata.pot (PACKAGE VERSION)  #-#-#-#-#
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"#-#-#-#-#  accounts.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"#-#-#-#-#  accounts.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"#-#-#-#-#  puppet.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-30 14:54:05 +0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.0.0\n"
-"#-#-#-#-#  puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598)  #-#-#-#-#\n"
-"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n"
-"\n"
-"Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2018-08-30 14:48+0100\n"
-"PO-Revision-Date: 2018-08-30 14:48+0100\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"#-#-#-#-#  puppetlabs-apt_metadata.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To:\n"
-"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.0.0\n"
-"#-#-#-#-#  puppet.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-30 14:54:05 +0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.0.0\n"
-"#-#-#-#-#  puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598)  #-#-#-#-#\n"
-"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n"
-"\n"
-"Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2018-08-30 14:48+0100\n"
-"PO-Revision-Date: 2018-08-30 14:48+0100\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"#-#-#-#-#  puppetlabs-apt_metadata.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To:\n"
-"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.0.0\n"
-"#-#-#-#-#  puppet.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-30 16:09:57 +0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.0.0\n"
-"#-#-#-#-#  puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598)  #-#-#-#-#\n"
-"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n"
-"\n"
-"Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2018-08-30 16:09+0100\n"
-"PO-Revision-Date: 2018-08-30 16:09+0100\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"#-#-#-#-#  puppetlabs-apt_metadata.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To:\n"
-"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.0.0\n"
-
-#. ./manifests/backports.pp:36
-msgid ""
-"If not on Debian or Ubuntu, you must explicitly pass location, release, "
-"repos, and key"
-msgstr ""
-"Īƒ ƞǿŧ ǿƞ Ḓḗƀīȧƞ ǿř Ŭƀŭƞŧŭ, ẏǿŭ ḿŭşŧ ḗẋƥŀīƈīŧŀẏ ƥȧşş ŀǿƈȧŧīǿƞ, řḗŀḗȧşḗ, "
-"řḗƥǿş, ȧƞḓ ķḗẏ"
-
-#. ./manifests/backports.pp:50
-msgid "pin must be either a string, number or hash"
-msgstr "ƥīƞ ḿŭşŧ ƀḗ ḗīŧħḗř ȧ şŧřīƞɠ, ƞŭḿƀḗř ǿř ħȧşħ"
-
-#. ./manifests/conf.pp:11
-msgid "Need to pass in content parameter"
-msgstr "Ƞḗḗḓ ŧǿ ƥȧşş īƞ ƈǿƞŧḗƞŧ ƥȧřȧḿḗŧḗř"
-
-#. ./manifests/init.pp:37 - ./manifests/params.pp:5
-msgid "This module only works on Debian or derivatives like Ubuntu"
-msgstr "Ŧħīş ḿǿḓŭŀḗ ǿƞŀẏ ẇǿřķş ǿƞ Ḓḗƀīȧƞ ǿř ḓḗřīṽȧŧīṽḗş ŀīķḗ Ŭƀŭƞŧŭ"
-
-#. ./manifests/params.pp:97
-msgid "Unable to determine value for fact os['name']"
-msgstr "Ŭƞȧƀŀḗ ŧǿ ḓḗŧḗřḿīƞḗ ṽȧŀŭḗ ƒǿř ƒȧƈŧ ǿş['ƞȧḿḗ']"
-
-#. ./manifests/pin.pp:52
-msgid "parameters release, origin, and version are mutually exclusive"
-msgstr "ƥȧřȧḿḗŧḗřş řḗŀḗȧşḗ, ǿřīɠīƞ, ȧƞḓ ṽḗřşīǿƞ ȧřḗ ḿŭŧŭȧŀŀẏ ḗẋƈŀŭşīṽḗ"
-
-#. ./manifests/pin.pp:56
-msgid "parameter version cannot be used in general form"
-msgstr "ƥȧřȧḿḗŧḗř ṽḗřşīǿƞ ƈȧƞƞǿŧ ƀḗ ŭşḗḓ īƞ ɠḗƞḗřȧŀ ƒǿřḿ"
-
-#. ./manifests/pin.pp:59
-msgid "parameters release and origin are mutually exclusive"
-msgstr "ƥȧřȧḿḗŧḗřş řḗŀḗȧşḗ ȧƞḓ ǿřīɠīƞ ȧřḗ ḿŭŧŭȧŀŀẏ ḗẋƈŀŭşīṽḗ"
-
-#. ./manifests/ppa.pp:10 - ./manifests/source.pp:25
-msgid "lsbdistcodename fact not available: release parameter required"
-msgstr "ŀşƀḓīşŧƈǿḓḗƞȧḿḗ ƒȧƈŧ ƞǿŧ ȧṽȧīŀȧƀŀḗ: řḗŀḗȧşḗ ƥȧřȧḿḗŧḗř řḗɋŭīřḗḓ"
-
-#. ./manifests/ppa.pp:14
-msgid "apt::ppa is not currently supported on Debian."
-msgstr "ȧƥŧ::ƥƥȧ īş ƞǿŧ ƈŭřřḗƞŧŀẏ şŭƥƥǿřŧḗḓ ǿƞ Ḓḗƀīȧƞ."
-
-#. ./manifests/setting.pp:11
-msgid "apt::setting cannot have both content and source"
-msgstr "ȧƥŧ::şḗŧŧīƞɠ ƈȧƞƞǿŧ ħȧṽḗ ƀǿŧħ ƈǿƞŧḗƞŧ ȧƞḓ şǿŭřƈḗ"
-
-#. ./manifests/setting.pp:15
-msgid "apt::setting needs either of content or source"
-msgstr "ȧƥŧ::şḗŧŧīƞɠ ƞḗḗḓş ḗīŧħḗř ǿƒ ƈǿƞŧḗƞŧ ǿř şǿŭřƈḗ"
-
-#. ./manifests/setting.pp:23
-msgid ""
-"apt::setting resource name/title must start with either 'conf-', 'pref-' or "
-"'list-'"
-msgstr ""
-"ȧƥŧ::şḗŧŧīƞɠ řḗşǿŭřƈḗ ƞȧḿḗ/title ḿŭşŧ şŧȧřŧ ẇīŧħ ḗīŧħḗř 'ƈǿƞƒ-', 'ƥřḗƒ-' ǿř "
-"'ŀīşŧ-'"
-
-#. ./manifests/setting.pp:29
-msgid "apt::setting priority must be an integer or a zero-padded integer"
-msgstr "ȧƥŧ::şḗŧŧīƞɠ ƥřīǿřīŧẏ ḿŭşŧ ƀḗ ȧƞ īƞŧḗɠḗř ǿř ȧ zḗřǿ-ƥȧḓḓḗḓ īƞŧḗɠḗř"
-
-#. ./manifests/source.pp:33
-msgid "cannot create a source entry without specifying a location"
-msgstr "ƈȧƞƞǿŧ ƈřḗȧŧḗ ȧ şǿŭřƈḗ ḗƞŧřẏ ẇīŧħǿŭŧ şƥḗƈīƒẏīƞɠ ȧ ŀǿƈȧŧīǿƞ"
-
-#. ./manifests/source.pp:47
-msgid "key hash must contain at least an id entry"
-msgstr "ķḗẏ ħȧşħ ḿŭşŧ ƈǿƞŧȧīƞ ȧŧ ŀḗȧşŧ ȧƞ īḓ ḗƞŧřẏ"
-
-#. ./manifests/source.pp:86
-msgid "Received invalid value for pin parameter"
-msgstr "Řḗƈḗīṽḗḓ īƞṽȧŀīḓ ṽȧŀŭḗ ƒǿř ƥīƞ ƥȧřȧḿḗŧḗř"
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:122
-msgid "The file %{_value} does not exist"
-msgstr "Ŧħḗ ƒīŀḗ %{_value} ḓǿḗş ƞǿŧ ḗẋīşŧ"
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:218
-msgid "This is a read-only property."
-msgstr "Ŧħīş īş ȧ řḗȧḓ-ǿƞŀẏ ƥřǿƥḗřŧẏ."
-
-#: ../lib/puppet/type/apt_key.rb:23
-msgid "The properties content and source are mutually exclusive."
-msgstr "Ŧħḗ ƥřǿƥḗřŧīḗş ƈǿƞŧḗƞŧ ȧƞḓ şǿŭřƈḗ ȧřḗ ḿŭŧŭȧŀŀẏ ḗẋƈŀŭşīṽḗ."
-
-#. metadata.json
-#: .summary
-msgid ""
-"Provides an interface for managing Apt source, key, and definitions with "
-"Puppet"
-msgstr ""
-"Ƥřǿṽīḓḗş ȧƞ īƞŧḗřƒȧƈḗ ƒǿř ḿȧƞȧɠīƞɠ Ȧƥŧ şǿŭřƈḗ, ķḗẏ, ȧƞḓ ḓḗƒīƞīŧīǿƞş ẇīŧħ "
-"Ƥŭƥƥḗŧ"
-
-#. ./manifests/params.pp:97
-msgid "Unable to determine value for fact os[\"name\"]"
-msgstr "Ŭƞȧƀŀḗ ŧǿ ḓḗŧḗřḿīƞḗ ṽȧŀŭḗ ƒǿř ƒȧƈŧ ǿş[\"ƞȧḿḗ\"]"
-
-#. ./manifests/key.pp:29
-msgid "key with id %{_id} already ensured as absent"
-msgstr "ķḗẏ ẇīŧħ īḓ %{_id} ȧŀřḗȧḓẏ ḗƞşŭřḗḓ ȧş ȧƀşḗƞŧ"
-
-#. ./manifests/key.pp:62
-msgid "key with id %{_id} already ensured as present"
-msgstr "ķḗẏ ẇīŧħ īḓ %{_id} ȧŀřḗȧḓẏ ḗƞşŭřḗḓ ȧş ƥřḗşḗƞŧ"
-
-#. ./manifests/key.pp:78
-msgid "Invalid 'ensure' value '%{_ensure}' for apt::key"
-msgstr "Īƞṽȧŀīḓ 'ḗƞşŭřḗ' ṽȧŀŭḗ '%{_ensure}' ƒǿř ȧƥŧ::ķḗẏ"
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:142
-msgid "%{_e} for %{_resource}"
-msgstr "%{_e} ƒǿř %{_resource}"
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:144
-msgid "could not resolve %{_resource}"
-msgstr "ƈǿŭŀḓ ƞǿŧ řḗşǿŀṽḗ %{_resource}"
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:171
-msgid ""
-"The id in your manifest %{_resource} and the fingerprint from content/source "
-"don't match. Check for an error in the id and content/source is legitimate."
-msgstr ""
-"Ŧħḗ īḓ īƞ ẏǿŭř ḿȧƞīƒḗşŧ %{_resource} ȧƞḓ ŧħḗ ƒīƞɠḗřƥřīƞŧ ƒřǿḿ ƈǿƞŧḗƞŧ/source "
-"ḓǿƞ'ŧ ḿȧŧƈħ. Ƈħḗƈķ ƒǿř ȧƞ ḗřřǿř īƞ ŧħḗ īḓ ȧƞḓ ƈǿƞŧḗƞŧ/source īş ŀḗɠīŧīḿȧŧḗ."
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:202
-msgid ""
-"an unexpected condition occurred while trying to add the key: %{_resource}"
-msgstr ""
-"ȧƞ ŭƞḗẋƥḗƈŧḗḓ ƈǿƞḓīŧīǿƞ ǿƈƈŭřřḗḓ ẇħīŀḗ ŧřẏīƞɠ ŧǿ ȧḓḓ ŧħḗ ķḗẏ: %{_resource}"
-
-#: ../lib/puppet/type/apt_key.rb:26
-msgid "The id should be a full fingerprint (40 characters), see README."
-msgstr "Ŧħḗ īḓ şħǿŭŀḓ ƀḗ ȧ ƒŭŀŀ ƒīƞɠḗřƥřīƞŧ (40 ƈħȧřȧƈŧḗřş), şḗḗ ŘḖȦḒḾḖ."
diff --git a/locales/puppetlabs-apt.pot b/locales/puppetlabs-apt.pot
deleted file mode 100644
index 5701be9..0000000
--- a/locales/puppetlabs-apt.pot
+++ /dev/null
@@ -1,177 +0,0 @@
-# #-#-#-#-#  puppetlabs-apt.pot (puppetlabs-apt 6.0.0-27-gbb0f842)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2018 Puppet, Inc.
-# This file is distributed under the same license as the puppetlabs-apt package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
-#
-# #-#-#-#-#  puppetlabs-apt_metadata.pot (PACKAGE VERSION)  #-#-#-#-#
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"#-#-#-#-#  puppet.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 09:17:33 +0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.0.0\n"
-"#-#-#-#-#  puppetlabs-apt.pot (puppetlabs-apt 6.0.0-27-gbb0f842)  #-#-#-#-#\n"
-"Project-Id-Version: puppetlabs-apt 6.0.0-27-gbb0f842\n"
-"\n"
-"Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2018-09-21 09:27+0100\n"
-"PO-Revision-Date: 2018-09-21 09:27+0100\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"#-#-#-#-#  puppetlabs-apt_metadata.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To:\n"
-"POT-Creation-Date: 2018-09-21T09:17:39+01:00\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.0.0\n"
-
-#. ./manifests/backports.pp:69
-msgid ""
-"If not on Debian or Ubuntu, you must explicitly pass location, release, "
-"repos, and key"
-msgstr ""
-
-#. ./manifests/backports.pp:95
-msgid "pin must be either a string, number or hash"
-msgstr ""
-
-#. ./manifests/conf.pp:25
-msgid "Need to pass in content parameter"
-msgstr ""
-
-#. ./manifests/init.pp:143 ./manifests/params.pp:8
-msgid "This module only works on Debian or derivatives like Ubuntu"
-msgstr ""
-
-#. ./manifests/key.pp:47
-msgid "key with id %{_id} already ensured as absent"
-msgstr ""
-
-#. ./manifests/key.pp:81
-msgid "key with id %{_id} already ensured as present"
-msgstr ""
-
-#. ./manifests/key.pp:97
-msgid "Invalid 'ensure' value '%{_ensure}' for apt::key"
-msgstr ""
-
-#. ./manifests/params.pp:100
-msgid "Unable to determine value for fact os[\"name\"]"
-msgstr ""
-
-#. ./manifests/pin.pp:84
-msgid "parameters release, origin, and version are mutually exclusive"
-msgstr ""
-
-#. ./manifests/pin.pp:88
-msgid "parameter version cannot be used in general form"
-msgstr ""
-
-#. ./manifests/pin.pp:91
-msgid "parameters release and origin are mutually exclusive"
-msgstr ""
-
-#. ./manifests/ppa.pp:30 ./manifests/source.pp:79
-msgid "lsbdistcodename fact not available: release parameter required"
-msgstr ""
-
-#. ./manifests/ppa.pp:34
-msgid "apt::ppa is not currently supported on Debian."
-msgstr ""
-
-#. ./manifests/setting.pp:31
-msgid "apt::setting cannot have both content and source"
-msgstr ""
-
-#. ./manifests/setting.pp:35
-msgid "apt::setting needs either of content or source"
-msgstr ""
-
-#. ./manifests/setting.pp:43
-msgid ""
-"apt::setting resource name/title must start with either 'conf-', 'pref-' or "
-"'list-'"
-msgstr ""
-
-#. ./manifests/setting.pp:49
-msgid "apt::setting priority must be an integer or a zero-padded integer"
-msgstr ""
-
-#. ./manifests/source.pp:87
-msgid "cannot create a source entry without specifying a location"
-msgstr ""
-
-#. ./manifests/source.pp:101
-msgid "key hash must contain at least an id entry"
-msgstr ""
-
-#. ./manifests/source.pp:140
-msgid "Received invalid value for pin parameter"
-msgstr ""
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:124
-msgid "The file %{_value} does not exist"
-msgstr ""
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:144
-msgid "%{_e} for %{_resource}"
-msgstr ""
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:146
-msgid "could not resolve %{_resource}"
-msgstr ""
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:173
-msgid ""
-"The id in your manifest %{_resource} and the fingerprint from content/source "
-"don't match. Check for an error in the id and content/source is legitimate."
-msgstr ""
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:191
-#: ../lib/puppet/provider/apt_key/apt_key.rb:227
-msgid ""
-"an unexpected condition occurred while trying to add the key: %{_resource}"
-msgstr ""
-
-#: ../lib/puppet/provider/apt_key/apt_key.rb:243
-msgid "This is a read-only property."
-msgstr ""
-
-#: ../lib/puppet/type/apt_key.rb:27
-msgid "ensure => absent and refresh => true are mutually exclusive"
-msgstr ""
-
-#: ../lib/puppet/type/apt_key.rb:30
-msgid "The properties content and source are mutually exclusive."
-msgstr ""
-
-#: ../lib/puppet/type/apt_key.rb:33
-msgid "The id should be a full fingerprint (40 characters), see README."
-msgstr ""
-
-#. metadata.json
-#: .summary
-msgid ""
-"Provides an interface for managing Apt source, key, and definitions with "
-"Puppet"
-msgstr ""
diff --git a/manifests/backports.pp b/manifests/backports.pp
index 0fa6958..080c83d 100644
--- a/manifests/backports.pp
+++ b/manifests/backports.pp
@@ -1,18 +1,18 @@
 # @summary Manages backports.
 #
-# @example Set up a backport for linuxmint qiana
-#   apt::backports { 'qiana':
+# @example Set up a backport source for Linux Mint qiana
+#   class { 'apt::backports':
 #     location => 'http://us.archive.ubuntu.com/ubuntu',
 #     release  => 'trusty-backports',
 #     repos    => 'main universe multiverse restricted',
 #     key      => {
 #       id     => '630239CC130E1A7FD81A27B140976EAF437D05B5',
-#       server => 'hkps.pool.sks-keyservers.net',
+#       server => 'keyserver.ubuntu.com',
 #     },
 #   }
 #
 # @param location
-#   Specifies an Apt repository containing the backports to manage. Valid options: a string containing a URL. Default value for Debian and 
+#   Specifies an Apt repository containing the backports to manage. Valid options: a string containing a URL. Default value for Debian and
 #   Ubuntu varies:
 #
 #   - Debian: 'http://deb.debian.org/debian'
@@ -20,20 +20,20 @@
 #   - Ubuntu: 'http://archive.ubuntu.com/ubuntu'
 #
 # @param release
-#   Specifies a distribution of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file. 
-#   Default: on Debian and Ubuntu, '${lsbdistcodename}-backports'. We recommend keeping this default, except on other operating 
+#   Specifies a distribution of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file.
+#   Default: on Debian and Ubuntu, `${facts['os']['distro']['codename']}-backports`. We recommend keeping this default, except on other operating
 #   systems.
 #
 # @param repos
-#   Specifies a component of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file. 
+#   Specifies a component of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file.
 #   Default value for Debian and Ubuntu varies:
-#   
+#
 #   - Debian: 'main contrib non-free'
 #
 #   - Ubuntu: 'main universe multiverse restricted'
 #
 # @param key
-#   Specifies a key to authenticate the backports. Valid options: a string to be passed to the id parameter of the apt::key defined type, or a 
+#   Specifies a key to authenticate the backports. Valid options: a string to be passed to the id parameter of the apt::key defined type, or a
 #   hash of parameter => value pairs to be passed to apt::key's id, server, content, source, and/or options parameters. Default value
 #   for Debian and Ubuntu varies:
 #
@@ -42,16 +42,22 @@
 #   - Ubuntu: '630239CC130E1A7FD81A27B140976EAF437D05B5'
 #
 # @param pin
-#   Specifies a pin priority for the backports. Valid options: a number or string to be passed to the `id` parameter of the `apt::pin` defined 
+#   Specifies a pin priority for the backports. Valid options: a number or string to be passed to the `id` parameter of the `apt::pin` defined
 #   type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters.
 #
+# @param include
+#   Specifies whether to include 'deb' or 'src', or both.
+#
 class apt::backports (
   Optional[String] $location                    = undef,
   Optional[String] $release                     = undef,
   Optional[String] $repos                       = undef,
   Optional[Variant[String, Hash]] $key          = undef,
   Optional[Variant[Integer, String, Hash]] $pin = 200,
-){
+  Optional[Variant[Hash]] $include              = {},
+) {
+  include apt
+
   if $location {
     $_location = $location
   }
@@ -64,16 +70,16 @@ class apt::backports (
   if $key {
     $_key = $key
   }
-  if (!($facts['lsbdistid'] == 'Debian' or $facts['lsbdistid'] == 'Ubuntu')) {
+  if (!($facts['os']['name'] == 'Debian' or $facts['os']['name'] == 'Ubuntu')) {
     unless $location and $release and $repos and $key {
-      fail(translate('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key'))
+      fail('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key')
     }
   }
   unless $location {
     $_location = $::apt::backports['location']
   }
   unless $release {
-    $_release = "${facts['lsbdistcodename']}-backports"
+    $_release = "${facts['os']['distro']['codename']}-backports"
   }
   unless $repos {
     $_repos = $::apt::backports['repos']
@@ -92,13 +98,14 @@ class apt::backports (
       'release'  => $_release,
     }
   } else {
-    fail(translate('pin must be either a string, number or hash'))
+    fail('pin must be either a string, number or hash')
   }
 
   apt::source { 'backports':
     location => $_location,
     release  => $_release,
     repos    => $_repos,
+    include  => $include,
     key      => $_key,
     pin      => $_pin,
   }
diff --git a/manifests/conf.pp b/manifests/conf.pp
index 9c1a59e..c27f0c1 100644
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -22,7 +22,7 @@ define apt::conf (
 
   unless $ensure == 'absent' {
     unless $content {
-      fail(translate('Need to pass in content parameter'))
+      fail('Need to pass in content parameter')
     }
   }
 
diff --git a/manifests/init.pp b/manifests/init.pp
index f3472ac..49f9309 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,11 +6,14 @@
 #   Specifies the provider that should be used by apt::update.
 #
 # @param keyserver
-#   Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or 
+#   Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or
 #   hkp://).
 #
+# @param key_options
+#   Specifies the default options for apt::key resources.
+#
 # @param ppa_options
-#   Supplies options to be passed to the `add-apt-repository` command. 
+#   Supplies options to be passed to the `add-apt-repository` command.
 #
 # @param ppa_package
 #   Names the package that provides the `apt-add-repository` command.
@@ -18,13 +21,13 @@
 # @param backports
 #   Specifies some of the default parameters used by apt::backports. Valid options: a hash made up from the following keys:
 #
-# @option backports [String] :location 
+# @option backports [String] :location
 #   See apt::backports for documentation.
 #
-# @option backports [String] :repos 
+# @option backports [String] :repos
 #   See apt::backports for documentation.
 #
-# @option backports [String] :key 
+# @option backports [String] :key
 #   See apt::backports for documentation.
 #
 # @param confs
@@ -34,9 +37,9 @@
 #   Configures various update settings. Valid options: a hash made up from the following keys:
 #
 # @option update [String] :frequency
-#   Specifies how often to run `apt-get update`. If the exec resource `apt_update` is notified, `apt-get update` runs regardless of this value. 
-#   Valid options: 'always' (at every Puppet run); 'daily' (if the value of `apt_update_last_success` is less than current epoch time minus 86400); 
-#   'weekly' (if the value of `apt_update_last_success` is less than current epoch time minus 604800); and 'reluctantly' (only if the exec resource 
+#   Specifies how often to run `apt-get update`. If the exec resource `apt_update` is notified, `apt-get update` runs regardless of this value.
+#   Valid options: 'always' (at every Puppet run); 'daily' (if the value of `apt_update_last_success` is less than current epoch time minus 86400);
+#   'weekly' (if the value of `apt_update_last_success` is less than current epoch time minus 604800); and 'reluctantly' (only if the exec resource
 #   `apt_update` is notified). Default: 'reluctantly'.
 #
 # @option update [Integer] :loglevel
@@ -81,33 +84,43 @@
 # @param settings
 #   Creates new `apt::setting` resources. Valid options: a hash to be passed to the create_resources function linked above.
 #
+# @param manage_auth_conf
+#   Specifies whether to manage the /etc/apt/auth.conf file. When true, the file will be overwritten with the entries specified in
+#   the auth_conf_entries parameter. When false, the file will be ignored (note that this does not set the file to absent.
+#
 # @param auth_conf_entries
-#   An optional array of login configuration settings (hashes) that are recorded in the file /etc/apt/auth.conf. This file has a netrc-like 
-#   format (similar to what curl uses) and contains the login configuration for APT sources and proxies that require authentication. See 
-#   https://manpages.debian.org/testing/apt/apt_auth.conf.5.en.html for details. If specified each hash must contain the keys machine, login and 
-#   password and no others.
+#   An optional array of login configuration settings (hashes) that are recorded in the file /etc/apt/auth.conf. This file has a netrc-like
+#   format (similar to what curl uses) and contains the login configuration for APT sources and proxies that require authentication. See
+#   https://manpages.debian.org/testing/apt/apt_auth.conf.5.en.html for details. If specified each hash must contain the keys machine, login and
+#   password and no others. Specifying manage_auth_conf and not specifying this parameter will set /etc/apt/auth.conf to absent.
+#
+# @param auth_conf_owner
+#   The owner of the file /etc/apt/auth.conf. Default: '_apt' or 'root' on old releases.
 #
 # @param root
 #   Specifies root directory of Apt executable.
 #
 # @param sources_list
-#   Specifies the path of the sources_list file to use. 
+#   Specifies the path of the sources_list file to use.
 #
 # @param sources_list_d
-#   Specifies the path of the sources_list.d file to use. 
+#   Specifies the path of the sources_list.d file to use.
 #
 # @param conf_d
-#   Specifies the path of the conf.d file to use. 
+#   Specifies the path of the conf.d file to use.
 #
 # @param preferences
-#   Specifies the path of the preferences file to use. 
+#   Specifies the path of the preferences file to use.
 #
 # @param preferences_d
-#   Specifies the path of the preferences.d file to use. 
+#   Specifies the path of the preferences.d file to use.
 #
 # @param config_files
 #   A hash made up of the various configuration files used by Apt.
 #
+# @param sources_list_force
+#   Specifies whether to perform force purge or delete. Default false.
+#
 class apt (
   Hash $update_defaults         = $apt::params::update_defaults,
   Hash $purge_defaults          = $apt::params::purge_defaults,
@@ -115,6 +128,7 @@ class apt (
   Hash $include_defaults        = $apt::params::include_defaults,
   String $provider              = $apt::params::provider,
   String $keyserver             = $apt::params::keyserver,
+  Optional[String] $key_options = $apt::params::key_options,
   Optional[String] $ppa_options = $apt::params::ppa_options,
   Optional[String] $ppa_package = $apt::params::ppa_package,
   Optional[Hash] $backports     = $apt::params::backports,
@@ -127,20 +141,31 @@ class apt (
   Hash $ppas                    = $apt::params::ppas,
   Hash $pins                    = $apt::params::pins,
   Hash $settings                = $apt::params::settings,
+  Boolean $manage_auth_conf     = $apt::params::manage_auth_conf,
   Array[Apt::Auth_conf_entry]
     $auth_conf_entries          = $apt::params::auth_conf_entries,
+  String $auth_conf_owner       = $apt::params::auth_conf_owner,
   String $root                  = $apt::params::root,
   String $sources_list          = $apt::params::sources_list,
   String $sources_list_d        = $apt::params::sources_list_d,
   String $conf_d                = $apt::params::conf_d,
   String $preferences           = $apt::params::preferences,
   String $preferences_d         = $apt::params::preferences_d,
+  String $apt_conf_d            = $apt::params::apt_conf_d,
   Hash $config_files            = $apt::params::config_files,
-  Hash $source_key_defaults     = $apt::params::source_key_defaults,
+  Boolean $sources_list_force   = $apt::params::sources_list_force,
+
+  Hash $source_key_defaults = {
+    'server'  => $keyserver,
+    'options' => undef,
+    'content' => undef,
+    'source'  => undef,
+  }
+
 ) inherits apt::params {
 
-  if $facts['osfamily'] != 'Debian' {
-    fail(translate('This module only works on Debian or derivatives like Ubuntu'))
+  if $facts['os']['family'] != 'Debian' {
+    fail('This module only works on Debian or derivatives like Ubuntu')
   }
 
   if $update['frequency'] {
@@ -171,9 +196,37 @@ class apt (
   if $purge['preferences.d'] {
     assert_type(Boolean, $purge['preferences.d'])
   }
+  if $sources_list_force {
+    assert_type(Boolean, $sources_list_force)
+  }
+  if $purge['apt.conf.d'] {
+    assert_type(Boolean, $purge['apt.conf.d'])
+  }
 
   $_purge = merge($::apt::purge_defaults, $purge)
-  $_proxy = merge($apt::proxy_defaults, $proxy)
+
+  if $proxy['perhost'] {
+    $_perhost = $proxy['perhost'].map |$item| {
+      $_item = merge($apt::proxy_defaults, $item)
+      $_scheme = $_item['https'] ? {
+        true    => 'https',
+        default => 'http' }
+      $_port = $_item['port'] ? {
+        Integer => ":${_item['port']}",
+        default => ''
+      }
+      $_target = $_item['direct'] ? {
+        true    => 'DIRECT',
+        default => "${_scheme}://${_item['host']}${_port}/" }
+      merge($item, {
+        'scheme' => $_scheme,
+        'target' => $_target })
+    }
+  } else {
+    $_perhost = {}
+  }
+
+  $_proxy = merge($apt::proxy_defaults, $proxy, { 'perhost' => $_perhost } )
 
   $confheadertmp = epp('apt/_conf_header.epp')
   $proxytmp = epp('apt/proxy.epp', {'proxies' => $_proxy})
@@ -187,10 +240,27 @@ class apt (
     }
   }
 
-  $sources_list_content = $_purge['sources.list'] ? {
-    true    => "# Repos managed by puppet.\n",
-    default => undef,
+  if $sources_list_force {
+    $sources_list_ensure = $_purge['sources.list'] ? {
+      true    => absent,
+      default  => file,
+    }
+    $sources_list_content = $_purge['sources.list'] ? {
+      true    => nil,
+      default => undef,
+    }
   }
+  else
+    {
+    $sources_list_ensure = $_purge['sources.list'] ? {
+      true    => file,
+      default => file,
+    }
+    $sources_list_content = $_purge['sources.list'] ? {
+      true    => "# Repos managed by puppet.\n",
+      default => undef,
+    }
+    }
 
   $preferences_ensure = $_purge['preferences'] ? {
     true    => absent,
@@ -209,11 +279,10 @@ class apt (
   }
 
   file { 'sources.list':
-    ensure  => file,
+    ensure  => $sources_list_ensure,
     path    => $::apt::sources_list,
     owner   => root,
     group   => root,
-    mode    => '0644',
     content => $sources_list_content,
     notify  => Class['apt::update'],
   }
@@ -223,7 +292,6 @@ class apt (
     path    => $::apt::sources_list_d,
     owner   => root,
     group   => root,
-    mode    => '0644',
     purge   => $_purge['sources.list.d'],
     recurse => $_purge['sources.list.d'],
     notify  => Class['apt::update'],
@@ -234,7 +302,6 @@ class apt (
     path   => $::apt::preferences,
     owner  => root,
     group  => root,
-    mode   => '0644',
     notify => Class['apt::update'],
   }
 
@@ -243,12 +310,21 @@ class apt (
     path    => $::apt::preferences_d,
     owner   => root,
     group   => root,
-    mode    => '0644',
     purge   => $_purge['preferences.d'],
     recurse => $_purge['preferences.d'],
     notify  => Class['apt::update'],
   }
 
+  file { 'apt.conf.d':
+    ensure  => directory,
+    path    => $::apt::apt_conf_d,
+    owner   => root,
+    group   => root,
+    purge   => $_purge['apt.conf.d'],
+    recurse => $_purge['apt.conf.d'],
+    notify  => Class['apt::update'],
+  }
+
   if $confs {
     create_resources('apt::conf', $confs)
   }
@@ -269,20 +345,22 @@ class apt (
     create_resources('apt::setting', $settings)
   }
 
-  $auth_conf_ensure = $auth_conf_entries ? {
-    []      => 'absent',
-    default => 'present',
-  }
+  if $manage_auth_conf {
+    $auth_conf_ensure = $auth_conf_entries ? {
+      []      => 'absent',
+      default => 'present',
+    }
 
-  $auth_conf_tmp = epp('apt/auth_conf.epp')
+    $auth_conf_tmp = epp('apt/auth_conf.epp')
 
-  file { '/etc/apt/auth.conf':
-    ensure  => $auth_conf_ensure,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0600',
-    content => "${confheadertmp}${auth_conf_tmp}",
-    notify  => Class['apt::update'],
+    file { '/etc/apt/auth.conf':
+      ensure  => $auth_conf_ensure,
+      owner   => $auth_conf_owner,
+      group   => 'root',
+      mode    => '0600',
+      content => Sensitive("${confheadertmp}${auth_conf_tmp}"),
+      notify  => Class['apt::update'],
+    }
   }
 
   # manage pins if present
@@ -291,5 +369,5 @@ class apt (
   }
 
   # required for adding GPG keys on Debian 9 (and derivatives)
-  ensure_packages(['dirmngr'])
+  ensure_packages(['gnupg'])
 }
diff --git a/manifests/key.pp b/manifests/key.pp
index 70e3e5f..4848763 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -6,7 +6,7 @@
 # @example Declare Apt key for apt.puppetlabs.com source
 #   apt::key { 'puppetlabs':
 #     id      => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-#     server  => 'hkps.pool.sks-keyservers.net',
+#     server  => 'keyserver.ubuntu.com',
 #     options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
 #   }
 #
@@ -26,48 +26,53 @@
 #   an absolute path.
 #
 # @param server
-#   Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or 
-#   hkp://).
+#   Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://,
+#   hkp:// or hkps://). The hkps:// protocol is currently only supported on Ubuntu 18.04.
+#
+# @param weak_ssl
+#    Specifies whether strict SSL verification on a https URL should be disabled. Valid options: true or false.
 #
 # @param options
 #   Passes additional options to `apt-key adv --keyserver-options`.
 #
 define apt::key (
-  Pattern[/\A(0x)?[0-9a-fA-F]{8}\Z/, /\A(0x)?[0-9a-fA-F]{16}\Z/, /\A(0x)?[0-9a-fA-F]{40}\Z/] $id = $title,
-  Enum['present', 'absent', 'refreshed'] $ensure                                                 = present,
-  Optional[String] $content                                                                      = undef,
-  Optional[Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/]] $source                            = undef,
-  Pattern[/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/] $server  = $::apt::keyserver,
-  Optional[String] $options                                                                      = undef,
+  Pattern[/\A(0x)?[0-9a-fA-F]{8}\Z/, /\A(0x)?[0-9a-fA-F]{16}\Z/, /\A(0x)?[0-9a-fA-F]{40}\Z/] $id                        = $title,
+  Enum['present', 'absent', 'refreshed'] $ensure                                                                        = present,
+  Optional[String] $content                                                                                             = undef,
+  Optional[Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/]] $source                                                   = undef,
+  Pattern[/\A((hkp|hkps|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?(\/[a-zA-Z\d\-_.]+)*\/?$/] $server = $::apt::keyserver,
+  Boolean $weak_ssl                                                                                                     = false,
+  Optional[String] $options                                                                                             = $::apt::key_options,
   ) {
 
   case $ensure {
     /^(refreshed|present)$/: {
       if defined(Anchor["apt_key ${id} absent"]){
-        fail(translate('key with id %{_id} already ensured as absent'),{'_id' => id})
+        fail("key with id ${id} already ensured as absent")
       }
 
       if !defined(Anchor["apt_key ${id} present"]) {
         apt_key { $title:
-          ensure  => present,
-          refresh => $ensure == 'refreshed',
-          id      => $id,
-          source  => $source,
-          content => $content,
-          server  => $server,
-          options => $options,
+          ensure   => present,
+          refresh  => $ensure == 'refreshed',
+          id       => $id,
+          source   => $source,
+          content  => $content,
+          server   => $server,
+          weak_ssl => $weak_ssl,
+          options  => $options,
         } -> anchor { "apt_key ${id} present": }
 
         case $facts['os']['name'] {
           'Debian': {
             if versioncmp($facts['os']['release']['major'], '9') >= 0 {
-              ensure_packages(['dirmngr'])
+              ensure_packages(['gnupg'])
               Apt::Key<| title == $title |>
             }
           }
           'Ubuntu': {
             if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
-              ensure_packages(['dirmngr'])
+              ensure_packages(['gnupg'])
               Apt::Key<| title == $title |>
             }
           }
@@ -78,23 +83,24 @@ define apt::key (
 
     absent: {
       if defined(Anchor["apt_key ${id} present"]){
-        fail(translate('key with id %{_id} already ensured as present', {'_id' => id}))
+        fail("key with id ${id} already ensured as present")
       }
 
       if !defined(Anchor["apt_key ${id} absent"]){
         apt_key { $title:
-          ensure  => $ensure,
-          id      => $id,
-          source  => $source,
-          content => $content,
-          server  => $server,
-          options => $options,
+          ensure   => $ensure,
+          id       => $id,
+          source   => $source,
+          content  => $content,
+          server   => $server,
+          weak_ssl => $weak_ssl,
+          options  => $options,
         } -> anchor { "apt_key ${id} absent": }
       }
     }
 
     default: {
-      fail translate('Invalid \'ensure\' value \'%{_ensure}\' for apt::key', {'_ensure' => ensure})
+      fail("Invalid \'ensure\' value \'${ensure}\' for apt::key")
     }
   }
 }
diff --git a/manifests/mark.pp b/manifests/mark.pp
new file mode 100644
index 0000000..dfad6b8
--- /dev/null
+++ b/manifests/mark.pp
@@ -0,0 +1,24 @@
+# @summary Manages apt-mark settings
+#
+# @param setting
+#   auto, manual, hold, unhold
+#   specifies the behavior of apt in case of no more dependencies installed
+#   https://manpages.debian.org/stable/apt/apt-mark.8.en.html
+#
+define apt::mark (
+  Enum['auto','manual','hold','unhold'] $setting,
+) {
+  case $setting {
+    'unhold': {
+      $unless_cmd = undef
+    }
+    default: {
+      $unless_cmd = "/usr/bin/apt-mark show${setting} ${title} | /bin/fgrep -qs ${title}"
+    }
+  }
+  exec { "/usr/bin/apt-mark ${setting} ${title}":
+    onlyif => "/usr/bin/dpkg -l ${title}",
+    unless => $unless_cmd,
+  }
+}
+
diff --git a/manifests/params.pp b/manifests/params.pp
index ae26a7d..58ce9ed 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,32 +1,36 @@
 # @summary Provides defaults for the Apt module parameters.
-# 
+#
 # @api private
 #
 class apt::params {
 
-  if $::osfamily != 'Debian' {
-    fail(translate('This module only works on Debian or derivatives like Ubuntu'))
+  if $facts['os']['family'] != 'Debian' {
+    fail('This module only works on Debian or derivatives like Ubuntu')
   }
 
-  $root           = '/etc/apt'
-  $provider       = '/usr/bin/apt-get'
-  $sources_list   = "${root}/sources.list"
-  $sources_list_d = "${root}/sources.list.d"
-  $trusted_gpg_d  = "${root}/trusted.gpg.d"
-  $conf_d         = "${root}/apt.conf.d"
-  $preferences    = "${root}/preferences"
-  $preferences_d  = "${root}/preferences.d"
-  $keyserver      = 'keyserver.ubuntu.com'
-  $confs          = {}
-  $update         = {}
-  $purge          = {}
-  $proxy          = {}
-  $sources        = {}
-  $keys           = {}
-  $ppas           = {}
-  $pins           = {}
-  $settings       = {}
-  $auth_conf_entries = []
+  $root                 = '/etc/apt'
+  $provider             = '/usr/bin/apt-get'
+  $sources_list         = "${root}/sources.list"
+  $sources_list_force   = false
+  $sources_list_d       = "${root}/sources.list.d"
+  $trusted_gpg_d        = "${root}/trusted.gpg.d"
+  $conf_d               = "${root}/apt.conf.d"
+  $preferences          = "${root}/preferences"
+  $preferences_d        = "${root}/preferences.d"
+  $apt_conf_d           = "${root}/apt.conf.d"
+  $keyserver            = 'keyserver.ubuntu.com'
+  $key_options          = undef
+  $confs                = {}
+  $update               = {}
+  $purge                = {}
+  $proxy                = {}
+  $sources              = {}
+  $keys                 = {}
+  $ppas                 = {}
+  $pins                 = {}
+  $settings             = {}
+  $manage_auth_conf     = true
+  $auth_conf_entries    = []
 
   $config_files = {
     'conf'   => {
@@ -51,11 +55,12 @@ class apt::params {
   }
 
   $proxy_defaults = {
-    'ensure' => undef,
-    'host'   => undef,
-    'port'   => 8080,
-    'https'  => false,
-    'direct' => false,
+    'ensure'     => undef,
+    'host'       => undef,
+    'port'       => 8080,
+    'https'      => false,
+    'https_acng' => false,
+    'direct'     => false,
   }
 
   $purge_defaults = {
@@ -63,13 +68,7 @@ class apt::params {
     'sources.list.d' => false,
     'preferences'    => false,
     'preferences.d'  => false,
-  }
-
-  $source_key_defaults = {
-    'server'  => $keyserver,
-    'options' => undef,
-    'content' => undef,
-    'source'  => undef,
+    'apt.conf.d'     => false,
   }
 
   $include_defaults = {
@@ -81,11 +80,15 @@ class apt::params {
     'Debian': {
           $backports = {
             'location' => 'http://deb.debian.org/debian',
-            'key'      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
             'repos'    => 'main contrib non-free',
           }
       $ppa_options = undef
       $ppa_package = undef
+      if versioncmp($facts['os']['release']['major'], '9') >= 0 {
+        $auth_conf_owner = '_apt'
+      } else {
+        $auth_conf_owner = 'root'
+      }
     }
     'Ubuntu': {
       $backports = {
@@ -95,14 +98,20 @@ class apt::params {
       }
       $ppa_options        = '-y'
       $ppa_package        = 'software-properties-common'
+      if versioncmp($facts['os']['release']['full'], '16.04') >= 0 {
+        $auth_conf_owner = '_apt'
+      } else {
+        $auth_conf_owner = 'root'
+      }
     }
     undef: {
-      fail(translate('Unable to determine value for fact os[\"name\"]'))
+      fail('Unable to determine value for fact os[\"name\"]')
     }
     default: {
       $ppa_options = undef
       $ppa_package = undef
       $backports   = undef
+      $auth_conf_owner = 'root'
     }
   }
 }
diff --git a/manifests/pin.pp b/manifests/pin.pp
index 8145b7d..9310653 100644
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -81,14 +81,14 @@ define apt::pin(
   if $packages_string != '*' { # specific form
     if ( $pin_release != '' and ( $origin != '' or $version != '' )) or
       ( $version != '' and ( $pin_release != '' or $origin != '' )) {
-      fail(translate('parameters release, origin, and version are mutually exclusive'))
+      fail('parameters release, origin, and version are mutually exclusive')
     }
   } else { # general form
     if $version != '' {
-      fail(translate('parameter version cannot be used in general form'))
+      fail('parameter version cannot be used in general form')
     }
     if ( $pin_release != '' and $origin != '' ) {
-      fail(translate('parameters release and origin are mutually exclusive'))
+      fail('parameters release and origin are mutually exclusive')
     }
   }
 
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 402961a..311f81d 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -4,14 +4,18 @@
 #   apt::ppa{ 'ppa:openstack-ppa/bleeding-edge': }
 #
 # @param ensure
-#   Specifies whether the PPA should exist. Valid options: 'present' and 'absent'. 
+#   Specifies whether the PPA should exist. Valid options: 'present' and 'absent'.
 #
 # @param options
 #   Supplies options to be passed to the `add-apt-repository` command. Default: '-y'.
 #
 # @param release
-#   Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint). 
 #   Specifies the operating system of your node. Valid options: a string containing a valid LSB distribution codename.
+#   Optional if `puppet facts show os.distro.codename` returns your correct distribution release codename.
+#
+# @param dist
+#   Specifies the distribution of your node. Valid options: a string containing a valid distribution codename.
+#   Optional if `puppet facts show os.name` returns your correct distribution name.
 #
 # @param package_name
 #   Names the package that provides the `apt-add-repository` command. Default: 'software-properties-common'.
@@ -22,20 +26,21 @@
 define apt::ppa(
   String $ensure                 = 'present',
   Optional[String] $options      = $::apt::ppa_options,
-  Optional[String] $release      = $facts['lsbdistcodename'],
+  Optional[String] $release      = $facts['os']['distro']['codename'],
+  Optional[String] $dist         = $facts['os']['name'],
   Optional[String] $package_name = $::apt::ppa_package,
   Boolean $package_manage        = false,
 ) {
   unless $release {
-    fail(translate('lsbdistcodename fact not available: release parameter required'))
+    fail('os.distro.codename fact not available: release parameter required')
   }
 
-  if $facts['lsbdistid'] == 'Debian' {
-    fail(translate('apt::ppa is not currently supported on Debian.'))
+  if $dist == 'Debian' {
+    fail('apt::ppa is not currently supported on Debian.')
   }
 
-  if versioncmp($facts['lsbdistrelease'], '14.10') >= 0 {
-    $distid = downcase($facts['lsbdistid'])
+  if versioncmp($facts['os']['release']['full'], '14.10') >= 0 {
+    $distid = downcase($dist)
     $dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2")
     $underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2")
   } else {
@@ -50,7 +55,7 @@ define apt::ppa(
 
   $sources_list_d_filename  = "${dash_filename_no_specialchars}-${release}.list"
 
-  if versioncmp($facts['lsbdistrelease'], '15.10') >= 0 {
+  if versioncmp($facts['os']['release']['full'], '15.10') >= 0 {
     $trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"
   } else {
     $trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"
diff --git a/manifests/setting.pp b/manifests/setting.pp
index 4729295..6757f61 100644
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -28,11 +28,11 @@ define apt::setting (
 ) {
 
   if $content and $source {
-    fail(translate('apt::setting cannot have both content and source'))
+    fail('apt::setting cannot have both content and source')
   }
 
   if !$content and !$source {
-    fail(translate('apt::setting needs either of content or source'))
+    fail('apt::setting needs either of content or source')
   }
 
   $title_array = split($title, '-')
@@ -40,13 +40,13 @@ define apt::setting (
   $base_name = join(delete_at($title_array, 0), '-')
 
   assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/], $setting_type) |$a, $b| {
-    fail(translate("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'"))
+    fail("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")
   }
 
   if $priority !~ Integer {
     # need this to allow zero-padded priority.
     assert_type(Pattern[/^\d+$/], $priority) |$a, $b| {
-      fail(translate('apt::setting priority must be an integer or a zero-padded integer'))
+      fail('apt::setting priority must be an integer or a zero-padded integer')
     }
   }
 
@@ -69,7 +69,6 @@ define apt::setting (
     ensure  => $ensure,
     owner   => 'root',
     group   => 'root',
-    mode    => '0644',
     content => $content,
     source  => $source,
     notify  => $_notify,
diff --git a/manifests/source.pp b/manifests/source.pp
index cca03e9..4e14d8a 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -6,7 +6,7 @@
 #     repos    => 'main',
 #     key      => {
 #       id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-#       server => 'hkps.pool.sks-keyservers.net',
+#       server => 'keyserver.ubuntu.com',
 #     },
 #   }
 #
@@ -27,7 +27,7 @@
 #
 # @param include
 #   Configures include options. Valid options: a hash of available keys.
-# 
+#
 # @option include [Boolean] :deb
 #   Specifies whether to request the distribution's compiled binaries. Default true.
 #
@@ -35,17 +35,21 @@
 #   Specifies whether to request the distribution's uncompiled source code. Default false.
 #
 # @param key
-#   Creates a declaration of the apt::key defined type. Valid options: a string to be passed to the `id` parameter of the `apt::key` 
-#   defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, and/or 
-#   `options` parameters.
+#   Creates a declaration of the apt::key defined type. Valid options: a string to be passed to the `id` parameter of the `apt::key`
+#   defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, `weak_ssl`,
+#   and/or `options` parameters.
+#
+# @param keyring
+#   Absolute path to a file containing the PGP keyring used to sign this repository. Value is used to set signed-by on the source entry.
+#   See https://wiki.debian.org/DebianRepository/UseThirdParty for details.
 #
 # @param pin
-#   Creates a declaration of the apt::pin defined type. Valid options: a number or string to be passed to the `id` parameter of the 
+#   Creates a declaration of the apt::pin defined type. Valid options: a number or string to be passed to the `id` parameter of the
 #   `apt::pin` defined type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters.
 #
 # @param architecture
-#   Tells Apt to only download information for specified architectures. Valid options: a string containing one or more architecture names, 
-#   separated by commas (e.g., 'i386' or 'i386,alpha,powerpc'). Default: undef (if unspecified, Apt downloads information for all architectures 
+#   Tells Apt to only download information for specified architectures. Valid options: a string containing one or more architecture names,
+#   separated by commas (e.g., 'i386' or 'i386,alpha,powerpc'). Default: undef (if unspecified, Apt downloads information for all architectures
 #   defined in the Apt::Architectures option).
 #
 # @param allow_unsigned
@@ -62,6 +66,7 @@ define apt::source(
   String $repos                                 = 'main',
   Optional[Variant[Hash]] $include              = {},
   Optional[Variant[String, Hash]] $key          = undef,
+  Optional[Stdlib::AbsolutePath] $keyring       = undef,
   Optional[Variant[Hash, Numeric, String]] $pin = undef,
   Optional[String] $architecture                = undef,
   Boolean $allow_unsigned                       = false,
@@ -73,10 +78,10 @@ define apt::source(
   $_before = Apt::Setting["list-${title}"]
 
   if !$release {
-    if $facts['lsbdistcodename'] {
-      $_release = $facts['lsbdistcodename']
+    if $facts['os']['distro']['codename'] {
+      $_release = $facts['os']['distro']['codename']
     } else {
-      fail(translate('lsbdistcodename fact not available: release parameter required'))
+      fail('os.distro.codename fact not available: release parameter required')
     }
   } else {
     $_release = $release
@@ -84,21 +89,33 @@ define apt::source(
 
   if $ensure == 'present' {
     if ! $location {
-      fail(translate('cannot create a source entry without specifying a location'))
+      fail('cannot create a source entry without specifying a location')
+    }
+    elsif ($::apt::proxy['https_acng']) and ($location =~ /(?i:^https:\/\/)/) {
+      $_location = regsubst($location, 'https://','http://HTTPS///')
+    }
+    else {
+      $_location = $location
     }
     # Newer oses, do not need the package for HTTPS transport.
     $_transport_https_releases = [ 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial' ]
-    if $_release in $_transport_https_releases and $location =~ /(?i:^https:\/\/)/ {
+    if ($facts['os']['distro']['codename'] in $_transport_https_releases) and $_location =~ /(?i:^https:\/\/)/ {
       ensure_packages('apt-transport-https')
     }
+  } else {
+    $_location = undef
   }
 
   $includes = merge($::apt::include_defaults, $include)
 
+  if $key and $keyring {
+    fail("parameters key and keyring are mutualy exclusive")
+  }
+
   if $key {
     if $key =~ Hash {
       unless $key['id'] {
-        fail(translate('key hash must contain at least an id entry'))
+        fail('key hash must contain at least an id entry')
       }
       $_key = merge($::apt::source_key_defaults, $key)
     } else {
@@ -111,9 +128,12 @@ define apt::source(
   $sourcelist = epp('apt/source.list.epp', {
     'comment'          => $comment,
     'includes'         => $includes,
-    'opt_architecture' => $architecture,
-    'allow_unsigned'   => $allow_unsigned,
-    'location'         => $location,
+    'options'          => delete_undef_values({
+      'arch'      => $architecture,
+      'trusted'   => $allow_unsigned ? {true => "yes", false => undef},
+      'signed-by' => $keyring,
+    }),
+    'location'         => $_location,
     'release'          => $_release,
     'repos'            => $repos,
   })
@@ -137,7 +157,7 @@ define apt::source(
         'origin'   => $host,
       }
     } else {
-      fail(translate('Received invalid value for pin parameter'))
+      fail('Received invalid value for pin parameter')
     }
     create_resources('apt::pin', { "${name}" => $_pin })
   }
@@ -145,14 +165,21 @@ define apt::source(
   # We do not want to remove keys when the source is absent.
   if $key and ($ensure == 'present') {
     if $_key =~ Hash {
+      if $_key['ensure'] != undef {
+        $_ensure = $_key['ensure']
+      } else {
+        $_ensure = $ensure
+      }
+
       apt::key { "Add key: ${$_key['id']} from Apt::Source ${title}":
-        ensure  => present,
-        id      => $_key['id'],
-        server  => $_key['server'],
-        content => $_key['content'],
-        source  => $_key['source'],
-        options => $_key['options'],
-        before  => $_before,
+        ensure   => $_ensure,
+        id       => $_key['id'],
+        server   => $_key['server'],
+        content  => $_key['content'],
+        source   => $_key['source'],
+        options  => $_key['options'],
+        weak_ssl => $_key['weak_ssl'],
+        before   => $_before,
       }
     }
   }
diff --git a/metadata.json b/metadata.json
index 647abf1..6d074db 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apt",
-  "version": "6.1.1",
+  "version": "8.3.0",
   "author": "puppetlabs",
   "summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
   "license": "Apache-2.0",
@@ -10,20 +10,16 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.16.0 < 6.0.0"
-    },
-    {
-      "name": "puppetlabs/translate",
-      "version_requirement": ">= 1.0.0 < 2.0.0"
+      "version_requirement": ">= 4.16.0 < 9.0.0"
     }
   ],
-  "data_provider": null,
   "operatingsystem_support": [
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8",
-        "9"
+        "9",
+        "10",
+        "11"
       ]
     },
     {
@@ -31,17 +27,18 @@
       "operatingsystemrelease": [
         "14.04",
         "16.04",
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.8.0 < 7.0.0"
+      "version_requirement": ">= 6.0.0 < 8.0.0"
     }
   ],
-  "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-g8fc95db",
-  "pdk-version": "1.7.0"
+  "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
+  "template-ref": "heads/main-0-g51828b4",
+  "pdk-version": "2.2.0"
 }
diff --git a/pdk.yaml b/pdk.yaml
new file mode 100644
index 0000000..4bef4bd
--- /dev/null
+++ b/pdk.yaml
@@ -0,0 +1,2 @@
+---
+ignore: []
diff --git a/provision.yaml b/provision.yaml
new file mode 100644
index 0000000..d3ef67b
--- /dev/null
+++ b/provision.yaml
@@ -0,0 +1,41 @@
+---
+default:
+  provisioner: docker
+  images:
+  - litmusimage/debian:8
+vagrant:
+  provisioner: vagrant
+  images:
+  - centos/7
+  - generic/ubuntu1804
+travis_deb:
+  provisioner: docker
+  images:
+  - litmusimage/debian:9
+  - litmusimage/debian:10
+travis_ub_6:
+  provisioner: docker
+  images:
+  - litmusimage/ubuntu:16.04
+  - litmusimage/ubuntu:18.04
+  - litmusimage/ubuntu:20.04
+travis_el7:
+  provisioner: docker
+  images: []
+release_checks_6:
+  provisioner: abs
+  images:
+  - debian-8-x86_64
+  - debian-9-x86_64
+  - debian-10-x86_64
+  - ubuntu-1404-x86_64
+  - ubuntu-1604-x86_64
+  - ubuntu-1804-x86_64
+  - ubuntu-2004-x86_64
+release_checks_7:
+  provisioner: abs
+  images:
+  - debian-9-x86_64
+  - debian-10-x86_64
+  - ubuntu-1804-x86_64
+  - ubuntu-2004-x86_64
diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
new file mode 100644
index 0000000..be8ac75
--- /dev/null
+++ b/readmes/README_ja_JP.md
@@ -0,0 +1,292 @@
+# apt
+
+#### 目次
+
+1. [説明 - モジュールの機能とその有益性](#module-description)
+1. [セットアップ - apt導入の基本](#setup)
+    * [aptが影響を与えるもの](#what-apt-affects)
+    * [aptの使用を開始する](#beginning-with-apt)
+1. [使用 - 設定オプションと追加機能](#usage)
+    * [GPGキーの追加](#add-gpg-keys)
+    * [バックポートの優先度を上げる](#prioritize-backports)
+    * [パッケージリストの更新](#update-the-list-of-packages)
+    * [特定のリリースのピン止め](#pin-a-specific-release) 
+    * [PPA (Personal Package Archive)レポジトリの追加](#add-a-personal-package-archive-repository)
+    * [HieraからのAptの構成](#configure-apt-from-hiera)
+    * [デフォルトのsources.listファイルの置き換え](#replace-the-default-sourceslist-file)
+1. [参考 - モジュールの機能と動作について](#reference)
+1. [制約 - OS互換性など](#limitations)
+1. [開発 - モジュール貢献についてのガイド](#development)
+
+## モジュールの概要
+
+aptモジュールを導入すると、Puppetを使用してAPT (Advanced Package Tool)のソース、キー、その他の構成オプションを管理できます。
+
+APTとは、Debian、Ubuntu、およびその他いくつかのオペレーティングシステムで利用可能なパッケージマネージャです。aptモジュールは、APTのパッケージ管理を自動化するのに役立つ一連のクラス、定義型、およびfactsを提供します。
+
+**注**：Puppet 7 より前は、このモジュールがどのバージョンのを正しく自動検出するか
+実行している Debian / Ubuntu（または派生物）、 `lsb-release`パッケージが
+インストールされています。 Puppet 7 では、 `lsb-release`パッケージは必要ありません。
+
+## セットアップ
+
+### aptが影響を与えるもの
+
+* システムの`preferences`ファイルと`preferences.d`ディレクトリ
+* システムの `sources.list`ファイルと`sources.list.d`ディレクトリ
+* システムレポジトリ
+* 認証キー
+
+**注意:** このモジュールには`purge`パラメータがあります。このパラメータを`true`に設定すると、 ノードの `sources.list(.d)`および`preferences(.d)`の構成のうち、Puppetを通して宣言されていないものがすべて**破棄**されます。このパラメータのデフォルトは`false`です。
+
+### aptの使用を開始する
+
+デフォルトのパラメータでaptモジュールを使用するには、`apt`クラスを宣言します。
+
+```puppet
+include apt
+```
+
+**注意:** メインの`apt`クラスは、このモジュールに含まれるその他すべてのクラス、型、定義型によって要求されます。このモジュールを使用する際は、このクラスを必ず宣言する必要があります。
+
+## 使用
+
+### GPGキーの追加
+
+**警告:** 短いキーIDを使用すると、衝突攻撃が有効になる可能性があり、セキュリティに深刻な問題が生じます。常に、完全なフィンガープリントを使用してGPGキーを識別することを推奨します。このモジュールでは短いキーの使用が許可されていますが、それを使用した場合、セキュリティ警告が発行されます。
+
+`apt::key`の定義型を宣言するには、次のように記述します。
+
+```puppet
+apt::key { 'puppetlabs':
+  id      => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
+  server  => 'pgp.mit.edu',
+  options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
+}
+```
+
+### バックポートの優先度を上げる
+
+```puppet
+class { 'apt::backports':
+  pin => 500,
+}
+```
+
+デフォルトでは、`apt::backports`クラスはバックポート用のピンファイルをドロップし、優先度200にピン止めします。これは、通常のデフォルト値である500よりも低いため、`ensure => latest`に設定されているパッケージは、明示的な許可がない限り、バックポートからアップグレードされることはありません。
+
+`pin`パラメータを使用して優先度を500に上げると、通常のポリシーが有効になり、Aptは最新のバージョンをインストールするか、最新のバージョンにアップグレードします。これはつまり、`package`リソースの`ensure`属性を明示的に`installed`/`present`もしくは特定のバージョンに設定していない限り、あるパッケージがバックポートから利用できる場合は、そのパッケージと依存関係がバックポートから取得されるということです。
+
+### パッケージリストの更新
+
+デフォルトでは、`apt`クラスをインクルードした後の最初のPuppet実行時と、`notify  => Exec['apt_update']`が発生するたびに(別の言い方をすれば、構成ファイルが更新されるか、関連するその他の変更が行われるたびに)、Puppetは`apt-get update`を実行します。`update['frequency']`を'always'に設定すると、Puppet実行時に毎回更新が行われます。`update['frequency']`は'daily'や'weekly'に設定することも可能です。
+
+```puppet
+class { 'apt':
+  update => {
+    frequency => 'daily',
+  },
+}
+```
+`Exec['apt_update']`がトリガされると、`Notice`メッセージが生成されます。デフォルトの[agentロギングレベル](https://docs.puppet.com/puppet/latest/configuration.html#loglevel)は`notice`であるため、このレポジトリの更新は、ログおよびagentレポートに記録されます。[Foreman](https://www.theforeman.org)など、一部のツールでは、このような更新通知が重要な変更としてレポートされます。これらの更新がレポートに記録されないようにするには、`Exec['apt_update']`の[loglevel](https://docs.puppet.com/puppet/latest/metaparameter.html#loglevel)メタパラメータをagentロギングレベルよりも高い値に設定します。
+
+```puppet
+class { 'apt':
+  update => {
+    frequency => 'daily',
+    loglevel  => 'debug',
+  },
+}
+```
+
+### 特定のリリースのピン止め
+
+```puppet
+apt::pin { 'karmic': priority => 700 }
+apt::pin { 'karmic-updates': priority => 700 }
+apt::pin { 'karmic-security': priority => 700 }
+```
+
+ディストリビューションのプロパティを使用して、より複雑なピンを指定することもできます。
+
+```puppet
+apt::pin { 'stable':
+  priority        => -10,
+  originator      => 'Debian',
+  release_version => '3.0',
+  component       => 'main',
+  label           => 'Debian'
+}
+```
+
+複数のパッケージをピン止めするには、配列またはスペース区切りの文字列としてその情報を`packages`パラメータに渡します。
+
+### PPA (Personal Package Archive)レポジトリの追加
+
+```puppet
+apt::ppa { 'ppa:drizzle-developers/ppa': }
+```
+
+### `/etc/apt/sources.list.d/`へのAptソースの追加
+
+```puppet
+apt::source { 'debian_unstable':
+  comment  => 'This is the iWeb Debian unstable mirror',
+  location => 'http://debian.mirror.iweb.ca/debian/',
+  release  => 'unstable',
+  repos    => 'main contrib non-free',
+  pin      => '-10',
+  key      => {
+    'id'     => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+    'server' => 'subkeys.pgp.net',
+  },
+  include  => {
+    'src' => true,
+    'deb' => true,
+  },
+}
+```
+
+Puppet Aptレポジトリをソースとして使用するには、次のように記述します。
+
+```puppet
+apt::source { 'puppetlabs':
+  location => 'http://apt.puppetlabs.com',
+  repos    => 'main',
+  key      => {
+    'id'     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
+    'server' => 'pgp.mit.edu',
+  },
+}
+```
+
+### HieraからのAptの構成
+
+ソースをリソースとして直接指定するかわりに、単純に`apt`クラスをインクルードして、値をHieraから自動的に取得するように構成できます。
+
+```yaml
+apt::sources:
+  'debian_unstable':
+    comment: 'This is the iWeb Debian unstable mirror'
+    location: 'http://debian.mirror.iweb.ca/debian/'
+    release: 'unstable'
+    repos: 'main contrib non-free'
+    pin: '-10'
+    key:
+      id: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553'
+      server: 'subkeys.pgp.net'
+    include:
+      src: true
+      deb: true
+
+  'puppetlabs':
+    location: 'http://apt.puppetlabs.com'
+    repos: 'main'
+    key:
+      id: '6F6B15509CF8E59E6E469F327F438280EF8D349F'
+      server: 'pgp.mit.edu'
+```
+
+### デフォルトの`sources.list`ファイルの置き換え
+
+デフォルトの`/etc/apt/sources.list`を置き換える例を以下に示します。以下のコードと合わせて、`purge`パラメータを必ず使用してください。使用しない場合、Apt実行時にソース重複の警告が出ます。
+
+```puppet
+apt::source { "archive.ubuntu.com-${facts['os']['distro']['codename']}":
+  location => 'http://archive.ubuntu.com/ubuntu',
+  key      => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+  repos    => 'main universe multiverse restricted',
+}
+
+apt::source { "archive.ubuntu.com-${facts['os']['distro']['codename']}-security":
+  location => 'http://archive.ubuntu.com/ubuntu',
+  key      => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+  repos    => 'main universe multiverse restricted',
+  release  => "${facts['os']['distro']['codename']}-security"
+}
+
+apt::source { "archive.ubuntu.com-${facts['os']['distro']['codename']}-updates":
+  location => 'http://archive.ubuntu.com/ubuntu',
+  key      => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+  repos    => 'main universe multiverse restricted',
+  release  => "${facts['os']['distro']['codename']}-updates"
+}
+
+apt::source { "archive.ubuntu.com-${facts['os']['distro']['codename']}-backports":
+ location => 'http://archive.ubuntu.com/ubuntu',
+ key      => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ repos    => 'main universe multiverse restricted',
+ release  => "${facts['os']['distro']['codename']}-backports"
+}
+```
+
+### APTソースやプロキシのログイン設定を`/etc/apt/auth.conf`で管理する
+
+APTバージョン1.5以降、認証が必要なAPTソースやプロキシについて、ユーザ名やパスワードなどのログイン設定を`/etc/apt/auth.conf`ファイルに定義できるようになりました。この方法は、`source.list`内にログイン情報を直接記述するよりも推奨されます。直接記述した場合、通常、あらゆるユーザから読み取り可能になるためです。
+
+`/etc/apt/auth.confファイルのフォーマットは、(ftpやcurlによって使用される) netrcに従い、ファイルパーミッションが制限されています。詳しくは、[こちら](https://manpages.debian.org/testing/apt/apt_auth.conf.5.en.html)を参照してください。
+
+オプションの`apt::auth_conf_entries`パラメータを使用して、ログイン設定を含むハッシュの配列を指定します。このハッシュに含めることができるのは、`machine`、`login`、および`password`キーのみです。
+
+```puppet
+class { 'apt':
+  auth_conf_entries => [
+    {
+      'machine'  => 'apt-proxy.example.net',
+      'login'    => 'proxylogin',
+      'password' => 'proxypassword',
+    },
+    {
+      'machine'  => 'apt.example.com/ubuntu',
+      'login'    => 'reader',
+      'password' => 'supersecret',
+    },
+  ],
+}
+```
+
+## リファレンス
+
+### Facts
+
+* `apt_updates`: `upgrade`で入手可能な更新がある、インストール済みパッケージの数。
+
+* `apt_dist_updates`: `dist-upgrade`で入手可能な更新がある、インストール済みパッケージの数。
+
+* `apt_security_updates`: `upgrade`で入手可能なセキュリティ更新がある、インストール済みパッケージの数。
+
+* `apt_security_dist_updates`: `dist-upgrade`で入手可能なセキュリティ更新がある、インストール済みパッケージの数。
+
+* `apt_package_updates`: `upgrade`で入手可能な更新がある、すべてのインストール済みパッケージの名前。Facter 2.0以降では、このデータのフォーマットは配列で、それ以前のバージョンでは、コンマ区切りの文字列です。
+
+* `apt_package_dist_updates`: `dist-upgrade`で入手可能な更新がある、すべてのインストール済みパッケージの名前。Facter 2.0以降では、このデータのフォーマットは配列で、それ以前のバージョンでは、コンマ区切りの文字列です。
+
+* `apt_update_last_success`: 直近で成功した`apt-get update`実行のエポックタイムによる日付(/var/lib/apt/periodic/update-success-stampのmtimeに基づく)。
+
+* `apt_reboot_required`: 更新がインストールされた後に再起動が必要かどうかを決定します。
+
+### 詳細情報
+
+その他すべてのリファレンスマニュアルについては、[REFERENCE.md](https://github.com/puppetlabs/puppetlabs-apt/blob/main/REFERENCE.md)を参照してください。
+
+## 制約
+
+このモジュールは、[実行ステージ](https://docs.puppetlabs.com/puppet/latest/reference/lang_run_stages.html)に分割するようには設計されていません。
+
+サポート対象のオペレーティングシステムの全リストについては、[metadata.json](https://github.com/puppetlabs/puppetlabs-apt/blob/main/metadata.json)を参照してください。
+
+### 新しいソースまたはPPAの追加
+
+新しいソースまたはPPAを追加し、同一のPuppet実行において、その新しいソースまたはPPAからパッケージをインストールするには、`package`リソースが`Apt::Source`または`Apt::Ppa`に従属し、かつ`Class['apt::update']に従属する必要があります。[コレクタ](https://docs.puppetlabs.com/puppet/latest/reference/lang_collectors.html)を追加することによって、すべてのパッケージが`apt::update`の後に来るように制御することもできますが、その場合、循環依存が発生したり、[仮想リソース](https://docs.puppetlabs.com/puppet/latest/reference/lang_collectors.html#behavior)と関係したりすることがあります。以下のコマンドを実行する前に、すべてのパッケージのプロバイダがaptに設定されていることを確認してください。
+
+```puppet
+Class['apt::update'] -> Package <| provider == 'apt' |>
+```
+
+## 開発
+
+Puppet ForgeのPuppet Labsモジュールはオープンプロジェクトで、良い状態に保つためには、コミュニティの貢献が必要不可欠です。Puppetが役に立つはずでありながら、私たちがアクセスできないプラットフォームやハードウェア、ソフトウェア、デプロイ構成は無数にあります。私たちの目標は、できる限り簡単に変更に貢献し、みなさまの環境で私たちのモジュールが機能できるようにすることにあります。最高の状態を維持できるようにするために、コントリビュータが従う必要のあるいくつかのガイドラインが存在します。
+
+詳細については、[モジュール貢献ガイド](https://docs.puppetlabs.com/forge/contributing.html)を参照してください。
+
+すでにご協力いただいている方のリストについては、[コントリビュータのリスト](https://github.com/puppetlabs/puppetlabs-apt/graphs/contributors)をご覧ください。
diff --git a/spec/acceptance/01_apt_class_spec.rb b/spec/acceptance/01_apt_class_spec.rb
deleted file mode 100644
index 53d75f6..0000000
--- a/spec/acceptance/01_apt_class_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt class' do
-  context 'with default parameters' do
-    # Using puppet_apply as a helper
-    it 'works with no errors' do
-      pp = <<-MANIFEST
-      class { 'apt': }
-      MANIFEST
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true)
-    end
-  end
-end
diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
deleted file mode 100644
index ae278fb..0000000
--- a/spec/acceptance/apt_key_provider_spec.rb
+++ /dev/null
@@ -1,979 +0,0 @@
-require 'spec_helper_acceptance'
-
-PUPPETLABS_GPG_KEY_SHORT_ID         = 'EF8D349F'.freeze
-PUPPETLABS_GPG_KEY_LONG_ID          = '7F438280EF8D349F'.freeze
-PUPPETLABS_GPG_KEY_FINGERPRINT      = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
-PUPPETLABS_APT_URL                  = 'apt.puppetlabs.com'.freeze
-PUPPETLABS_GPG_KEY_FILE             = 'DEB-GPG-KEY-puppet'.freeze
-CENTOS_GPG_KEY_SHORT_ID             = 'C105B9DE'.freeze
-CENTOS_GPG_KEY_LONG_ID              = '0946FCA2C105B9DE'.freeze
-CENTOS_GPG_KEY_FINGERPRINT          = 'C1DAC52D1664E8A4386DBA430946FCA2C105B9DE'.freeze
-CENTOS_REPO_URL                     = 'ftp.cvut.cz/centos'.freeze
-CENTOS_GPG_KEY_FILE                 = 'RPM-GPG-KEY-CentOS-6'.freeze
-PUPPETLABS_EXP_KEY_LONG_ID          = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'.freeze
-PUPPETLABS_EXP_KEY_DATES            = 'pub:e:4096:1:1054B7A24BD6EC30:2010-07-10:2017-01-05::-:Puppet Labs Release Key'.freeze
-SHOULD_NEVER_EXIST_ID               = 'EF8D349F'.freeze
-KEY_CHECK_COMMAND                   = 'apt-key adv --list-keys --with-colons --fingerprint | grep '.freeze
-PUPPETLABS_KEY_CHECK_COMMAND        = "#{KEY_CHECK_COMMAND} #{PUPPETLABS_GPG_KEY_FINGERPRINT}".freeze
-CENTOS_KEY_CHECK_COMMAND            = "#{KEY_CHECK_COMMAND} #{CENTOS_GPG_KEY_FINGERPRINT}".freeze
-PUPPETLABS_EXP_CHECK_COMMAND        = "#{KEY_CHECK_COMMAND} '#{PUPPETLABS_EXP_KEY_DATES}'".freeze
-DEBIAN_PUPPETLABS_EXP_CHECK_COMMAND = 'apt-key list | grep -F -A 1 \'pub   rsa4096 2010-07-10 [SC] [expired: 2017-01-05]\' | grep \'47B3 20EB 4C7C 375A A9DA  E1A0 1054 B7A2 4BD6 EC30\''.freeze
-
-def populate_default_options_pp(value)
-  default_options_pp = <<-MANIFEST
-          apt_key { 'puppetlabs':
-            id     => '#{value}',
-            ensure => 'present',
-          }
-  MANIFEST
-  default_options_pp
-end
-
-def install_key(key)
-  retry_on_error_matching do
-    shell("apt-key adv --keyserver pgp.mit.edu --recv-keys #{key}")
-  end
-end
-
-def apply_manifest_twice(manifest_pp)
-  retry_on_error_matching do
-    apply_manifest(manifest_pp, catch_failures: true)
-  end
-  retry_on_error_matching do
-    apply_manifest(manifest_pp, catch_changes: true)
-  end
-end
-
-invalid_key_length_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id => '8280EF8D349F',
-        }
-  MANIFEST
-
-ensure_absent_pp = <<-MANIFEST
-        apt_key { 'centos':
-          id     => '#{CENTOS_GPG_KEY_LONG_ID}',
-          ensure => 'absent',
-        }
-  MANIFEST
-
-ensure_absent_long_key_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'absent',
-        }
-  MANIFEST
-
-refresh_pp = <<-MANIFEST
-        apt_key { '#{PUPPETLABS_EXP_KEY_LONG_ID}':
-          id      => '#{PUPPETLABS_EXP_KEY_LONG_ID}',
-          ensure  => 'present',
-          content => '-----BEGIN PGP PUBLIC KEY BLOCK-----
-  Version: GnuPG v1
-
-  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
-  fBt3Tu1IYpw=
-  =cXcR
-  -----END PGP PUBLIC KEY BLOCK-----'
-          }
-  MANIFEST
-
-gpg_key_pp = <<-MANIFEST
-          apt_key { 'puppetlabs':
-            id      => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}',
-            ensure  => 'present',
-            content => "-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-  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
-  3xJn
-  =mMjt
-  -----END PGP PUBLIC KEY BLOCK-----",
-            }
-  MANIFEST
-
-multiple_keys_pp = <<-MANIFEST
-          apt_key { 'puppetlabs':
-            id      => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}',
-            ensure  => 'present',
-            content => "-----BEGIN PGP PUBLIC KEY BLOCK-----
-  Version: GnuPG v1
-
-  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
-  FPfZDNCu/TXoqyJk7434jJrcHgPryzrHFBLfEmc=
-  =TREp
-  -----END PGP PUBLIC KEY BLOCK----- ",
-            }
-  MANIFEST
-
-bogus_key_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id      => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure  => 'present',
-          content => 'For posterity: such content, much bogus, wow',
-        }
-  MANIFEST
-
-hkps_pool_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          server => 'pgp.mit.edu',
-        }
-  MANIFEST
-
-hkp_pool_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}',
-          ensure => 'present',
-          server => 'hkp://pgp.mit.edu:80',
-        }
-  MANIFEST
-
-nonexistant_key_server_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          server => 'nonexistant.key.server',
-        }
-  MANIFEST
-
-dot_server_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          server => '.pgp.key.server',
-        }
-  MANIFEST
-
-http_works_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => 'http://#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}',
-        }
-  MANIFEST
-
-http_works_userinfo_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => 'http://dummyuser:dummypassword@#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}',
-        }
-  MANIFEST
-
-four_oh_four_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => 'http://#{PUPPETLABS_APT_URL}/herpderp.gpg',
-        }
-  MANIFEST
-
-socket_error_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => 'http://apt.puppetlabss.com/herpderp.gpg',
-        }
-  MANIFEST
-
-ftp_works_pp = <<-MANIFEST
-        apt_key { 'CentOS 6':
-          id     => '#{CENTOS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => 'ftp://#{CENTOS_REPO_URL}/#{CENTOS_GPG_KEY_FILE}',
-        }
-  MANIFEST
-
-ftp_550_pp = <<-MANIFEST
-        apt_key { 'CentOS 6':
-          id     => '#{SHOULD_NEVER_EXIST_ID}',
-          ensure => 'present',
-          source => 'ftp://#{CENTOS_REPO_URL}/herpderp.gpg',
-        }
-  MANIFEST
-
-ftp_socket_error_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => 'ftp://apt.puppetlabss.com/herpderp.gpg',
-        }
-  MANIFEST
-
-https_works_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => 'https://#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}',
-        }
-  MANIFEST
-
-https_userinfo_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => 'https://dummyuser:dummypassword@#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}',
-        }
-  MANIFEST
-
-https_404_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{SHOULD_NEVER_EXIST_ID}',
-          ensure => 'present',
-          source => 'https://#{PUPPETLABS_APT_URL}/herpderp.gpg',
-        }
-  MANIFEST
-
-https_socket_error_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{SHOULD_NEVER_EXIST_ID}',
-          ensure => 'present',
-          source => 'https://apt.puppetlabss.com/herpderp.gpg',
-        }
-  MANIFEST
-
-path_exists_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => 'EF8D349F',
-          ensure => 'present',
-          source => '/tmp/puppetlabs-pubkey.gpg',
-        }
-  MANIFEST
-
-path_does_not_exist_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => '/tmp/totally_bogus.file',
-        }
-  MANIFEST
-
-path_bogus_content_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => '/tmp/fake-key.gpg',
-        }
-  MANIFEST
-
-debug_works_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id      => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure  => 'present',
-          options => 'debug',
-        }
-  MANIFEST
-
-fingerprint_match_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id      => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}',
-          ensure  => 'present',
-          source  => 'https://#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}',
-        }
-  MANIFEST
-
-fingerprint_does_not_match_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id      => '6F6B15509CF8E59E6E469F327F438280EF8D9999',
-          ensure  => 'present',
-          source  => 'https://#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}',
-        }
-  MANIFEST
-
-refresh_true_pp = <<-MANIFEST
-        apt_key { '#{PUPPETLABS_EXP_KEY_LONG_ID}':
-          id      => '#{PUPPETLABS_EXP_KEY_LONG_ID}',
-          ensure  => 'present',
-          refresh => true,
-        }
-  MANIFEST
-
-refresh_false_pp = <<-MANIFEST
-        apt_key { '#{PUPPETLABS_EXP_KEY_LONG_ID}':
-          id      => '#{PUPPETLABS_EXP_KEY_LONG_ID}',
-          ensure  => 'present',
-          refresh => false,
-        }
-MANIFEST
-
-refresh_del_key_pp = <<-MANIFEST
-        apt_key { '#{PUPPETLABS_EXP_KEY_LONG_ID}':
-          ensure  => 'absent',
-        }
-MANIFEST
-
-refresh_check_for_dirmngr_pp = <<-MANIFEST
-        package { 'dirmngr':
-          ensure  => 'present',
-        }
-MANIFEST
-
-describe 'apt_key' do
-  before(:each) do
-    # Delete twice to make sure everything is cleaned
-    # up after the short key collision
-    shell("apt-key del #{PUPPETLABS_GPG_KEY_SHORT_ID}",
-          acceptable_exit_codes: [0, 1, 2])
-    shell("apt-key del #{PUPPETLABS_GPG_KEY_SHORT_ID}",
-          acceptable_exit_codes: [0, 1, 2])
-  end
-
-  describe 'default options' do
-    key_versions = {
-      '32bit key id'                        => PUPPETLABS_GPG_KEY_SHORT_ID.to_s,
-      '64bit key id'                        => PUPPETLABS_GPG_KEY_LONG_ID.to_s,
-      '160bit key fingerprint'              => PUPPETLABS_GPG_KEY_FINGERPRINT.to_s,
-      '32bit lowercase key id'              => PUPPETLABS_GPG_KEY_SHORT_ID.downcase.to_s,
-      '64bit lowercase key id'              => PUPPETLABS_GPG_KEY_LONG_ID.downcase.to_s,
-      '160bit lowercase key fingerprint'    => PUPPETLABS_GPG_KEY_FINGERPRINT.downcase.to_s,
-      '0x formatted 32bit key id'           => "0x#{PUPPETLABS_GPG_KEY_SHORT_ID}",
-      '0x formatted 64bit key id'           => "0x#{PUPPETLABS_GPG_KEY_LONG_ID}",
-      '0x formatted 160bit key fingerprint' => "0x#{PUPPETLABS_GPG_KEY_FINGERPRINT}",
-      '0x formatted 32bit lowercase key id' => "0x#{PUPPETLABS_GPG_KEY_SHORT_ID.downcase}",
-      '0x formatted 64bit lowercase key id' => "0x#{PUPPETLABS_GPG_KEY_LONG_ID.downcase}",
-      '0x formatted 160bit lowercase key fingerprint' => "0x#{PUPPETLABS_GPG_KEY_FINGERPRINT.downcase}",
-    }
-
-    key_versions.each do |key, value| # rubocop:disable Lint/UnusedBlockArgument
-      context 'when key.to_s' do
-        it 'works' do
-          apply_manifest_twice(populate_default_options_pp(value))
-          shell(PUPPETLABS_KEY_CHECK_COMMAND)
-        end
-      end
-    end
-
-    context 'with invalid length key id' do
-      it 'fails' do
-        apply_manifest(invalid_key_length_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{Valid values match})
-        end
-      end
-    end
-  end
-
-  describe 'ensure =>' do
-    context 'when absent' do
-      it 'is removed' do
-        # Install the key first (retry because key pool may timeout)
-        install_key(CENTOS_GPG_KEY_FINGERPRINT)
-        shell(CENTOS_KEY_CHECK_COMMAND)
-
-        # Time to remove it using Puppet
-        apply_manifest_twice(ensure_absent_pp)
-
-        shell(CENTOS_KEY_CHECK_COMMAND, acceptable_exit_codes: [1])
-
-        # Re-Install the key (retry because key pool may timeout)
-        install_key(CENTOS_GPG_KEY_FINGERPRINT)
-      end
-    end
-
-    context 'when absent, added with long key' do
-      it 'is removed' do
-        # Install the key first (retry because key pool may timeout)
-        install_key(PUPPETLABS_GPG_KEY_LONG_ID)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-
-        # Time to remove it using Puppet
-        apply_manifest_twice(ensure_absent_long_key_pp)
-
-        shell(PUPPETLABS_KEY_CHECK_COMMAND, acceptable_exit_codes: [1])
-      end
-    end
-  end
-
-  describe 'content =>' do
-    context 'with puppetlabs gpg key' do
-      it 'works' do
-        # Apply the manifest (Retry if timeout error is received from key pool)
-        retry_on_error_matching do
-          apply_manifest(gpg_key_pp, catch_failures: true)
-        end
-
-        apply_manifest(gpg_key_pp, catch_changes: true)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-      end
-    end
-
-    context 'with multiple keys' do
-      it 'runs without errors' do
-        apply_manifest_twice(multiple_keys_pp)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-      end
-    end
-
-    context 'with bogus key' do
-      it 'fails' do
-        apply_manifest(bogus_key_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{no valid OpenPGP data found})
-        end
-      end
-    end
-  end
-
-  describe 'server =>' do
-    context 'with pgp.mit.edu' do
-      it 'works' do
-        # Apply the manifest (Retry if timeout error is received from key pool)
-        retry_on_error_matching do
-          apply_manifest(hkps_pool_pp, catch_failures: true)
-        end
-
-        apply_manifest(hkps_pool_pp, catch_changes: true)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-      end
-    end
-
-    context 'with hkp://pgp.mit.edu:80' do
-      it 'works' do
-        retry_on_error_matching do
-          apply_manifest(hkp_pool_pp, catch_failures: true)
-        end
-
-        apply_manifest(hkp_pool_pp, catch_changes: true)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-      end
-    end
-
-    context 'with nonexistant.key.server' do
-      it 'fails' do
-        apply_manifest(nonexistant_key_server_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{(Host not found|Couldn't resolve host|No name)})
-        end
-      end
-    end
-
-    context 'with key server start with dot' do
-      it 'fails' do
-        apply_manifest(dot_server_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{Invalid value ".pgp.key.server"})
-        end
-      end
-    end
-  end
-
-  describe 'source =>' do
-    context 'with http://' do
-      it 'works' do
-        apply_manifest_twice(http_works_pp)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-      end
-
-      it 'works with userinfo' do
-        apply_manifest_twice(http_works_userinfo_pp)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-      end
-
-      it 'fails with a 404' do
-        apply_manifest(four_oh_four_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{404 Not Found})
-        end
-      end
-
-      it 'fails with a socket error' do
-        apply_manifest(socket_error_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{could not resolve})
-        end
-      end
-    end
-
-    # disabled when running in travis, security issues prevent FTP
-    context 'with ftp://', unless: (ENV['TRAVIS'] == 'true') do
-      before(:each) do
-        shell("apt-key del #{CENTOS_GPG_KEY_LONG_ID}",
-              acceptable_exit_codes: [0, 1, 2])
-      end
-
-      it 'works' do
-        apply_manifest_twice(ftp_works_pp)
-        shell(CENTOS_KEY_CHECK_COMMAND)
-      end
-
-      it 'fails with a 550' do
-        apply_manifest(ftp_550_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{550 Failed to open})
-        end
-      end
-
-      it 'fails with a socket error' do
-        apply_manifest(ftp_socket_error_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{could not resolve})
-        end
-      end
-    end
-
-    context 'with https://' do
-      it 'works' do
-        apply_manifest_twice(https_works_pp)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-      end
-
-      it 'works with userinfo' do
-        apply_manifest_twice(https_userinfo_pp)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-      end
-
-      it 'fails with a 404' do
-        apply_manifest(https_404_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{404 Not Found})
-        end
-      end
-
-      it 'fails with a socket error' do
-        apply_manifest(https_socket_error_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{could not resolve})
-        end
-      end
-    end
-
-    context 'with /path/that/exists' do
-      before(:each) do
-        shell("curl -o /tmp/puppetlabs-pubkey.gpg \
-              http://#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}")
-      end
-
-      after(:each) do
-        shell('rm /tmp/puppetlabs-pubkey.gpg')
-      end
-
-      it 'works' do
-        apply_manifest_twice(path_exists_pp)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-      end
-    end
-
-    context 'with /path/that/does/not/exist' do
-      it 'fails' do
-        apply_manifest(path_does_not_exist_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{does not exist})
-        end
-      end
-    end
-
-    context 'with /path/that/exists/with/bogus/content' do
-      before(:each) do
-        shell('echo "here be dragons" > /tmp/fake-key.gpg')
-      end
-
-      after(:each) do
-        shell('rm /tmp/fake-key.gpg')
-      end
-      it 'fails' do
-        apply_manifest(path_bogus_content_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{no valid OpenPGP data found})
-        end
-      end
-    end
-  end
-
-  describe 'options =>' do
-    context 'with debug' do
-      it 'works' do
-        apply_manifest_twice(debug_works_pp)
-        shell(PUPPETLABS_KEY_CHECK_COMMAND)
-      end
-    end
-  end
-
-  describe 'fingerprint validation against source/content' do
-    context 'with fingerprint in id matches fingerprint from remote key' do
-      it 'works' do
-        apply_manifest_twice(fingerprint_match_pp)
-      end
-    end
-
-    context 'with fingerprint in id does NOT match fingerprint from remote key' do
-      it 'works' do
-        apply_manifest(fingerprint_does_not_match_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{don't match})
-        end
-      end
-    end
-  end
-
-  describe 'refresh' do
-    if fact('osfamily') == 'Debian' && (fact('lsbdistcodename') == 'stretch' || fact('lsbdistcodename') == 'bionic')
-      # Set Debian Stetch specific value of puppetlabs_exp_check_command
-      let(:puppetlabs_exp_check_command) { DEBIAN_PUPPETLABS_EXP_CHECK_COMMAND }
-    else
-      # Set default value of puppetlabs_exp_check_command
-      let(:puppetlabs_exp_check_command) { PUPPETLABS_EXP_CHECK_COMMAND }
-    end
-    before(:each) do
-      if fact('lsbdistcodename') == 'stretch' || fact('lsbdistcodename') == 'bionic'
-        # Ensure dirmngr package is installed
-        apply_manifest(refresh_check_for_dirmngr_pp, acceptable_exit_codes: [0, 2])
-        # Export environment variable to disable apt-key warning when using grep
-        shell('export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1')
-      end
-      # Delete the Puppet Labs Release Key and install an expired version of the key
-      apply_manifest(refresh_del_key_pp)
-      apply_manifest(refresh_pp, catch_failures: true)
-    end
-    context 'when refresh => true' do
-      it 'updates an expired key' do
-        apply_manifest(refresh_true_pp)
-        # Check key has been updated to new version
-        shell(puppetlabs_exp_check_command.to_s, acceptable_exit_codes: [0])
-      end
-    end
-    context 'when refresh => false' do
-      it 'does not replace an expired key' do
-        apply_manifest(refresh_false_pp)
-        # Expired key is present and has not been updated by the new version
-        shell(puppetlabs_exp_check_command.to_s, acceptable_exit_codes: [1])
-      end
-    end
-  end
-end
diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
deleted file mode 100644
index 7fe1d03..0000000
--- a/spec/acceptance/apt_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'spec_helper_acceptance'
-
-everything_everything_pp = <<-MANIFEST
-      $sources = {
-        'puppetlabs' => {
-          'ensure'   => present,
-          'location' => 'http://apt.puppetlabs.com',
-          'repos'    => 'main',
-          'key'      => {
-            'id'     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-            'server' => 'pool.sks-keyservers.net',
-          },
-        },
-      }
-      class { 'apt':
-        update => {
-          'frequency' => 'always',
-          'timeout'   => 400,
-          'tries'     => 3,
-        },
-        purge => {
-          'sources.list'   => true,
-          'sources.list.d' => true,
-          'preferences'    => true,
-          'preferences.d'  => true,
-        },
-        sources => $sources,
-      }
-  MANIFEST
-
-describe 'apt class' do
-  context 'with reset' do
-    it 'fixes the sources.list' do
-      shell('cp /etc/apt/sources.list /tmp')
-    end
-  end
-
-  context 'with all the things' do
-    it 'works with no errors' do
-      # Apply the manifest (Retry if timeout error is received from key pool)
-      retry_on_error_matching do
-        apply_manifest(everything_everything_pp, catch_failures: true)
-      end
-    end
-    it 'stills work' do
-      shell('apt-get update')
-      shell('apt-get -y --force-yes upgrade')
-    end
-  end
-
-  context 'with reset' do
-    it 'fixes the sources.list' do
-      shell('cp /tmp/sources.list /etc/apt')
-    end
-  end
-end
diff --git a/spec/acceptance/init_task_spec.rb b/spec/acceptance/init_task_spec.rb
deleted file mode 100644
index 58f3ca7..0000000
--- a/spec/acceptance/init_task_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# run a test task
-require 'spec_helper_acceptance'
-
-describe 'apt tasks' do
-  describe 'update and upgrade', if: pe_install? && puppet_version =~ %r{(5\.\d\.\d)} && fact_on(master, 'osfamily') == 'Debian' do
-    it 'execute arbitary sql' do
-      result = run_task(task_name: 'apt', params: 'action=update')
-      expect_multiple_regexes(result: result, regexes: [%r{Reading package lists}, %r{Job completed. 1/1 nodes succeeded}])
-    end
-  end
-end
diff --git a/spec/acceptance/locales_spec.rb b/spec/acceptance/locales_spec.rb
deleted file mode 100644
index eaf214d..0000000
--- a/spec/acceptance/locales_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'spec_helper_acceptance'
-require 'beaker/i18n_helper'
-
-PUPPETLABS_GPG_KEY_LONG_ID     = '7F438280EF8D349F'.freeze
-PUPPETLABS_LONG_FINGERPRINT    = '123456781274D2C8A956789A456789A456789A9A'.freeze
-
-id_short_warning_pp = <<-MANIFEST
-        apt_key { 'puppetlabs':
-          id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
-          ensure => 'present',
-          source => 'http://apt.puppetlabs.com/herpderp.gpg',
-        }
-  MANIFEST
-
-id_doesnt_match_fingerprint_pp = <<-MANIFEST
-        apt_key { '#{PUPPETLABS_LONG_FINGERPRINT}':
-          ensure => 'present',
-          content => '123456781274D2C8A956789A456789A456789A9B',
-        }
-  MANIFEST
-
-location_not_specified_fail_pp = <<-MANIFEST
-        apt::source { 'puppetlabs':
-          ensure => 'present',
-          repos    => 'main',
-          key      => {
-            id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-            server => 'hkps.pool.sks-keyservers.net',
-          },
-        }
-  MANIFEST
-
-describe 'apt', if: (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') && (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5')) do
-  before :all do
-    hosts.each do |host|
-      on(host, "sed -i \"96i FastGettext.locale='ja'\" /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet.rb")
-      change_locale_on(host, 'ja_JP.utf-8')
-    end
-  end
-
-  describe 'i18n translations' do
-    it 'warns with shortened id' do
-      apply_manifest(id_short_warning_pp, catch_failures: true) do |r|
-        expect(r.stderr).to match(%r{Ŧħḗ īḓ şħǿŭŀḓ ƀḗ ȧ ƒŭŀŀ ƒīƞɠḗřƥřīƞŧ})
-      end
-    end
-    it 'fails with different id and fingerprint' do
-      apply_manifest(id_doesnt_match_fingerprint_pp, expect_failures: true) do |r|
-        expect(r.stderr).to match(%r{Ŧħḗ īḓ īƞ ẏǿŭř ḿȧƞīƒḗşŧ 123456781274D2C8A956789A456789A456789A9A})
-      end
-    end
-    it 'fails with no location' do
-      apply_manifest(location_not_specified_fail_pp, expect_failures: true) do |r|
-        expect(r.stderr).to match(%r{ƈȧƞƞǿŧ ƈřḗȧŧḗ ȧ şǿŭřƈḗ ḗƞŧřẏ ẇīŧħǿŭŧ şƥḗƈīƒẏīƞɠ ȧ ŀǿƈȧŧīǿƞ})
-      end
-    end
-  end
-
-  after :all do
-    hosts.each do |host|
-      on(host, 'sed -i "96d" /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet.rb')
-      change_locale_on(host, 'en_US')
-    end
-  end
-end
diff --git a/spec/acceptance/nodesets/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml
deleted file mode 100644
index 5eebdef..0000000
--- a/spec/acceptance/nodesets/centos-7-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    roles:
-      - agent
-      - default
-    platform: el-7-x86_64
-    hypervisor: vagrant
-    box: puppetlabs/centos-7.2-64-nocm
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/debian-8-x64.yml b/spec/acceptance/nodesets/debian-8-x64.yml
deleted file mode 100644
index fef6e63..0000000
--- a/spec/acceptance/nodesets/debian-8-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    roles:
-      - agent
-      - default
-    platform: debian-8-amd64
-    hypervisor: vagrant
-    box: puppetlabs/debian-8.2-64-nocm
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index dba339c..0000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    roles:
-      - agent
-      - default
-    platform: ubuntu-14.04-amd64
-    hypervisor: vagrant
-    box: puppetlabs/ubuntu-14.04-64-nocm
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/docker/centos-7.yml b/spec/acceptance/nodesets/docker/centos-7.yml
deleted file mode 100644
index a3333aa..0000000
--- a/spec/acceptance/nodesets/docker/centos-7.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    platform: el-7-x86_64
-    hypervisor: docker
-    image: centos:7
-    docker_preserve_image: true
-    docker_cmd: '["/usr/sbin/init"]'
-    # install various tools required to get the image up to usable levels
-    docker_image_commands:
-      - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts'
-CONFIG:
-  trace_limit: 200
diff --git a/spec/acceptance/nodesets/docker/debian-8.yml b/spec/acceptance/nodesets/docker/debian-8.yml
deleted file mode 100644
index df5c319..0000000
--- a/spec/acceptance/nodesets/docker/debian-8.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    platform: debian-8-amd64
-    hypervisor: docker
-    image: debian:8
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen'
-CONFIG:
-  trace_limit: 200
diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
deleted file mode 100644
index b1efa58..0000000
--- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    platform: ubuntu-14.04-amd64
-    hypervisor: docker
-    image: ubuntu:14.04
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      # ensure that upstart is booting correctly in the container
-      - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8'
-CONFIG:
-  trace_limit: 200
diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb
deleted file mode 100644
index 215faae..0000000
--- a/spec/classes/apt_backports_spec.rb
+++ /dev/null
@@ -1,253 +0,0 @@
-require 'spec_helper'
-
-describe 'apt::backports', type: :class do
-  let(:pre_condition) { "class{ '::apt': }" }
-
-  describe 'debian/ubuntu tests' do
-    context 'with defaults on deb' do
-      let(:facts) do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          osfamily: 'Debian',
-          lsbdistcodename: 'jessie',
-          puppetversion: Puppet.version,
-        }
-      end
-
-      it {
-        is_expected.to contain_apt__source('backports').with(location: 'http://deb.debian.org/debian',
-                                                             key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-                                                             repos: 'main contrib non-free',
-                                                             release: 'jessie-backports',
-                                                             pin: { 'priority' => 200, 'release' => 'jessie-backports' })
-      }
-    end
-    context 'with defaults on ubuntu' do
-      let(:facts) do
-        {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-          lsbdistid: 'Ubuntu',
-          osfamily: 'Debian',
-          lsbdistcodename: 'xenial',
-          lsbdistrelease: '16.04',
-          puppetversion: Puppet.version,
-        }
-      end
-
-      it {
-        is_expected.to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu',
-                                                             key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
-                                                             repos: 'main universe multiverse restricted',
-                                                             release: 'xenial-backports',
-                                                             pin: { 'priority' => 200, 'release' => 'xenial-backports' })
-      }
-    end
-    context 'with everything set' do
-      let(:facts) do
-        {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-          lsbdistid: 'Ubuntu',
-          osfamily: 'Debian',
-          lsbdistcodename: 'xenial',
-          lsbdistrelease: '16.04',
-          puppetversion: Puppet.version,
-        }
-      end
-      let(:params) do
-        {
-          location: 'http://archive.ubuntu.com/ubuntu-test',
-          release: 'vivid',
-          repos: 'main',
-          key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-          pin: '90',
-        }
-      end
-
-      it {
-        is_expected.to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu-test',
-                                                             key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-                                                             repos: 'main',
-                                                             release: 'vivid',
-                                                             pin: { 'priority' => 90, 'release' => 'vivid' })
-      }
-    end
-    context 'when set things with hashes' do
-      let(:facts) do
-        {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-          lsbdistid: 'Ubuntu',
-          osfamily: 'Debian',
-          lsbdistcodename: 'xenial',
-          lsbdistrelease: '16.04',
-          puppetversion: Puppet.version,
-        }
-      end
-      let(:params) do
-        {
-          key: {
-            'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-          },
-          pin: {
-            'priority' => '90',
-          },
-        }
-      end
-
-      it {
-        is_expected.to contain_apt__source('backports').with(key: { 'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553' },
-                                                             pin: { 'priority' => '90' })
-      }
-    end
-  end
-  describe 'mint tests' do
-    let(:facts) do
-      {
-        os: { family: 'Debian', name: 'Linuxmint', release: { major: '17', full: '17' } },
-        lsbdistid: 'linuxmint',
-        osfamily: 'Debian',
-        lsbdistcodename: 'qiana',
-        puppetversion: Puppet.version,
-      }
-    end
-
-    context 'with all the needed things set' do
-      let(:params) do
-        {
-          location: 'http://archive.ubuntu.com/ubuntu',
-          release: 'trusty-backports',
-          repos: 'main universe multiverse restricted',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
-        }
-      end
-
-      it {
-        is_expected.to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu',
-                                                             key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
-                                                             repos: 'main universe multiverse restricted',
-                                                             release: 'trusty-backports',
-                                                             pin: { 'priority' => 200, 'release' => 'trusty-backports' })
-      }
-    end
-    context 'with missing location' do
-      let(:params) do
-        {
-          release: 'trusty-backports',
-          repos: 'main universe multiverse restricted',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
-      end
-    end
-    context 'with missing release' do
-      let(:params) do
-        {
-          location: 'http://archive.ubuntu.com/ubuntu',
-          repos: 'main universe multiverse restricted',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
-      end
-    end
-    context 'with missing repos' do
-      let(:params) do
-        {
-          location: 'http://archive.ubuntu.com/ubuntu',
-          release: 'trusty-backports',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
-      end
-    end
-    context 'with missing key' do
-      let(:params) do
-        {
-          location: 'http://archive.ubuntu.com/ubuntu',
-          release: 'trusty-backports',
-          repos: 'main universe multiverse restricted',
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
-      end
-    end
-  end
-  describe 'validation' do
-    let(:facts) do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-        lsbdistid: 'Ubuntu',
-        osfamily: 'Debian',
-        lsbdistcodename: 'xenial',
-        lsbdistrelease: '16.04',
-        puppetversion: Puppet.version,
-      }
-    end
-
-    context 'with invalid location' do
-      let(:params) do
-        {
-          location: true,
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a})
-      end
-    end
-    context 'with invalid release' do
-      let(:params) do
-        {
-          release: true,
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a})
-      end
-    end
-    context 'with invalid repos' do
-      let(:params) do
-        {
-          repos: true,
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a})
-      end
-    end
-    context 'with invalid key' do
-      let(:params) do
-        {
-          key: true,
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a})
-      end
-    end
-    context 'with invalid pin' do
-      let(:params) do
-        {
-          pin: true,
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a})
-      end
-    end
-  end
-end
diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
deleted file mode 100644
index f93770e..0000000
--- a/spec/classes/apt_spec.rb
+++ /dev/null
@@ -1,435 +0,0 @@
-require 'spec_helper'
-
-sources_list = {  ensure: 'file',
-                  path: '/etc/apt/sources.list',
-                  owner: 'root',
-                  group: 'root',
-                  mode: '0644',
-                  notify: 'Class[Apt::Update]' }
-
-sources_list_d = { ensure: 'directory',
-                   path: '/etc/apt/sources.list.d',
-                   owner: 'root',
-                   group: 'root',
-                   mode: '0644',
-                   purge: false,
-                   recurse: false,
-                   notify: 'Class[Apt::Update]' }
-
-preferences = { ensure: 'file',
-                path: '/etc/apt/preferences',
-                owner: 'root',
-                group: 'root',
-                mode: '0644',
-                notify: 'Class[Apt::Update]' }
-
-preferences_d = { ensure: 'directory',
-                  path: '/etc/apt/preferences.d',
-                  owner: 'root',
-                  group: 'root',
-                  mode: '0644',
-                  purge: false,
-                  recurse: false,
-                  notify: 'Class[Apt::Update]' }
-
-describe 'apt' do
-  let(:facts) do
-    {
-      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-      lsbdistid: 'Debian',
-      osfamily: 'Debian',
-      lsbdistcodename: 'wheezy',
-      puppetversion: Puppet.version,
-    }
-  end
-
-  context 'with defaults' do
-    it {
-      is_expected.to contain_file('sources.list').that_notifies('Class[Apt::Update]').only_with(sources_list)
-    }
-
-    it {
-      is_expected.to contain_file('sources.list.d').that_notifies('Class[Apt::Update]').only_with(sources_list_d)
-    }
-
-    it {
-      is_expected.to contain_file('preferences').that_notifies('Class[Apt::Update]').only_with(preferences)
-    }
-
-    it {
-      is_expected.to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with(preferences_d)
-    }
-
-    it { is_expected.to contain_file('/etc/apt/auth.conf').with_ensure('absent') }
-
-    it 'lays down /etc/apt/apt.conf.d/15update-stamp' do
-      is_expected.to contain_file('/etc/apt/apt.conf.d/15update-stamp').with(group: 'root',
-                                                                             mode: '0644',
-                                                                             owner: 'root').with_content(
-                                                                               %r{APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};},
-                                                                             )
-    end
-
-    it {
-      is_expected.to contain_exec('apt_update').with(refreshonly: 'true')
-    }
-
-    it { is_expected.not_to contain_apt__setting('conf-proxy') }
-  end
-
-  describe 'proxy=' do
-    context 'when host=localhost' do
-      let(:params) { { proxy: { 'host' => 'localhost' } } }
-
-      it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
-          %r{Acquire::http::proxy "http://localhost:8080/";},
-        ).without_content(
-          %r{Acquire::https::proxy},
-        )
-      }
-    end
-
-    context 'when host=localhost and port=8180' do
-      let(:params) { { proxy: { 'host' => 'localhost', 'port' => 8180 } } }
-
-      it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
-          %r{Acquire::http::proxy "http://localhost:8180/";},
-        ).without_content(
-          %r{Acquire::https::proxy},
-        )
-      }
-    end
-
-    context 'when host=localhost and https=true' do
-      let(:params) { { proxy: { 'host' => 'localhost', 'https' => true } } }
-
-      it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
-          %r{Acquire::http::proxy "http://localhost:8080/";},
-        ).with_content(
-          %r{Acquire::https::proxy "https://localhost:8080/";},
-        )
-      }
-    end
-
-    context 'when host=localhost and direct=true' do
-      let(:params) { { proxy: { 'host' => 'localhost', 'direct' => true } } }
-
-      it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
-          %r{Acquire::http::proxy "http://localhost:8080/";},
-        ).with_content(
-          %r{Acquire::https::proxy "DIRECT";},
-        )
-      }
-    end
-
-    context 'when host=localhost and https=true and direct=true' do
-      let(:params) { { proxy: { 'host' => 'localhost', 'https' => true, 'direct' => true } } }
-
-      it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
-          %r{Acquire::http::proxy "http://localhost:8080/";},
-        ).with_content(
-          %r{Acquire::https::proxy "https://localhost:8080/";},
-        )
-      }
-      it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
-          %r{Acquire::http::proxy "http://localhost:8080/";},
-        ).without_content(
-          %r{Acquire::https::proxy "DIRECT";},
-        )
-      }
-    end
-
-    context 'when ensure=absent' do
-      let(:params) { { proxy: { 'ensure' => 'absent' } } }
-
-      it {
-        is_expected.to contain_apt__setting('conf-proxy').with(ensure: 'absent',
-                                                               priority: '01')
-      }
-    end
-  end
-  context 'with lots of non-defaults' do
-    let :params do
-      {
-        update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
-        purge: { 'sources.list' => false, 'sources.list.d' => false,
-                 'preferences' => false, 'preferences.d' => false },
-      }
-    end
-
-    it {
-      is_expected.to contain_file('sources.list').with(content: nil)
-    }
-
-    it {
-      is_expected.to contain_file('sources.list.d').with(purge: false,
-                                                         recurse: false)
-    }
-
-    it {
-      is_expected.to contain_file('preferences').with(ensure: 'file')
-    }
-
-    it {
-      is_expected.to contain_file('preferences.d').with(purge: false,
-                                                        recurse: false)
-    }
-
-    it {
-      is_expected.to contain_exec('apt_update').with(refreshonly: false,
-                                                     timeout: 1,
-                                                     tries: 3)
-    }
-  end
-
-  context 'with entries for /etc/apt/auth.conf' do
-    let(:params) do
-      {
-        auth_conf_entries: [
-          { machine: 'deb.example.net',
-            login: 'foologin',
-            password: 'secret' },
-          { machine: 'apt.example.com',
-            login: 'aptlogin',
-            password: 'supersecret' },
-        ],
-      }
-    end
-
-    auth_conf_content = "// This file is managed by Puppet. DO NOT EDIT.
-machine deb.example.net login foologin password secret
-machine apt.example.com login aptlogin password supersecret
-"
-
-    it {
-      is_expected.to contain_file('/etc/apt/auth.conf').with(ensure: 'present',
-                                                             owner: 'root',
-                                                             group: 'root',
-                                                             mode: '0600',
-                                                             notify: 'Class[Apt::Update]',
-                                                             content: auth_conf_content)
-    }
-  end
-
-  context 'with improperly specified entries for /etc/apt/auth.conf' do
-    let(:params) do
-      {
-        auth_conf_entries: [
-          { machinn: 'deb.example.net',
-            username: 'foologin',
-            password: 'secret' },
-          { machine: 'apt.example.com',
-            login: 'aptlogin',
-            password: 'supersecret' },
-        ],
-      }
-    end
-
-    it { is_expected.to raise_error(Puppet::Error) }
-  end
-
-  context 'with sources defined on valid osfamily' do
-    let :facts do
-      { os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-        osfamily: 'Debian',
-        lsbdistcodename: 'xenial',
-        lsbdistid: 'Ubuntu',
-        lsbdistrelease: '16.04',
-        puppetversion: Puppet.version }
-    end
-    let(:params) do
-      { sources: {
-        'debian_unstable' => {
-          'location'          => 'http://debian.mirror.iweb.ca/debian/',
-          'release'           => 'unstable',
-          'repos'             => 'main contrib non-free',
-          'key'               => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' },
-          'pin'               => '-10',
-          'include'           => { 'src' => true },
-        },
-        'puppetlabs' => {
-          'location' => 'http://apt.puppetlabs.com',
-          'repos'      => 'main',
-          'key'        => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' },
-        },
-      } }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-debian_unstable').with(ensure: 'present')
-    }
-
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/debian_unstable.list').with_content(%r{^deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free$}) }
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/debian_unstable.list').with_content(%r{^deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free$}) }
-
-    it {
-      is_expected.to contain_apt__setting('list-puppetlabs').with(ensure: 'present')
-    }
-
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com xenial main$}) }
-  end
-
-  context 'with confs defined on valid osfamily' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-        osfamily: 'Debian',
-        lsbdistcodename: 'xenial',
-        lsbdistid: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let(:params) do
-      { confs: {
-        'foo' => {
-          'content' => 'foo',
-        },
-        'bar' => {
-          'content' => 'bar',
-        },
-      } }
-    end
-
-    it {
-      is_expected.to contain_apt__conf('foo').with(content: 'foo')
-    }
-
-    it {
-      is_expected.to contain_apt__conf('bar').with(content: 'bar')
-    }
-  end
-
-  context 'with keys defined on valid osfamily' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-        osfamily: 'Debian',
-        lsbdistcodename: 'xenial',
-        lsbdistid: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let(:params) do
-      { keys: {
-        '55BE302B' => {
-          'server' => 'subkeys.pgp.net',
-        },
-        'EF8D349F' => {
-          'server' => 'pgp.mit.edu',
-        },
-      } }
-    end
-
-    it {
-      is_expected.to contain_apt__key('55BE302B').with(server: 'subkeys.pgp.net')
-    }
-
-    it {
-      is_expected.to contain_apt__key('EF8D349F').with(server: 'pgp.mit.edu')
-    }
-  end
-
-  context 'with ppas defined on valid osfamily' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-        osfamily: 'Debian',
-        lsbdistcodename: 'xenial',
-        lsbdistid: 'ubuntu',
-        lsbdistrelease: '16.04',
-        puppetversion: Puppet.version,
-      }
-    end
-    let(:params) do
-      { ppas: {
-        'ppa:drizzle-developers/ppa' => {},
-        'ppa:nginx/stable' => {},
-      } }
-    end
-
-    it { is_expected.to contain_apt__ppa('ppa:drizzle-developers/ppa') }
-    it { is_expected.to contain_apt__ppa('ppa:nginx/stable') }
-  end
-
-  context 'with settings defined on valid osfamily' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-        osfamily: 'Debian',
-        lsbdistcodename: 'xenial',
-        lsbdistid: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let(:params) do
-      { settings: {
-        'conf-banana' => { 'content' => 'banana' },
-        'pref-banana' => { 'content' => 'banana' },
-      } }
-    end
-
-    it { is_expected.to contain_apt__setting('conf-banana') }
-    it { is_expected.to contain_apt__setting('pref-banana') }
-  end
-
-  context 'with pins defined on valid osfamily' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
-        osfamily: 'Debian',
-        lsbdistcodename: 'xenial',
-        lsbdistid: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let(:params) do
-      { pins: {
-        'stable' => { 'priority' => 600, 'order' => 50 },
-        'testing' =>  { 'priority' => 700, 'order' => 100 },
-      } }
-    end
-
-    it { is_expected.to contain_apt__pin('stable') }
-    it { is_expected.to contain_apt__pin('testing') }
-  end
-
-  describe 'failing tests' do
-    context "with purge['sources.list']=>'banana'" do
-      let(:params) { { purge: { 'sources.list' => 'banana' } } }
-
-      it do
-        is_expected.to raise_error(Puppet::Error)
-      end
-    end
-
-    context "with purge['sources.list.d']=>'banana'" do
-      let(:params) { { purge: { 'sources.list.d' => 'banana' } } }
-
-      it do
-        is_expected.to raise_error(Puppet::Error)
-      end
-    end
-
-    context "with purge['preferences']=>'banana'" do
-      let(:params) { { purge: { 'preferences' => 'banana' } } }
-
-      it do
-        is_expected.to raise_error(Puppet::Error)
-      end
-    end
-
-    context "with purge['preferences.d']=>'banana'" do
-      let(:params) { { purge: { 'preferences.d' => 'banana' } } }
-
-      it do
-        is_expected.to raise_error(Puppet::Error)
-      end
-    end
-  end
-end
diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb
deleted file mode 100644
index 3fb587e..0000000
--- a/spec/classes/apt_update_spec.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-require 'spec_helper'
-
-describe 'apt::update', type: :class do
-  context "when apt::update['frequency']='always'" do
-    {
-      'a recent run'                                 => Time.now.to_i,
-      'we are due for a run'                         => 1_406_660_561,
-      'the update-success-stamp file does not exist' => -1,
-    }.each_pair do |desc, factval|
-      context "when $::apt_update_last_success indicates #{desc}" do
-        let(:facts) do
-          {
-            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-            lsbdistid: 'Debian',
-            osfamily: 'Debian',
-            apt_update_last_success: factval,
-            lsbdistcodename: 'jessie',
-            puppetversion: Puppet.version,
-          }
-        end
-        let(:pre_condition) do
-          "class{'::apt': update => {'frequency' => 'always' },}"
-        end
-
-        it 'triggers an apt-get update run' do
-          # set the apt_update exec's refreshonly attribute to false
-          is_expected.to contain_exec('apt_update').with('refreshonly' => false)
-        end
-      end
-    end
-    context 'when $::apt_update_last_success is nil' do
-      let(:facts) do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          osfamily: 'Debian',
-          lsbdistcodename: 'jessie',
-          puppetversion: Puppet.version,
-        }
-      end
-      let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'always' },}" }
-
-      it 'triggers an apt-get update run' do
-        # set the apt_update exec\'s refreshonly attribute to false
-        is_expected.to contain_exec('apt_update').with('refreshonly' => false)
-      end
-    end
-  end
-  context "when apt::update['frequency']='reluctantly'" do
-    {
-      'a recent run'                                 => Time.now.to_i,
-      'we are due for a run'                         => 1_406_660_561,
-      'the update-success-stamp file does not exist' => -1,
-    }.each_pair do |desc, factval|
-      context "when $::apt_update_last_success indicates #{desc}" do
-        let(:facts) do
-          {
-            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-            lsbdistid: 'Debian',
-            osfamily: 'Debian',
-            apt_update_last_success: factval,
-            lsbdistcodename: 'jessie',
-            puppetversion: Puppet.version,
-          }
-        end
-        let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
-
-        it 'does not trigger an apt-get update run' do
-          # don't change the apt_update exec's refreshonly attribute. (it should be true)
-          is_expected.to contain_exec('apt_update').with('refreshonly' => true)
-        end
-      end
-    end
-    context 'when $::apt_update_last_success is nil' do
-      let(:facts) do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          osfamily: 'Debian',
-          lsbdistcodename: 'jessie',
-          puppetversion: Puppet.version,
-        }
-      end
-      let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
-
-      it 'does not trigger an apt-get update run' do
-        # don't change the apt_update exec's refreshonly attribute. (it should be true)
-        is_expected.to contain_exec('apt_update').with('refreshonly' => true)
-      end
-    end
-  end
-  ['daily', 'weekly'].each do |update_frequency|
-    context "when apt::update['frequency'] has the value of #{update_frequency}" do
-      { 'we are due for a run' => 1_406_660_561, 'the update-success-stamp file does not exist' => -1 }.each_pair do |desc, factval|
-        context "when $::apt_update_last_success indicates #{desc}" do
-          let(:facts) do
-            {
-              os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-              lsbdistid: 'Debian',
-              osfamily: 'Debian',
-              apt_update_last_success: factval,
-              lsbdistcodename: 'jessie',
-              puppetversion: Puppet.version,
-            }
-          end
-          let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
-
-          it 'triggers an apt-get update run' do
-            # set the apt_update exec\'s refreshonly attribute to false
-            is_expected.to contain_exec('apt_update').with('refreshonly' => false)
-          end
-        end
-      end
-      context 'when the $::apt_update_last_success fact has a recent value' do
-        let(:facts) do
-          {
-            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-            lsbdistid: 'Debian',
-            osfamily: 'Debian',
-            lsbdistcodename: 'jessie',
-            apt_update_last_success: Time.now.to_i,
-            puppetversion: Puppet.version,
-          }
-        end
-        let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
-
-        it 'does not trigger an apt-get update run' do
-          # don't change the apt_update exec\'s refreshonly attribute. (it should be true)
-          is_expected.to contain_exec('apt_update').with('refreshonly' => true)
-        end
-      end
-      context 'when $::apt_update_last_success is nil' do
-        let(:facts) do
-          {
-            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-            lsbdistid: 'Debian',
-            osfamily: 'Debian',
-            lsbdistcodename: 'jessie',
-            apt_update_last_success: nil,
-            puppetversion: Puppet.version,
-          }
-        end
-        let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
-
-        it 'triggers an apt-get update run' do
-          # set the apt_update exec\'s refreshonly attribute to false
-          is_expected.to contain_exec('apt_update').with('refreshonly' => false)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
deleted file mode 100644
index e10d991..0000000
--- a/spec/default_facts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Use default_module_facts.yml for module specific facts.
-#
-# Facts specified here will override the values provided by rspec-puppet-facts.
----
-concat_basedir: ""
-ipaddress: "172.16.254.254"
-is_pe: false
-macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb
deleted file mode 100644
index 7f75fd9..0000000
--- a/spec/defines/conf_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require 'spec_helper'
-describe 'apt::conf', type: :define do
-  let :pre_condition do
-    'class { "apt": }'
-  end
-  let(:facts) do
-    {
-      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-      lsbdistid: 'Debian',
-      osfamily: 'Debian',
-      lsbdistcodename: 'jessie',
-      puppetversion: Puppet.version,
-    }
-  end
-  let :title do
-    'norecommends'
-  end
-
-  describe 'when creating an apt preference' do
-    let :default_params do
-      {
-        priority: '00',
-        content: "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n",
-      }
-    end
-    let :params do
-      default_params
-    end
-
-    let :filename do
-      '/etc/apt/apt.conf.d/00norecommends'
-    end
-
-    it {
-      is_expected.to contain_file(filename).with('ensure' => 'present',
-                                                 'content'   => %r{Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;},
-                                                 'owner'     => 'root',
-                                                 'group'     => 'root',
-                                                 'mode'      => '0644')
-    }
-
-    context 'with notify_update = true (default)' do
-      let :params do
-        default_params
-      end
-
-      it { is_expected.to contain_apt__setting("conf-#{title}").with_notify_update(true) }
-    end
-
-    context 'with notify_update = false' do
-      let :params do
-        default_params.merge(notify_update: false)
-      end
-
-      it { is_expected.to contain_apt__setting("conf-#{title}").with_notify_update(false) }
-    end
-  end
-
-  describe 'when creating a preference without content' do
-    let :params do
-      {
-        priority: '00',
-      }
-    end
-
-    it 'fails' do
-      is_expected.to raise_error(%r{pass in content})
-    end
-  end
-
-  describe 'when removing an apt preference' do
-    let :params do
-      {
-        ensure: 'absent',
-        priority: '00',
-      }
-    end
-
-    let :filename do
-      '/etc/apt/apt.conf.d/00norecommends'
-    end
-
-    it {
-      is_expected.to contain_file(filename).with('ensure' => 'absent',
-                                                 'owner'     => 'root',
-                                                 'group'     => 'root',
-                                                 'mode'      => '0644')
-    }
-  end
-end
diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb
deleted file mode 100644
index 7a6804c..0000000
--- a/spec/defines/key_compat_spec.rb
+++ /dev/null
@@ -1,360 +0,0 @@
-require 'spec_helper'
-
-def contains_apt_key_example(title)
-  { id: title,
-    ensure: 'present',
-    source: 'http://apt.puppetlabs.com/pubkey.gpg',
-    server: 'pgp.mit.edu',
-    content: params[:content],
-    options: 'debug' }
-end
-
-def apt_key_example(title)
-  { id: title,
-    ensure: 'present',
-    source: nil,
-    server: 'keyserver.ubuntu.com',
-    content: nil,
-    keyserver_options: nil }
-end
-
-describe 'apt::key', type: :define do
-  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
-
-  let(:facts) do
-    {
-      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-      lsbdistid: 'Debian',
-      osfamily: 'Debian',
-      puppetversion: Puppet.version,
-    }
-  end
-
-  let :title do
-    GPG_KEY_ID
-  end
-
-  let :pre_condition do
-    'include apt'
-  end
-
-  describe 'normal operation' do
-    describe 'default options' do
-      it {
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   ensure: 'present',
-                                                   source: nil,
-                                                   server: 'keyserver.ubuntu.com',
-                                                   content: nil)
-      }
-      it 'contains the apt_key present anchor' do
-        is_expected.to contain_anchor("apt_key #{title} present")
-      end
-    end
-
-    describe 'title and key =>' do
-      let :title do
-        'puppetlabs'
-      end
-
-      let :params do
-        {
-          id: GPG_KEY_ID,
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: GPG_KEY_ID,
-                                                   ensure: 'present',
-                                                   source: nil,
-                                                   server: 'keyserver.ubuntu.com',
-                                                   content: nil)
-      end
-      it 'contains the apt_key present anchor' do
-        is_expected.to contain_anchor("apt_key #{GPG_KEY_ID} present")
-      end
-    end
-
-    describe 'ensure => absent' do
-      let :params do
-        {
-          ensure: 'absent',
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   ensure: 'absent',
-                                                   source: nil,
-                                                   server: 'keyserver.ubuntu.com',
-                                                   content: nil)
-      end
-      it 'contains the apt_key absent anchor' do
-        is_expected.to contain_anchor("apt_key #{title} absent")
-      end
-    end
-
-    describe 'set a bunch of things!' do
-      let :params do
-        {
-          content: 'GPG key content',
-          source: 'http://apt.puppetlabs.com/pubkey.gpg',
-          server: 'pgp.mit.edu',
-          options: 'debug',
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(contains_apt_key_example(title))
-      end
-      it 'contains the apt_key present anchor' do
-        is_expected.to contain_anchor("apt_key #{title} present")
-      end
-    end
-
-    context 'when domain has dash' do
-      let(:params) do
-        {
-          server: 'p-gp.m-it.edu',
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   server: 'p-gp.m-it.edu')
-      end
-    end
-
-    context 'with url' do
-      let :params do
-        {
-          server: 'hkp://pgp.mit.edu',
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   server: 'hkp://pgp.mit.edu')
-      end
-    end
-    context 'with url and port number' do
-      let :params do
-        {
-          server: 'hkp://pgp.mit.edu:80',
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   server: 'hkp://pgp.mit.edu:80')
-      end
-    end
-  end
-
-  describe 'validation' do
-    context 'when domain begins with a dash' do
-      let(:params) do
-        {
-          server: '-pgp.mit.edu',
-        }
-      end
-
-      it 'fails' do
-        is_expected .to raise_error(%r{expects a match})
-      end
-    end
-
-    context 'when domain begins with dot' do
-      let(:params) do
-        {
-          server: '.pgp.mit.edu',
-        }
-      end
-
-      it 'fails' do
-        is_expected .to raise_error(%r{expects a match})
-      end
-    end
-
-    context 'when domain ends with dot' do
-      let(:params) do
-        {
-          server: 'pgp.mit.edu.',
-        }
-      end
-
-      it 'fails' do
-        is_expected .to raise_error(%r{expects a match})
-      end
-    end
-    context 'when url character limit is exceeded' do
-      let :params do
-        {
-          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with incorrect port number url' do
-      let :params do
-        {
-          server: 'hkp://pgp.mit.edu:8008080',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with incorrect protocol for  url' do
-      let :params do
-        {
-          server: 'abc://pgp.mit.edu:80',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with missing port number url' do
-      let :params do
-        {
-          server: 'hkp://pgp.mit.edu:',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with url ending with a dot' do
-      let :params do
-        {
-          server: 'hkp://pgp.mit.edu.',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with url begin with a dash' do
-      let(:params) do
-        {
-          server: 'hkp://-pgp.mit.edu',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with invalid key' do
-      let :title do
-        'Out of rum. Why? Why are we out of rum?'
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-
-    context 'with invalid source' do
-      let :params do
-        {
-          source: 'afp://puppetlabs.com/key.gpg',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{evaluating a Resource})
-      end
-    end
-
-    context 'with invalid content' do
-      let :params do
-        {
-          content: [],
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a})
-      end
-    end
-
-    context 'with invalid server' do
-      let :params do
-        {
-          server: 'two bottles of rum',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-
-    context 'with invalid keyserver_options' do
-      let :params do
-        {
-          options: {},
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a})
-      end
-    end
-
-    context 'with invalid ensure' do
-      let :params do
-        {
-          ensure: 'foo',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{Enum\['absent', 'present', 'refreshed'\]})
-      end
-    end
-
-    describe 'duplication - two apt::key resources for same key, different titles' do
-      let :pre_condition do
-        "#{super()}\napt::key { 'duplicate': id => '#{title}', }"
-      end
-
-      it 'contains the duplicate apt::key resource' do
-        is_expected.to contain_apt__key('duplicate').with(id: title,
-                                                          ensure: 'present')
-      end
-
-      it 'contains the original apt::key resource' do
-        is_expected.to contain_apt__key(title).with(id: title,
-                                                    ensure: 'present')
-      end
-
-      it 'contains the native apt_key' do
-        is_expected.to contain_apt_key('duplicate').with(apt_key_example(title))
-      end
-
-      it 'does not contain the original apt_key' do
-        is_expected.not_to contain_apt_key(title)
-      end
-    end
-
-    describe 'duplication - two apt::key resources, different ensure' do
-      let :pre_condition do
-        "#{super()}\napt::key { 'duplicate': id => '#{title}', ensure => 'absent', }"
-      end
-
-      it 'informs the user of the impossibility' do
-        is_expected.to raise_error(%r{already ensured as absent})
-      end
-    end
-  end
-end
diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb
deleted file mode 100644
index cf596e9..0000000
--- a/spec/defines/key_spec.rb
+++ /dev/null
@@ -1,382 +0,0 @@
-require 'spec_helper'
-
-GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
-
-title_key_example = { id: GPG_KEY_ID,
-                      ensure: 'present',
-                      source: nil,
-                      server: 'keyserver.ubuntu.com',
-                      content: nil,
-                      options: nil }
-
-def default_apt_key_example(title)
-  { id: title,
-    ensure: 'present',
-    source: nil,
-    server: 'keyserver.ubuntu.com',
-    content: nil,
-    options: nil }
-end
-
-def bunch_things_apt_key_example(title, params)
-  { id: title,
-    ensure: 'present',
-    source: 'http://apt.puppetlabs.com/pubkey.gpg',
-    server: 'pgp.mit.edu',
-    content: params[:content],
-    options: 'debug' }
-end
-
-def absent_apt_key(title)
-  { id: title,
-    ensure: 'absent',
-    source: nil,
-    server: 'keyserver.ubuntu.com',
-    content: nil,
-    keyserver: nil }
-end
-
-describe 'apt::key' do
-  let :pre_condition do
-    'class { "apt": }'
-  end
-
-  let(:facts) do
-    {
-      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-      lsbdistid: 'Debian',
-      osfamily: 'Debian',
-      lsbdistcodename: 'jessie',
-      puppetversion: Puppet.version,
-    }
-  end
-
-  let :title do
-    GPG_KEY_ID
-  end
-
-  describe 'normal operation' do
-    describe 'default options' do
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(default_apt_key_example(title))
-      end
-      it 'contains the apt_key present anchor' do
-        is_expected.to contain_anchor("apt_key #{title} present")
-      end
-    end
-
-    describe 'title and key =>' do
-      let :title do
-        'puppetlabs'
-      end
-
-      let :params do
-        {
-          id: GPG_KEY_ID,
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(title_key_example)
-      end
-      it 'contains the apt_key present anchor' do
-        is_expected.to contain_anchor("apt_key #{GPG_KEY_ID} present")
-      end
-    end
-
-    describe 'ensure => absent' do
-      let :params do
-        {
-          ensure: 'absent',
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(absent_apt_key(title))
-      end
-      it 'contains the apt_key absent anchor' do
-        is_expected.to contain_anchor("apt_key #{title} absent")
-      end
-    end
-
-    describe 'ensure => refreshed' do
-      let :params do
-        {
-          ensure: 'refreshed',
-        }
-      end
-
-      it 'contains the apt_key with refresh => true' do
-        is_expected.to contain_apt_key(title).with(
-          ensure: 'present',
-          refresh: true,
-        )
-      end
-    end
-
-    describe 'set a bunch of things!' do
-      let :params do
-        {
-          content: 'GPG key content',
-          source: 'http://apt.puppetlabs.com/pubkey.gpg',
-          server: 'pgp.mit.edu',
-          options: 'debug',
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(bunch_things_apt_key_example(title, params))
-      end
-      it 'contains the apt_key present anchor' do
-        is_expected.to contain_anchor("apt_key #{title} present")
-      end
-    end
-
-    context 'when domain with dash' do
-      let(:params) do
-        {
-          server: 'p-gp.m-it.edu',
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   server: 'p-gp.m-it.edu')
-      end
-    end
-
-    context 'with url' do
-      let :params do
-        {
-          server: 'hkp://pgp.mit.edu',
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   server: 'hkp://pgp.mit.edu')
-      end
-    end
-    context 'when url with port number' do
-      let :params do
-        {
-          server: 'hkp://pgp.mit.edu:80',
-        }
-      end
-
-      it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   server: 'hkp://pgp.mit.edu:80')
-      end
-    end
-  end
-
-  describe 'validation' do
-    context 'when domain begin with dash' do
-      let(:params) do
-        {
-          server: '-pgp.mit.edu',
-        }
-      end
-
-      it 'fails' do
-        is_expected .to raise_error(%r{expects a match})
-      end
-    end
-
-    context 'when domain begin with dot' do
-      let(:params) do
-        {
-          server: '.pgp.mit.edu',
-        }
-      end
-
-      it 'fails' do
-        is_expected .to raise_error(%r{expects a match})
-      end
-    end
-
-    context 'when domain end with dot' do
-      let(:params) do
-        {
-          server: 'pgp.mit.edu.',
-        }
-      end
-
-      it 'fails' do
-        is_expected .to raise_error(%r{expects a match})
-      end
-    end
-    context 'when character url exceeded' do
-      let :params do
-        {
-          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with incorrect port number url' do
-      let :params do
-        {
-          server: 'hkp://pgp.mit.edu:8008080',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with incorrect protocol for url' do
-      let :params do
-        {
-          server: 'abc://pgp.mit.edu:80',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with missing port number url' do
-      let :params do
-        {
-          server: 'hkp://pgp.mit.edu:',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with url ending with a dot' do
-      let :params do
-        {
-          server: 'hkp://pgp.mit.edu.',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'when url begins with a dash' do
-      let(:params) do
-        {
-          server: 'hkp://-pgp.mit.edu',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-    context 'with invalid key' do
-      let :title do
-        'Out of rum. Why? Why are we out of rum?'
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-
-    context 'with invalid source' do
-      let :params do
-        {
-          source: 'afp://puppetlabs.com/key.gpg',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{evaluating a Resource})
-      end
-    end
-
-    context 'with invalid content' do
-      let :params do
-        {
-          content: [],
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a})
-      end
-    end
-
-    context 'with invalid server' do
-      let :params do
-        {
-          server: 'two bottles of rum',
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a match})
-      end
-    end
-
-    context 'with invalid options' do
-      let :params do
-        {
-          options: {},
-        }
-      end
-
-      it 'fails' do
-        is_expected.to raise_error(%r{expects a})
-      end
-    end
-
-    context 'with invalid ensure' do
-      ['foo', 'aabsent', 'absenta', 'apresent', 'presenta', 'refresh', 'arefreshed', 'refresheda'].each do |param|
-        let :params do
-          {
-            ensure: param,
-          }
-        end
-
-        it 'fails' do
-          is_expected.to raise_error(%r{for Enum\['absent', 'present', 'refreshed'\], got})
-        end
-      end
-    end
-
-    describe 'duplication - two apt::key resources for same key, different titles' do
-      let :pre_condition do
-        "class { 'apt': }
-        apt::key { 'duplicate': id => '#{title}', }"
-      end
-
-      it 'contains two apt::key resource - duplicate' do
-        is_expected.to contain_apt__key('duplicate').with(id: title,
-                                                          ensure: 'present')
-      end
-      it 'contains two apt::key resource - title' do
-        is_expected.to contain_apt__key(title).with(id: title,
-                                                    ensure: 'present')
-      end
-
-      it 'contains only a single apt_key - duplicate' do
-        is_expected.to contain_apt_key('duplicate').with(default_apt_key_example(title))
-      end
-      it 'contains only a single apt_key - no title' do
-        is_expected.not_to contain_apt_key(title)
-      end
-    end
-
-    describe 'duplication - two apt::key resources, different ensure' do
-      let :pre_condition do
-        "class { 'apt': }
-        apt::key { 'duplicate': id => '#{title}', ensure => 'absent', }"
-      end
-
-      it 'informs the user of the impossibility' do
-        is_expected.to raise_error(%r{already ensured as absent})
-      end
-    end
-  end
-end
diff --git a/spec/defines/pin_spec.rb b/spec/defines/pin_spec.rb
deleted file mode 100644
index 1d0c6b1..0000000
--- a/spec/defines/pin_spec.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-require 'spec_helper'
-describe 'apt::pin', type: :define do
-  let :pre_condition do
-    'class { "apt": }'
-  end
-  let(:facts) do
-    {
-      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-      lsbdistid: 'Debian',
-      osfamily: 'Debian',
-      lsbdistcodename: 'jessie',
-      puppetversion: Puppet.version,
-    }
-  end
-  let(:title) { 'my_pin' }
-
-  context 'with defaults' do
-    it { is_expected.to contain_apt__setting('pref-my_pin').with_content(%r{Explanation: : my_pin\nPackage: \*\nPin: release a=my_pin\nPin-Priority: 0\n}) }
-  end
-
-  context 'with set version' do
-    let :params do
-      {
-        'packages' => 'vim',
-        'version'  => '1',
-      }
-    end
-
-    it { is_expected.to contain_apt__setting('pref-my_pin').with_content(%r{Explanation: : my_pin\nPackage: vim\nPin: version 1\nPin-Priority: 0\n}) }
-  end
-
-  context 'with set origin' do
-    let :params do
-      {
-        'packages' => 'vim',
-        'origin'   => 'test',
-      }
-    end
-
-    it { is_expected.to contain_apt__setting('pref-my_pin').with_content(%r{Explanation: : my_pin\nPackage: vim\nPin: origin test\nPin-Priority: 0\n}) }
-  end
-
-  context 'without defaults' do
-    let :params do
-      {
-        'explanation'     => 'foo',
-        'order'           => 99,
-        'release'         => '1',
-        'codename'        => 'bar',
-        'release_version' => '2',
-        'component'       => 'baz',
-        'originator'      => 'foobar',
-        'label'           => 'foobaz',
-        'priority'        => 10,
-      }
-    end
-
-    it { is_expected.to contain_apt__setting('pref-my_pin').with_content(%r{Explanation: foo\nPackage: \*\nPin: release a=1, n=bar, v=2, c=baz, o=foobar, l=foobaz\nPin-Priority: 10\n}) }
-    it {
-      is_expected.to contain_apt__setting('pref-my_pin').with('priority' => 99)
-    }
-  end
-
-  context 'with ensure absent' do
-    let :params do
-      {
-        'ensure' => 'absent',
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('pref-my_pin').with('ensure' => 'absent')
-    }
-  end
-
-  context 'with bad characters' do
-    let(:title) { 'such  bad && wow!' }
-
-    it { is_expected.to contain_apt__setting('pref-such__bad____wow_') }
-  end
-
-  describe 'validation' do
-    context 'with invalid order' do
-      let :params do
-        {
-          'order' => 'foo',
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{expects an Integer value, got String})
-      end
-    end
-
-    context 'with packages == * and version' do
-      let :params do
-        {
-          'version' => '1',
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{parameter version cannot be used in general form})
-      end
-    end
-
-    context 'with packages == * and release and origin' do
-      let :params do
-        {
-          'origin'  => 'test',
-          'release' => 'foo',
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{parameters release and origin are mutually exclusive})
-      end
-    end
-
-    context 'with specific release and origin' do
-      let :params do
-        {
-          'release'  => 'foo',
-          'origin'   => 'test',
-          'packages' => 'vim',
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{parameters release, origin, and version are mutually exclusive})
-      end
-    end
-
-    context 'with specific version and origin' do
-      let :params do
-        {
-          'version'  => '1',
-          'origin'   => 'test',
-          'packages' => 'vim',
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{parameters release, origin, and version are mutually exclusive})
-      end
-    end
-  end
-end
diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
deleted file mode 100644
index fa893b6..0000000
--- a/spec/defines/ppa_spec.rb
+++ /dev/null
@@ -1,339 +0,0 @@
-require 'spec_helper'
-describe 'apt::ppa' do
-  let :pre_condition do
-    'class { "apt": }'
-  end
-
-  describe 'defaults' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '41.04' } },
-        lsbdistrelease: '14.04',
-        lsbdistcodename: 'trusty',
-        operatingsystem: 'Ubuntu',
-        osfamily: 'Debian',
-        lsbdistid: 'Ubuntu',
-        puppetversion: Puppet.version,
-      }
-    end
-
-    let(:title) { 'ppa:needs/such.substitution/wow+type' }
-
-    it { is_expected.not_to contain_package('python-software-properties') }
-    it {
-      is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow+type').that_notifies('Class[Apt::Update]').with(environment: [],
-                                                                                                                                      command: '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type || (rm /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                                                      unless: '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow_type.gpg', # rubocop:disable Metrics/LineLength
-                                                                                                                                      user: 'root',
-                                                                                                                                      logoutput: 'on_failure')
-    }
-  end
-
-  describe 'Ubuntu 15.10 sources.list filename' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '15', full: '15.10' } },
-        lsbdistrelease: '15.10',
-        lsbdistcodename: 'wily',
-        operatingsystem: 'Ubuntu',
-        osfamily: 'Debian',
-        lsbdistid: 'Ubuntu',
-        puppetversion: Puppet.version,
-      }
-    end
-
-    let(:title) { 'ppa:user/foo' }
-
-    it {
-      is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: [],
-                                                                                                              command: '/usr/bin/add-apt-repository -y ppa:user/foo || (rm /etc/apt/sources.list.d/user-ubuntu-foo-wily.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                              unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-ubuntu-foo-wily.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user_ubuntu_foo.gpg', # rubocop:disable Metrics/LineLength
-                                                                                                              user: 'root',
-                                                                                                              logoutput: 'on_failure')
-    }
-  end
-
-  describe 'package_name => software-properties-common' do
-    let :pre_condition do
-      'class { "apt": }'
-    end
-    let :params do
-      {
-        package_name: 'software-properties-common',
-        package_manage: true,
-      }
-    end
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
-        lsbdistrelease: '14.04',
-        lsbdistcodename: 'trusty',
-        operatingsystem: 'Ubuntu',
-        osfamily: 'Debian',
-        lsbdistid: 'Ubuntu',
-        puppetversion: Puppet.version,
-      }
-    end
-
-    let(:title) { 'ppa:needs/such.substitution/wow' }
-
-    it { is_expected.to contain_package('software-properties-common') }
-    it {
-      is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with('environment' => [],
-                                                                                                                                 'command'     => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow || (rm /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                                                 'unless'      => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow.gpg', # rubocop:disable Metrics/LineLength
-                                                                                                                                 'user'        => 'root',
-                                                                                                                                 'logoutput'   => 'on_failure')
-    }
-
-    it {
-      is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file')
-    }
-  end
-
-  describe 'package_manage => false' do
-    let :pre_condition do
-      'class { "apt": }'
-    end
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
-        lsbdistrelease: '14.04',
-        lsbdistcodename: 'trusty',
-        operatingsystem: 'Ubuntu',
-        osfamily: 'Debian',
-        lsbdistid: 'Ubuntu',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        package_manage: false,
-      }
-    end
-
-    let(:title) { 'ppa:needs/such.substitution/wow' }
-
-    it { is_expected.not_to contain_package('python-software-properties') }
-    it {
-      is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with('environment' => [],
-                                                                                                                                 'command'     => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow || (rm /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                                                 'unless'      => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow.gpg', # rubocop:disable Metrics/LineLength
-                                                                                                                                 'user'        => 'root',
-                                                                                                                                 'logoutput'   => 'on_failure')
-    }
-
-    it {
-      is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file')
-    }
-  end
-
-  describe 'apt included, no proxy' do
-    let :pre_condition do
-      'class { "apt": }
-      apt::ppa { "ppa:user/foo2": }
-      '
-    end
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
-        lsbdistrelease: '14.04',
-        lsbdistcodename: 'trusty',
-        operatingsystem: 'Ubuntu',
-        lsbdistid: 'Ubuntu',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        options: '',
-        package_manage: true,
-        require: 'Apt::Ppa[ppa:user/foo2]',
-      }
-    end
-    let(:title) { 'ppa:user/foo' }
-
-    it { is_expected.to compile.with_all_deps }
-    it { is_expected.to contain_package('software-properties-common') }
-    it {
-      is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: [],
-                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                              unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
-                                                                                                              user: 'root',
-                                                                                                              logoutput: 'on_failure')
-    }
-  end
-
-  describe 'apt included, proxy host' do
-    let :pre_condition do
-      'class { "apt":
-        proxy => { "host" => "localhost" },
-      }'
-    end
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
-        lsbdistrelease: '14.04',
-        lsbdistcodename: 'trusty',
-        operatingsystem: 'Ubuntu',
-        lsbdistid: 'Ubuntu',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        'options' => '',
-        'package_manage' => true,
-      }
-    end
-    let(:title) { 'ppa:user/foo' }
-
-    it { is_expected.to contain_package('software-properties-common') }
-    it {
-      is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8080'],
-                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                              unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
-                                                                                                              user: 'root',
-                                                                                                              logoutput: 'on_failure')
-    }
-  end
-
-  describe 'apt included, proxy host and port' do
-    let :pre_condition do
-      'class { "apt":
-        proxy => { "host" => "localhost", "port" => 8180 },
-      }'
-    end
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
-        lsbdistrelease: '14.04',
-        lsbdistcodename: 'trusty',
-        operatingsystem: 'Ubuntu',
-        lsbdistid: 'Ubuntu',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        options: '',
-        package_manage: true,
-      }
-    end
-    let(:title) { 'ppa:user/foo' }
-
-    it { is_expected.to contain_package('software-properties-common') }
-    it {
-      is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8180'],
-                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                              unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
-                                                                                                              user: 'root',
-                                                                                                              logoutput: 'on_failure')
-    }
-  end
-
-  describe 'apt included, proxy host and port and https' do
-    let :pre_condition do
-      'class { "apt":
-        proxy => { "host" => "localhost", "port" => 8180, "https" => true },
-      }'
-    end
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
-        lsbdistrelease: '14.04',
-        lsbdistcodename: 'trusty',
-        operatingsystem: 'Ubuntu',
-        lsbdistid: 'Ubuntu',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        options: '',
-        package_manage: true,
-      }
-    end
-    let(:title) { 'ppa:user/foo' }
-
-    it { is_expected.to contain_package('software-properties-common') }
-    it {
-      is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with(environment: ['http_proxy=http://localhost:8180', 'https_proxy=https://localhost:8180'],
-                                                                                                              command: '/usr/bin/add-apt-repository  ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength
-                                                                                                              unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength
-                                                                                                              user: 'root',
-                                                                                                              logoutput: 'on_failure')
-    }
-  end
-
-  describe 'ensure absent' do
-    let :pre_condition do
-      'class { "apt": }'
-    end
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
-        lsbdistrelease: '14.04',
-        lsbdistcodename: 'trusty',
-        operatingsystem: 'Ubuntu',
-        lsbdistid: 'Ubuntu',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let(:title) { 'ppa:user/foo' }
-    let :params do
-      {
-        ensure: 'absent',
-      }
-    end
-
-    it {
-      is_expected.to contain_file('/etc/apt/sources.list.d/user-foo-trusty.list').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
-    }
-  end
-
-  context 'with validation' do
-    describe 'no release' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
-          lsbdistrelease: '14.04',
-          operatingsystem: 'Ubuntu',
-          lsbdistid: 'Ubuntu',
-          osfamily: 'Debian',
-          lsbdistcodeanme: nil,
-          puppetversion: Puppet.version,
-        }
-      end
-      let(:title) { 'ppa:user/foo' }
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{lsbdistcodename fact not available: release parameter required})
-      end
-    end
-
-    describe 'not ubuntu' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '6', full: '6.0.7' } },
-          lsbdistrelease: '6.0.7',
-          lsbdistcodename: 'wheezy',
-          operatingsystem: 'Debian',
-          lsbdistid: 'debian',
-          osfamily: 'Debian',
-          puppetversion: Puppet.version,
-        }
-      end
-      let(:title) { 'ppa:user/foo' }
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{not currently supported on Debian})
-      end
-    end
-  end
-end
diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb
deleted file mode 100644
index 2d70414..0000000
--- a/spec/defines/setting_spec.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-require 'spec_helper'
-
-describe 'apt::setting' do
-  let(:pre_condition) { 'class { "apt": }' }
-  let :facts do
-    {
-      os: { distro: { codename: 'wheezy' }, family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-      lsbdistrelease: '8.0',
-      lsbdistcodename: 'jessie',
-      operatingsystem: 'Debian',
-      osfamily: 'Debian',
-      lsbdistid: 'Debian',
-      puppetversion: Puppet.version,
-    }
-  end
-  let(:title) { 'conf-teddybear' }
-
-  let(:default_params) { { content: 'di' } }
-
-  describe 'when using the defaults' do
-    context 'without source or content' do
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{needs either of })
-      end
-    end
-
-    context 'with title=conf-teddybear ' do
-      let(:params) { default_params }
-
-      it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]') }
-    end
-
-    context 'with title=pref-teddybear' do
-      let(:title) { 'pref-teddybear' }
-      let(:params) { default_params }
-
-      it { is_expected.to contain_file('/etc/apt/preferences.d/teddybear.pref').that_notifies('Class[Apt::Update]') }
-    end
-
-    context 'with title=list-teddybear' do
-      let(:title) { 'list-teddybear' }
-      let(:params) { default_params }
-
-      it { is_expected.to contain_file('/etc/apt/sources.list.d/teddybear.list').that_notifies('Class[Apt::Update]') }
-    end
-
-    context 'with source' do
-      let(:params) { { source: 'puppet:///la/die/dah' } }
-
-      it {
-        is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'file',
-                                                                                                                owner: 'root',
-                                                                                                                group: 'root',
-                                                                                                                mode: '0644',
-                                                                                                                source: params[:source].to_s)
-      }
-    end
-
-    context 'with content' do
-      let(:params) { default_params }
-
-      it {
-        is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'file',
-                                                                                                                owner: 'root',
-                                                                                                                group: 'root',
-                                                                                                                mode: '0644',
-                                                                                                                content: params[:content].to_s)
-      }
-    end
-  end
-
-  describe 'settings requiring settings, MODULES-769' do
-    let(:pre_condition) do
-      'class { "apt": }
-      apt::setting { "list-teddybear": content => "foo" }
-      '
-    end
-    let(:facts) do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        osfamily: 'Debian',
-        lsbdistcodename: 'jessie',
-        puppetversion: Puppet.version,
-      }
-    end
-    let(:title) { 'conf-teddybear' }
-    let(:default_params) { { content: 'di' } }
-
-    let(:params) { default_params.merge(require: 'Apt::Setting[list-teddybear]') }
-
-    it { is_expected.to compile.with_all_deps }
-  end
-
-  describe 'when trying to pull one over' do
-    context 'with source and content' do
-      let(:params) { default_params.merge(source: 'la') }
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{cannot have both })
-      end
-    end
-
-    context 'with title=ext-teddybear' do
-      let(:title) { 'ext-teddybear' }
-      let(:params) { default_params }
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{must start with either})
-      end
-    end
-
-    context 'with ensure=banana' do
-      let(:params) { default_params.merge(ensure: 'banana') }
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{Enum\['absent', 'file', 'present'\]})
-      end
-    end
-
-    context 'with priority=1.2' do
-      let(:params) { default_params.merge(priority: 1.2) }
-
-      if Puppet::Util::Package.versioncmp(Puppet.version, '4.0') >= 0 || ENV['FUTURE_PARSER'] == 'yes'
-        it { is_expected.to compile.and_raise_error(%r{expects a value of type}) }
-      else
-        it { is_expected.to compile.and_raise_error(%r{priority must be an integer or a zero-padded integer}) }
-      end
-    end
-  end
-
-  describe 'with priority=100' do
-    let(:params) { default_params.merge(priority: 100) }
-
-    it { is_expected.to contain_file('/etc/apt/apt.conf.d/100teddybear').that_notifies('Class[Apt::Update]') }
-  end
-
-  describe 'with ensure=absent' do
-    let(:params) { default_params.merge(ensure: 'absent') }
-
-    it {
-      is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
-    }
-  end
-end
diff --git a/spec/defines/source_compat_spec.rb b/spec/defines/source_compat_spec.rb
deleted file mode 100644
index 907fde1..0000000
--- a/spec/defines/source_compat_spec.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-require 'spec_helper'
-
-describe 'apt::source', type: :define do
-  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
-
-  let :title do
-    'my_source'
-  end
-
-  context 'with mostly defaults' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-
-    let :params do
-      {
-        'include' => { 'deb' => false, 'src' => true },
-        'location' => 'http://debian.mirror.iweb.ca/debian/',
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb-src http://debian.mirror.iweb.ca/debian/ jessie main\n})
-    }
-  end
-
-  context 'with no defaults' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        'comment'        => 'foo',
-        'location'       => 'http://debian.mirror.iweb.ca/debian/',
-        'release'        => 'sid',
-        'repos'          => 'testing',
-        'include'        => { 'src' => false },
-        'key'            => GPG_KEY_ID,
-        'pin'            => '10',
-        'architecture'   => 'x86_64',
-        'allow_unsigned' => true,
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with_content(%r{# foo\ndeb \[arch=x86_64 trusted=yes\] http://debian.mirror.iweb.ca/debian/ sid testing\n})
-                                                           .without_content(%r{deb-src})
-    }
-
-    it {
-      is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with('ensure' => 'present',
-                                                                                                          'priority' => '10',
-                                                                                                          'origin'   => 'debian.mirror.iweb.ca')
-    }
-
-    it {
-      is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with('ensure' => 'present',
-                                                                                                                                                  'id' => GPG_KEY_ID)
-    }
-  end
-
-  context 'when allow_unsigned true' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        'include'        => { 'src' => false },
-        'location'       => 'http://debian.mirror.iweb.ca/debian/',
-        'allow_unsigned' => true,
-      }
-    end
-
-    it { is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[trusted=yes\] http://debian.mirror.iweb.ca/debian/ jessie main\n}) }
-  end
-
-  context 'with architecture equals x86_64' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        'location'     => 'http://debian.mirror.iweb.ca/debian/',
-        'architecture' => 'x86_64',
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[arch=x86_64\] http://debian.mirror.iweb.ca/debian/ jessie main\n})
-    }
-  end
-
-  context 'with ensure => absent' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        'ensure' => 'absent',
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with('ensure' => 'absent')
-    }
-  end
-
-  describe 'validation' do
-    context 'with no release' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          osfamily: 'Debian',
-          puppetversion: Puppet.version,
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{lsbdistcodename fact not available: release parameter required})
-      end
-    end
-  end
-end
diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
deleted file mode 100644
index 38f5b9d..0000000
--- a/spec/defines/source_spec.rb
+++ /dev/null
@@ -1,497 +0,0 @@
-require 'spec_helper'
-
-describe 'apt::source' do
-  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
-
-  let :pre_condition do
-    'class { "apt": }'
-  end
-
-  let :title do
-    'my_source'
-  end
-
-  context 'with defaults' do
-    context 'without location' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          osfamily: 'Debian',
-          lsbdistcodename: 'jessie',
-          puppetversion: Puppet.version,
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{source entry without specifying a location})
-      end
-    end
-    context 'with location' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          puppetversion: Puppet.version,
-        }
-      end
-      let(:params) { { location: 'hello.there' } }
-
-      it {
-        is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').without_content(%r{# my_source\ndeb-src hello.there wheezy main\n})
-        is_expected.not_to contain_package('apt-transport-https')
-      }
-    end
-  end
-
-  describe 'no defaults' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        lsbdistrelease: '8.0',
-        puppetversion: Puppet.version,
-      }
-    end
-
-    context 'with complex pin' do
-      let :params do
-        {
-          location: 'hello.there',
-          pin: { 'release' => 'wishwash',
-                 'explanation' => 'wishwash',
-                 'priority'    => 1001 },
-        }
-      end
-
-      it {
-        is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{hello.there jessie main\n})
-      }
-
-      it { is_expected.to contain_file('/etc/apt/sources.list.d/my_source.list').that_notifies('Class[Apt::Update]') }
-
-      it {
-        is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                            priority: 1001,
-                                                                                                            explanation: 'wishwash',
-                                                                                                            release: 'wishwash')
-      }
-    end
-
-    context 'with simple key' do
-      let :params do
-        {
-          comment: 'foo',
-          location: 'http://debian.mirror.iweb.ca/debian/',
-          release: 'sid',
-          repos: 'testing',
-          key: GPG_KEY_ID,
-          pin: '10',
-          architecture: 'x86_64',
-          allow_unsigned: true,
-        }
-      end
-
-      it {
-        is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# foo\ndeb \[arch=x86_64 trusted=yes\] http://debian.mirror.iweb.ca/debian/ sid testing\n})
-                                                             .without_content(%r{deb-src})
-      }
-
-      it {
-        is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                            priority: '10',
-                                                                                                            origin: 'debian.mirror.iweb.ca')
-      }
-
-      it {
-        is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                                                                    id: GPG_KEY_ID)
-      }
-    end
-
-    context 'with complex key' do
-      let :params do
-        {
-          comment: 'foo',
-          location: 'http://debian.mirror.iweb.ca/debian/',
-          release: 'sid',
-          repos: 'testing',
-          key: { 'id' => GPG_KEY_ID, 'server' => 'pgp.mit.edu',
-                 'content' => 'GPG key content',
-                 'source'  => 'http://apt.puppetlabs.com/pubkey.gpg' },
-          pin: '10',
-          architecture: 'x86_64',
-          allow_unsigned: true,
-        }
-      end
-
-      it {
-        is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# foo\ndeb \[arch=x86_64 trusted=yes\] http://debian.mirror.iweb.ca/debian/ sid testing\n})
-                                                             .without_content(%r{deb-src})
-      }
-
-      it {
-        is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                            priority: '10',
-                                                                                                            origin: 'debian.mirror.iweb.ca')
-      }
-
-      it {
-        is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                                                                    id: GPG_KEY_ID,
-                                                                                                                                                    server: 'pgp.mit.edu',
-                                                                                                                                                    content: 'GPG key content',
-                                                                                                                                                    source: 'http://apt.puppetlabs.com/pubkey.gpg')
-      }
-    end
-
-    context 'with simple key' do
-      let :params do
-        {
-          comment: 'foo',
-          location: 'http://debian.mirror.iweb.ca/debian/',
-          release: 'sid',
-          repos: 'testing',
-          key: GPG_KEY_ID,
-          pin: '10',
-          architecture: 'x86_64',
-          allow_unsigned: true,
-        }
-      end
-
-      it {
-        is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# foo\ndeb \[arch=x86_64 trusted=yes\] http://debian.mirror.iweb.ca/debian/ sid testing\n})
-                                                             .without_content(%r{deb-src})
-      }
-
-      it {
-        is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                            priority: '10',
-                                                                                                            origin: 'debian.mirror.iweb.ca')
-      }
-
-      it {
-        is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                                                                    id: GPG_KEY_ID)
-      }
-    end
-  end
-
-  context 'with allow_unsigned true' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        location: 'hello.there',
-        allow_unsigned: true,
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[trusted=yes\] hello.there jessie main\n})
-    }
-  end
-
-  context 'with a https location, install apt-transport-https' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        location: 'HTTPS://foo.bar',
-        allow_unsigned: false,
-      }
-    end
-
-    it {
-      is_expected.to contain_package('apt-transport-https')
-    }
-  end
-
-  context 'with a https location, do not install apt-transport-https on oses not in list eg buster' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '10', full: '10.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'buster',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        location: 'https://foo.bar',
-        allow_unsigned: false,
-      }
-    end
-
-    it {
-      is_expected.not_to contain_package('apt-transport-https')
-    }
-  end
-
-  context 'with architecture equals x86_64' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'wheezy',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        location: 'hello.there',
-        include: { 'deb' => false, 'src' => true },
-        architecture: 'x86_64',
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb-src \[arch=x86_64\] hello.there wheezy main\n})
-    }
-  end
-
-  context 'with architecture fact and unset architecture parameter' do
-    let :facts do
-      {
-        architecture: 'amd64',
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        location: 'hello.there',
-        include: { 'deb' => false, 'src' => true },
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb-src hello.there jessie main\n})
-    }
-  end
-
-  context 'with include_src => true' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        location: 'hello.there',
-        include: { 'src' => true },
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb hello.there jessie main\ndeb-src hello.there jessie main\n})
-    }
-  end
-
-  context 'with include deb => false' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        include: { 'deb' => false },
-        location: 'hello.there',
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').without_content(%r{deb-src hello.there wheezy main\n})
-    }
-    it { is_expected.to contain_apt__setting('list-my_source').without_content(%r{deb hello.there wheezy main\n}) }
-  end
-
-  context 'with include src => true and include deb => false' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        include: { 'deb' => false, 'src' => true },
-        location: 'hello.there',
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{deb-src hello.there jessie main\n})
-    }
-    it { is_expected.to contain_apt__setting('list-my_source').without_content(%r{deb hello.there jessie main\n}) }
-  end
-
-  context 'with ensure => absent' do
-    let :facts do
-      {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        lsbdistcodename: 'jessie',
-        osfamily: 'Debian',
-        puppetversion: Puppet.version,
-      }
-    end
-    let :params do
-      {
-        ensure: 'absent',
-      }
-    end
-
-    it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'absent')
-    }
-  end
-
-  describe 'validation' do
-    context 'with no release' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          osfamily: 'Debian',
-          puppetversion: Puppet.version,
-        }
-      end
-      let(:params) { { location: 'hello.there' } }
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{lsbdistcodename fact not available: release parameter required})
-      end
-    end
-
-    context 'with release is empty string' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          osfamily: 'Debian',
-          puppetversion: Puppet.version,
-        }
-      end
-      let(:params) { { location: 'hello.there', release: '' } }
-
-      it { is_expected.to contain_apt__setting('list-my_source').with_content(%r{hello\.there  main}) }
-    end
-
-    context 'with invalid pin' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          puppetversion: Puppet.version,
-        }
-      end
-      let :params do
-        {
-          location: 'hello.there',
-          pin: true,
-        }
-      end
-
-      it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a value})
-      end
-    end
-
-    context 'with notify_update = undef (default)' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          puppetversion: Puppet.version,
-        }
-      end
-      let :params do
-        {
-          location: 'hello.there',
-        }
-      end
-
-      it { is_expected.to contain_apt__setting("list-#{title}").with_notify_update(true) }
-    end
-
-    context 'with notify_update = true' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          puppetversion: Puppet.version,
-        }
-      end
-      let :params do
-        {
-          location: 'hello.there',
-          notify_update: true,
-        }
-      end
-
-      it { is_expected.to contain_apt__setting("list-#{title}").with_notify_update(true) }
-    end
-
-    context 'with notify_update = false' do
-      let :facts do
-        {
-          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-          lsbdistid: 'Debian',
-          lsbdistcodename: 'jessie',
-          osfamily: 'Debian',
-          puppetversion: Puppet.version,
-        }
-      end
-      let :params do
-        {
-          location: 'hello.there',
-          notify_update: false,
-        }
-      end
-
-      it { is_expected.to contain_apt__setting("list-#{title}").with_notify_update(false) }
-    end
-  end
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
deleted file mode 100644
index 5e721b7..0000000
--- a/spec/spec_helper.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'rspec-puppet-facts'
-
-begin
-  require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
-rescue LoadError => loaderror
-  warn "Could not require spec_helper_local: #{loaderror.message}"
-end
-
-include RspecPuppetFacts
-
-default_facts = {
-  puppetversion: Puppet.version,
-  facterversion: Facter.version,
-}
-
-default_facts_path = File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml'))
-default_module_facts_path = File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml'))
-
-if File.exist?(default_facts_path) && File.readable?(default_facts_path)
-  default_facts.merge!(YAML.safe_load(File.read(default_facts_path)))
-end
-
-if File.exist?(default_module_facts_path) && File.readable?(default_module_facts_path)
-  default_facts.merge!(YAML.safe_load(File.read(default_module_facts_path)))
-end
-
-RSpec.configure do |c|
-  c.default_facts = default_facts
-  c.before :each do
-    # set to strictest setting for testing
-    # by default Puppet runs at warning level
-    Puppet.settings[:strict] = :warning
-  end
-end
-
-def ensure_module_defined(module_name)
-  module_name.split('::').reduce(Object) do |last_module, next_module|
-    last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module)
-    last_module.const_get(next_module)
-  end
-end
-
-# 'spec_overrides' from sync.yml will appear below this line
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
deleted file mode 100644
index a6f3d85..0000000
--- a/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require 'beaker-pe'
-require 'beaker-puppet'
-require 'beaker-rspec'
-require 'beaker/puppet_install_helper'
-require 'beaker/module_install_helper'
-require 'beaker-task_helper'
-require 'beaker/i18n_helper'
-require 'beaker-task_helper'
-
-run_puppet_install_helper
-configure_type_defaults_on(hosts)
-install_bolt_on(hosts) unless pe_install?
-install_module_on(hosts)
-install_module_dependencies_on(hosts)
-
-UNSUPPORTED_PLATFORMS = ['RedHat', 'Suse', 'windows', 'AIX', 'Solaris'].freeze
-MAX_RETRY_COUNT       = 12
-RETRY_WAIT            = 10
-ERROR_MATCHER         = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)}
-
-# This method allows a block to be passed in and if an exception is raised
-# that matches the 'error_matcher' matcher, the block will wait a set number
-# of seconds before retrying.
-# Params:
-# - max_retry_count - Max number of retries
-# - retry_wait_interval_secs - Number of seconds to wait before retry
-# - error_matcher - Matcher which the exception raised must match to allow retry
-# Example Usage:
-# retry_on_error_matching(3, 5, /OpenGPG Error/) do
-#   apply_manifest(pp, :catch_failures => true)
-# end
-def retry_on_error_matching(max_retry_count = MAX_RETRY_COUNT, retry_wait_interval_secs = RETRY_WAIT, error_matcher = ERROR_MATCHER)
-  try = 0
-  begin
-    puts "retry_on_error_matching: try #{try}" unless try.zero?
-    try += 1
-    yield
-  rescue StandardError => e
-    raise unless try < max_retry_count && (error_matcher.nil? || e.message =~ error_matcher)
-    sleep retry_wait_interval_secs
-    retry
-  end
-end
-
-RSpec.configure do |c|
-  File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
-
-    hosts.each do |host|
-      # This will be removed, this is temporary to test localisation.
-      if (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') &&
-         (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5') &&
-          Gem::Version.new(puppet_version) < Gem::Version.new('5.2.0'))
-        on(host, 'mkdir /opt/puppetlabs/puppet/share/locale/ja')
-        on(host, 'touch /opt/puppetlabs/puppet/share/locale/ja/puppet.po')
-      end
-      if fact('osfamily') == 'Debian'
-        # install language on debian systems
-        install_language_on(host, 'ja_JP.utf-8') if not_controller(host)
-        # This will be removed, this is temporary to test localisation.
-      end
-      # Required for binding tests.
-      if fact('osfamily') == 'RedHat'
-        if fact('operatingsystemmajrelease') =~ %r{7} || fact('operatingsystem') =~ %r{Fedora}
-          shell('yum install -y bzip2')
-        end
-      end
-      on host, puppet('module', 'install', 'stahnma/epel')
-    end
-  end
-end
diff --git a/spec/unit/facter/apt_dist_has_updates_spec.rb b/spec/unit/facter/apt_dist_has_updates_spec.rb
deleted file mode 100644
index ae67bcf..0000000
--- a/spec/unit/facter/apt_dist_has_updates_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_has_dist_updates fact' do
-  subject { Facter.fact(:apt_has_dist_updates).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'on non-Debian distro' do
-    before(:each) do
-      Facter.fact(:osfamily).expects(:value).at_least(1).returns 'RedHat'
-    end
-    it { is_expected.to be_nil }
-  end
-
-  describe 'on Debian based distro missing apt-get' do
-    before(:each) do
-      Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns false
-    end
-    it { is_expected.to be_nil }
-  end
-
-  describe 'on Debian based distro' do
-    before(:each) do
-      Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns 'test'
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      apt_output = "Inst extremetuxracer [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Conf extremetuxracer (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-                   "Conf planet.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').returns apt_output
-    end
-    it { is_expected.to be true }
-  end
-end
diff --git a/spec/unit/facter/apt_dist_package_security_updates_spec.rb b/spec/unit/facter/apt_dist_package_security_updates_spec.rb
deleted file mode 100644
index d6f0a9f..0000000
--- a/spec/unit/facter/apt_dist_package_security_updates_spec.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_package_security_dist_updates fact' do
-  subject { Facter.fact(:apt_package_security_dist_updates).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'when apt has no updates' do
-    before(:each) do
-      Facter.fact(:apt_has_dist_updates).stubs(:value).returns false
-    end
-    it { is_expected.to be nil }
-  end
-
-  describe 'when apt has updates' do
-    before(:each) do
-      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns 'test'
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').returns apt_get_upgrade_output
-    end
-
-    describe 'on Debian' do
-      let(:apt_get_upgrade_output) do
-        "Inst extremetuxracer [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-          "Conf extremetuxracer (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-          "Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-          "Conf planet.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-          "Inst vim [7.52.1-5] (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64]) []\n" \
-          "Conf vim (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64])\n" \
-      end
-
-      if Facter.version < '2.0.0'
-        it { is_expected.to eq('vim') }
-      else
-        it { is_expected.to eq(['vim']) }
-      end
-    end
-
-    describe 'on Ubuntu' do
-      let(:apt_get_upgrade_output) do
-        "Inst extremetuxracer [2016f-0ubuntu0.16.04] (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n" \
-          "Conf extremetuxracer (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n" \
-          "Inst vim [7.47.0-1ubuntu2] (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64]) []\n" \
-          "Conf vim (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64])\n" \
-          "Inst onioncircuits [2:3.3.10-4ubuntu2] (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n" \
-          "Conf onioncircuits (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n"
-      end
-
-      if Facter.version < '2.0.0'
-        it { is_expected.to eq('extremetuxracer,vim') }
-      else
-        it { is_expected.to eq(['extremetuxracer', 'vim']) }
-      end
-    end
-  end
-end
diff --git a/spec/unit/facter/apt_dist_package_updates_spec.rb b/spec/unit/facter/apt_dist_package_updates_spec.rb
deleted file mode 100644
index 080e21f..0000000
--- a/spec/unit/facter/apt_dist_package_updates_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_package_dist_updates fact' do
-  subject { Facter.fact(:apt_package_dist_updates).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'when apt has no updates' do
-    before(:each) do
-      Facter.fact(:apt_has_dist_updates).stubs(:value).returns false
-    end
-    it { is_expected.to be nil }
-  end
-
-  describe 'when apt has updates' do
-    before(:each) do
-      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns 'test'
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      apt_output = "Inst extremetuxracer [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Conf extremetuxracer (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-                   "Conf planet.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').returns apt_output
-    end
-    if Facter.version < '2.0.0'
-      it { is_expected.to eq('extremetuxracer,planet.rb') }
-    else
-      it { is_expected.to eq(['extremetuxracer', 'planet.rb']) }
-    end
-  end
-end
diff --git a/spec/unit/facter/apt_dist_security_updates_spec.rb b/spec/unit/facter/apt_dist_security_updates_spec.rb
deleted file mode 100644
index 9b58b6e..0000000
--- a/spec/unit/facter/apt_dist_security_updates_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_security_updates fact' do
-  subject { Facter.fact(:apt_security_dist_updates).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'when apt has no updates' do
-    before(:each) do
-      Facter.fact(:apt_has_dist_updates).stubs(:value).returns false
-    end
-    it { is_expected.to be nil }
-  end
-
-  describe 'when apt has security updates' do
-    before(:each) do
-      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns 'test'
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').returns apt_get_upgrade_output
-    end
-
-    describe 'on Debian' do
-      let(:apt_get_upgrade_output) do
-        "Inst extremetuxracer [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-          "Conf extremetuxracer (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-          "Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-          "Conf planet.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-          "Inst vim [7.52.1-5] (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64]) []\n" \
-          "Conf vim (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64])\n" \
-      end
-
-      it { is_expected.to eq(1) }
-    end
-
-    describe 'on Ubuntu' do
-      let(:apt_get_upgrade_output) do
-        "Inst extremetuxracer [2016f-0ubuntu0.16.04] (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n" \
-          "Conf extremetuxracer (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n" \
-          "Inst vim [7.47.0-1ubuntu2] (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64]) []\n" \
-          "Conf vim (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64])\n" \
-          "Inst onioncircuits [2:3.3.10-4ubuntu2] (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n" \
-          "Conf onioncircuits (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n"
-      end
-
-      it { is_expected.to eq(2) }
-    end
-  end
-end
diff --git a/spec/unit/facter/apt_dist_updates_spec.rb b/spec/unit/facter/apt_dist_updates_spec.rb
deleted file mode 100644
index 737d1b6..0000000
--- a/spec/unit/facter/apt_dist_updates_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_updates fact' do
-  subject { Facter.fact(:apt_dist_updates).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'when apt has no updates' do
-    before(:each) do
-      Facter.fact(:apt_has_dist_updates).stubs(:value).returns false
-    end
-    it { is_expected.to be nil }
-  end
-
-  describe 'when apt has updates' do
-    before(:each) do
-      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns 'test'
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      apt_output = "Inst extremetuxracer [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Conf extremetuxracer (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-                   "Conf planet.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').returns apt_output
-    end
-    it { is_expected.to eq(2) }
-  end
-end
diff --git a/spec/unit/facter/apt_has_updates_spec.rb b/spec/unit/facter/apt_has_updates_spec.rb
deleted file mode 100644
index 5c06c2f..0000000
--- a/spec/unit/facter/apt_has_updates_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_has_updates fact' do
-  subject { Facter.fact(:apt_has_updates).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'on non-Debian distro' do
-    before(:each) do
-      Facter.fact(:osfamily).expects(:value).at_least(1).returns 'RedHat'
-    end
-    it { is_expected.to be_nil }
-  end
-
-  describe 'on Debian based distro missing apt-get' do
-    before(:each) do
-      Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns false
-    end
-    it { is_expected.to be_nil }
-  end
-
-  describe 'on Debian based distro' do
-    before(:each) do
-      Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      apt_output = "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-                   "Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns apt_output
-    end
-    it { is_expected.to be true }
-  end
-end
diff --git a/spec/unit/facter/apt_package_security_updates_spec.rb b/spec/unit/facter/apt_package_security_updates_spec.rb
deleted file mode 100644
index 1bc1fda..0000000
--- a/spec/unit/facter/apt_package_security_updates_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_package_security_updates fact' do
-  subject { Facter.fact(:apt_package_security_updates).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'when apt has no updates' do
-    before(:each) do
-      Facter.fact(:apt_has_updates).stubs(:value).returns false
-    end
-    it { is_expected.to be nil }
-  end
-
-  describe 'when apt has updates' do
-    before(:each) do
-      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns apt_get_upgrade_output
-    end
-
-    describe 'on Debian' do
-      let(:apt_get_upgrade_output) do
-        "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-          "Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-          "Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-          "Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-          "Inst curl [7.52.1-5] (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64]) []\n" \
-          "Conf curl (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64])\n" \
-      end
-
-      if Facter.version < '2.0.0'
-        it { is_expected.to eq('curl') }
-      else
-        it { is_expected.to eq(['curl']) }
-      end
-    end
-
-    describe 'on Ubuntu' do
-      let(:apt_get_upgrade_output) do
-        "Inst tzdata [2016f-0ubuntu0.16.04] (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n" \
-          "Conf tzdata (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n" \
-          "Inst curl [7.47.0-1ubuntu2] (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64]) []\n" \
-          "Conf curl (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64])\n" \
-          "Inst procps [2:3.3.10-4ubuntu2] (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n" \
-          "Conf procps (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n"
-      end
-
-      if Facter.version < '2.0.0'
-        it { is_expected.to eq('tzdata,curl') }
-      else
-        it { is_expected.to eq(['tzdata', 'curl']) }
-      end
-    end
-  end
-end
diff --git a/spec/unit/facter/apt_package_updates_spec.rb b/spec/unit/facter/apt_package_updates_spec.rb
deleted file mode 100644
index f24481a..0000000
--- a/spec/unit/facter/apt_package_updates_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_package_updates fact' do
-  subject { Facter.fact(:apt_package_updates).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'when apt has no updates' do
-    before(:each) do
-      Facter.fact(:apt_has_updates).stubs(:value).returns false
-    end
-    it { is_expected.to be nil }
-  end
-
-  describe 'when apt has updates' do
-    before(:each) do
-      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      apt_output = "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-                   "Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns apt_output
-    end
-    if Facter.version < '2.0.0'
-      it { is_expected.to eq('tzdata,unhide.rb') }
-    else
-      it { is_expected.to eq(['tzdata', 'unhide.rb']) }
-    end
-  end
-end
diff --git a/spec/unit/facter/apt_reboot_required_spec.rb b/spec/unit/facter/apt_reboot_required_spec.rb
deleted file mode 100644
index 356f36b..0000000
--- a/spec/unit/facter/apt_reboot_required_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_reboot_required fact' do
-  subject { Facter.fact(:apt_reboot_required).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'if a reboot is required' do
-    before(:each) do
-      Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
-      File.stubs(:file?).returns true
-      File.expects(:file?).at_least(1).with('/var/run/reboot-required').returns true
-    end
-    it { is_expected.to eq true }
-  end
-
-  describe 'if a reboot is not required' do
-    before(:each) do
-      Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
-      File.stubs(:file?).returns true
-      File.expects(:file?).at_least(1).with('/var/run/reboot-required').returns false
-    end
-    it { is_expected.to eq false }
-  end
-end
diff --git a/spec/unit/facter/apt_security_updates_spec.rb b/spec/unit/facter/apt_security_updates_spec.rb
deleted file mode 100644
index fc93552..0000000
--- a/spec/unit/facter/apt_security_updates_spec.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_security_updates fact' do
-  subject { Facter.fact(:apt_security_updates).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'when apt has no updates' do
-    before(:each) do
-      Facter.fact(:apt_has_updates).stubs(:value).returns false
-    end
-    it { is_expected.to be nil }
-  end
-
-  describe 'when apt has security updates' do
-    before(:each) do
-      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns apt_get_upgrade_output
-    end
-
-    describe 'on Debian' do
-      let(:apt_get_upgrade_output) do
-        "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-          "Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-          "Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-          "Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-          "Inst curl [7.52.1-5] (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64]) []\n" \
-          "Conf curl (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64])\n" \
-      end
-
-      it { is_expected.to eq(1) }
-    end
-
-    describe 'on Ubuntu' do
-      let(:apt_get_upgrade_output) do
-        "Inst tzdata [2016f-0ubuntu0.16.04] (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n" \
-          "Conf tzdata (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n" \
-          "Inst curl [7.47.0-1ubuntu2] (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64]) []\n" \
-          "Conf curl (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64])\n" \
-          "Inst procps [2:3.3.10-4ubuntu2] (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n" \
-          "Conf procps (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n"
-      end
-
-      it { is_expected.to eq(2) }
-    end
-  end
-end
diff --git a/spec/unit/facter/apt_update_last_success_spec.rb b/spec/unit/facter/apt_update_last_success_spec.rb
deleted file mode 100644
index 60d7273..0000000
--- a/spec/unit/facter/apt_update_last_success_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_update_last_success fact' do
-  subject { Facter.fact(:apt_update_last_success).value }
-
-  before(:each) { Facter.clear }
-  after(:each) { Facter.clear }
-
-  describe 'on Debian based distro which has not yet created the update-success-stamp file' do
-    it 'has a value of -1' do
-      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-      File.expects(:exist?).with('/var/lib/apt/periodic/update-success-stamp').returns false
-      is_expected.to eq(-1)
-    end
-  end
-
-  describe 'on Debian based distro which has created the update-success-stamp' do
-    it 'has the value of the mtime of the file' do
-      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-      File.stubs(:exist?).returns true
-      File.stubs(:mtime).returns 1_407_660_561
-      is_expected.to eq(1_407_660_561)
-    end
-  end
-end
diff --git a/spec/unit/facter/apt_updates_spec.rb b/spec/unit/facter/apt_updates_spec.rb
deleted file mode 100644
index d0a5dbb..0000000
--- a/spec/unit/facter/apt_updates_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'spec_helper'
-
-describe 'apt_updates fact' do
-  subject { Facter.fact(:apt_updates).value }
-
-  after(:each) { Facter.clear }
-
-  describe 'when apt has no updates' do
-    before(:each) do
-      Facter.fact(:apt_has_updates).stubs(:value).returns false
-    end
-    it { is_expected.to be nil }
-  end
-
-  describe 'when apt has updates' do
-    before(:each) do
-      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      apt_output = "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-                   "Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"
-      puts apt_output
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns apt_output
-    end
-    it { is_expected.to eq(2) }
-  end
-end
diff --git a/spec/unit/puppet/type/apt_key_spec.rb b/spec/unit/puppet/type/apt_key_spec.rb
deleted file mode 100644
index 5b205e9..0000000
--- a/spec/unit/puppet/type/apt_key_spec.rb
+++ /dev/null
@@ -1,225 +0,0 @@
-require 'spec_helper'
-require 'puppet'
-
-describe Puppet::Type.type(:apt_key) do
-  context 'with only namevar 32bit key id' do
-    let(:resource) do
-      Puppet::Type.type(:apt_key).new(
-        id: 'EF8D349F',
-      )
-    end
-
-    it 'id is set' do
-      expect(resource[:id]).to eq 'EF8D349F'
-    end
-
-    it 'name is set to id' do
-      expect(resource[:name]).to eq 'EF8D349F'
-    end
-
-    it 'keyserver is default' do
-      expect(resource[:server]).to eq :'keyserver.ubuntu.com'
-    end
-
-    it 'source is not set' do
-      expect(resource[:source]).to eq nil
-    end
-
-    it 'content is not set' do
-      expect(resource[:content]).to eq nil
-    end
-
-    it 'refresh is not set' do
-      expect(resource[:refresh]).to eq nil
-    end
-  end
-
-  context 'with a lowercase 32bit key id' do
-    let(:resource) do
-      Puppet::Type.type(:apt_key).new(
-        id: 'ef8d349f',
-      )
-    end
-
-    it 'id is set' do
-      expect(resource[:id]).to eq 'EF8D349F'
-    end
-  end
-
-  context 'with a 64bit key id' do
-    let(:resource) do
-      Puppet::Type.type(:apt_key).new(
-        id: 'FFFFFFFFEF8D349F',
-      )
-    end
-
-    it 'id is set' do
-      expect(resource[:id]).to eq 'FFFFFFFFEF8D349F'
-    end
-  end
-
-  context 'with a 0x formatted key id' do
-    let(:resource) do
-      Puppet::Type.type(:apt_key).new(
-        id: '0xEF8D349F',
-      )
-    end
-
-    it 'id is set' do
-      expect(resource[:id]).to eq 'EF8D349F'
-    end
-  end
-
-  context 'with a 0x formatted lowercase key id' do
-    let(:resource) do
-      Puppet::Type.type(:apt_key).new(
-        id: '0xef8d349f',
-      )
-    end
-
-    it 'id is set' do
-      expect(resource[:id]).to eq 'EF8D349F'
-    end
-  end
-
-  context 'with a 0x formatted 64bit key id' do
-    let(:resource) do
-      Puppet::Type.type(:apt_key).new(
-        id: '0xFFFFFFFFEF8D349F',
-      )
-    end
-
-    it 'id is set' do
-      expect(resource[:id]).to eq 'FFFFFFFFEF8D349F'
-    end
-  end
-
-  context 'with source' do
-    let(:resource) do
-      Puppet::Type.type(:apt_key).new(
-        id: 'EF8D349F',
-        source: 'http://apt.puppetlabs.com/pubkey.gpg',
-      )
-    end
-
-    it 'source is set to the URL' do
-      expect(resource[:source]).to eq 'http://apt.puppetlabs.com/pubkey.gpg'
-    end
-  end
-
-  context 'with content' do
-    let(:resource) do
-      Puppet::Type.type(:apt_key).new(
-        id: 'EF8D349F',
-        content: 'http://apt.puppetlabs.com/pubkey.gpg',
-      )
-    end
-
-    it 'content is set to the string' do
-      expect(resource[:content]).to eq 'http://apt.puppetlabs.com/pubkey.gpg'
-    end
-  end
-
-  context 'with keyserver' do
-    let(:resource) do
-      Puppet::Type.type(:apt_key).new(
-        id: 'EF8D349F',
-        server: 'http://keyring.debian.org',
-      )
-    end
-
-    it 'keyserver is set to Debian' do
-      expect(resource[:server]).to eq 'http://keyring.debian.org'
-    end
-  end
-
-  context 'with validation' do
-    it 'raises an error if content and source are set' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: 'EF8D349F',
-                                        source: 'http://apt.puppetlabs.com/pubkey.gpg',
-                                        content: 'Completely invalid as a GPG key')
-      }.to raise_error(%r{content and source are mutually exclusive})
-    end
-
-    it 'raises an error if refresh => true and ensure => absent' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id:       'EF8D349F',
-                                        source:   'http://apt.puppetlabs.com/pubkey.gpg',
-                                        ensure:   :absent,
-                                        refresh:  :true)
-      }.to raise_error(%r{ensure => absent and refresh => true are mutually exclusive})
-    end
-
-    it 'raises an error if a weird length key is used' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: 'FEF8D349F',
-                                        source: 'http://apt.puppetlabs.com/pubkey.gpg',
-                                        content: 'Completely invalid as a GPG key')
-      }.to raise_error(%r{Valid values match})
-    end
-
-    it 'raises an error when an invalid URI scheme is used in source' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: 'EF8D349F',
-                                        source: 'hkp://pgp.mit.edu')
-      }.to raise_error(%r{Valid values match})
-    end
-
-    it 'allows the http URI scheme in source' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: 'EF8D349F',
-                                        source: 'http://pgp.mit.edu')
-      }.not_to raise_error
-    end
-
-    it 'allows the http URI with username and password' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: '4BD6EC30',
-                                        source: 'http://testme:Password2@pgp.mit.edu')
-      }.not_to raise_error
-    end
-
-    it 'allows the https URI scheme in source' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: 'EF8D349F',
-                                        source: 'https://pgp.mit.edu')
-      }.not_to raise_error
-    end
-
-    it 'allows the https URI with username and password' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: 'EF8D349F',
-                                        source: 'https://testme:Password2@pgp.mit.edu')
-      }.not_to raise_error
-    end
-
-    it 'allows the ftp URI scheme in source' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: 'EF8D349F',
-                                        source: 'ftp://pgp.mit.edu')
-      }.not_to raise_error
-    end
-
-    it 'allows an absolute path in source' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: 'EF8D349F',
-                                        source: '/path/to/a/file')
-      }.not_to raise_error
-    end
-
-    it 'allows 5-digit ports' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: 'EF8D349F',
-                                        source: 'http://pgp.mit.edu:12345/key')
-      }.not_to raise_error
-    end
-
-    it 'allows 5-digit ports when using key servers' do
-      expect {
-        Puppet::Type.type(:apt_key).new(id: 'EF8D349F',
-                                        server: 'http://pgp.mit.edu:12345')
-      }.not_to raise_error
-    end
-  end
-end
diff --git a/tasks/init.json b/tasks/init.json
index 2020005..91cf951 100644
--- a/tasks/init.json
+++ b/tasks/init.json
@@ -4,7 +4,7 @@
   "parameters": {
     "action": {
       "description": "Action to perform ",
-      "type": "Enum[update, upgrade]"
+      "type": "Enum[update, upgrade, dist-upgrade, autoremove]"
     }
   }
 }
diff --git a/tasks/init.rb b/tasks/init.rb
index b4cb0dc..86367d9 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -1,13 +1,22 @@
 #!/opt/puppetlabs/puppet/bin/ruby
+# frozen_string_literal: true
+
 require 'json'
 require 'open3'
 require 'puppet'
 
 def apt_get(action)
   cmd = ['apt-get', action]
-  cmd << '-y' if action == 'upgrade'
+  cmd << '-y' if ['upgrade', 'dist-upgrade', 'autoremove'].include?(action)
+  if ['upgrade', 'dist-upgrade'].include?(action)
+    ENV['DEBIAN_FRONTEND'] = 'noninteractive'
+    cmd << '-o'
+    cmd << 'Dpkg::Options="--force-confdef"'
+    cmd << '-o'
+    cmd << 'Dpkg::Options="--force-confold"'
+  end
   stdout, stderr, status = Open3.capture3(*cmd)
-  raise Puppet::Error, stderr if status != 0 # rubocop:disable GetText/DecorateFunctionMessage
+  raise Puppet::Error, stderr if status != 0
   { status: stdout.strip }
 end
 
diff --git a/templates/proxy.epp b/templates/proxy.epp
index ee663cb..34e1930 100644
--- a/templates/proxy.epp
+++ b/templates/proxy.epp
@@ -1,4 +1,7 @@
 <%- | Hash $proxies | -%>
+<% $proxies['perhost'].each |$proxy| { -%>
+Acquire::<%= $proxy['scheme'] %>::proxy::<%= $proxy['scope'] %> "<%= $proxy['target'] %>";
+<% } -%>
 Acquire::http::proxy "http://<%= $proxies['host'] %>:<%= $proxies['port'] %>/";
 <%- if $proxies['https'] { %>
 Acquire::https::proxy "https://<%= $proxies['host'] %>:<%= $proxies['port'] %>/";
diff --git a/templates/source.list.epp b/templates/source.list.epp
index 4b29726..5924c8f 100644
--- a/templates/source.list.epp
+++ b/templates/source.list.epp
@@ -1,10 +1,8 @@
-<%- | String $comment, Hash $includes, $opt_architecture, Boolean $allow_unsigned, $location, $release, String $repos | -%>
+<%- | String $comment, Hash $includes, Hash $options, $location, $release, String $repos | -%>
 # <%= $comment %>
 <%- if $includes['deb'] { -%>
-deb <%- if ($opt_architecture or $allow_unsigned) {-%>
- [<%- if ($opt_architecture) {%>arch=<%= $opt_architecture %><% } %><%if ($opt_architecture and $allow_unsigned) {%> <% }%><% if ($allow_unsigned) {%>trusted=yes<% } %>] <%- } %> <%= $location %> <%= $release %> <%= $repos %>
+deb <% if !$options.empty() { -%>[<%=  $options.map |$key, $value| { "${key}=${value}" }.join(" ") %>] <% } -%> <%= $location %> <%= $release %> <%= $repos %>
 <%- } -%>
 <%- if $includes['src'] { -%>
-deb-src <%- if $opt_architecture or $allow_unsigned { -%>
- [<%- if ($opt_architecture) {%>arch=<%= $opt_architecture %><% } %><%if ($opt_architecture and $allow_unsigned) {%> <% }%><% if ($allow_unsigned) {%>trusted=yes<% } %>] <%- } %> <%= $location %> <%= $release %> <%= $repos %>
+deb-src <% if !$options.empty() { -%>[<%=  $options.map |$key, $value| { "${key}=${value}" }.join(" ") %>] <% } -%> <%= $location %> <%= $release %> <%= $repos %>
 <%- } -%>
diff --git a/types/auth_conf_entry.pp b/types/auth_conf_entry.pp
index c046276..cb6f92a 100644
--- a/types/auth_conf_entry.pp
+++ b/types/auth_conf_entry.pp
@@ -12,9 +12,9 @@
 #   Specifies the password to connect with.
 #
 type Apt::Auth_conf_entry = Struct[
-  { 
-    machine => String[1], 
-    login => String, 
-    password => String 
+  {
+    machine => String[1],
+    login => String,
+    password => String
   }
 ]
diff --git a/types/proxy.pp b/types/proxy.pp
index 0aae395..ac00222 100644
--- a/types/proxy.pp
+++ b/types/proxy.pp
@@ -17,10 +17,12 @@
 #
 type Apt::Proxy = Struct[
   {
-    ensure => Optional[Enum['file', 'present', 'absent']],
-    host   => Optional[String],
-    port   => Optional[Integer[0, 65535]],
-    https  => Optional[Boolean],
-    direct => Optional[Boolean],
+    ensure     => Optional[Enum['file', 'present', 'absent']],
+    host       => Optional[String],
+    port       => Optional[Integer[0, 65535]],
+    https      => Optional[Boolean],
+    https_acng => Optional[Boolean],
+    direct     => Optional[Boolean],
+    perhost    => Optional[Array[Apt::Proxy_Per_Host]],
   }
 ]
diff --git a/types/proxy_per_host.pp b/types/proxy_per_host.pp
new file mode 100644
index 0000000..5a3b6e6
--- /dev/null
+++ b/types/proxy_per_host.pp
@@ -0,0 +1,26 @@
+# @summary Adds per-host overrides to the system default APT proxy configuration
+#
+# @param scope
+#   Specifies the scope of the override.  Valid options: a string containing a hostname.
+#
+# @param host
+#   Specifies a proxy host to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: a string containing a hostname.
+#
+# @param port
+#   Specifies a proxy port to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: an integer containing a port number.
+#
+# @param https
+#   Specifies whether to enable https for this override.
+#
+# @param direct
+#   Specifies whether or not to use a `DIRECT` target to bypass the system default proxy.
+#
+type Apt::Proxy_Per_Host = Struct[
+  {
+    scope      => String,
+    host       => Optional[String],
+    port       => Optional[Integer[1, 65535]],
+    https      => Optional[Boolean],
+    direct     => Optional[Boolean],
+  }
+]