add proxy_server & proxy_type to server install

voxpupuli · Aug 4, 2023 · 2b163f0 · 2b163f0
1 parent d6e83bb
commit 2b163f0
Show file tree

Hide file tree

Showing 69 changed files with 408 additions and 1,080 deletions.
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -0,0 +1,3 @@
+# Vox Pupuli Security Policy
+
+Our vulnerabilities reporting process is at https://voxpupuli.org/security/
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
     env:
       BUNDLE_WITHOUT: development:system_tests:release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -45,7 +45,7 @@ jobs:
       PUPPET_VERSION: "~> ${{ matrix.puppet }}.0"
     name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -56,7 +56,7 @@ jobs:
 
   acceptance:
     needs: setup_matrix
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       BUNDLE_WITHOUT: development:test:release
     strategy:
@@ -65,7 +65,7 @@ jobs:
         include: ${{fromJson(needs.setup_matrix.outputs.github_action_test_matrix)}}
     name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:

diff --git a/.gitignore b/.gitignore
@@ -1,23 +1,23 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-/pkg/
-/Gemfile.lock
-/Gemfile.local
-/vendor/
-/.vendor/
-/spec/fixtures/manifests/
-/spec/fixtures/modules/
-/.vagrant/
-/.bundle/
-/.ruby-version
-/coverage/
-/log/
-/.idea/
-/.dependencies/
-/.librarian/
-/Puppetfile.lock
+pkg/
+Gemfile.lock
+Gemfile.local
+vendor/
+.vendor/
+spec/fixtures/manifests/
+spec/fixtures/modules/
+.vagrant/
+.bundle/
+.ruby-version
+coverage/
+log/
+.idea/
+.dependencies/
+.librarian/
+Puppetfile.lock
 *.iml
 .*.sw?
-/.yardoc/
-/Guardfile
+.yardoc/
+Guardfile
diff --git a/.msync.yml b/.msync.yml
@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '6.0.0'
+modulesync_config_version: '5.3.0'
diff --git a/.pmtignore b/.pmtignore
@@ -1,37 +1,37 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-/docs/
-/pkg/
-/Gemfile
-/Gemfile.lock
-/Gemfile.local
-/vendor/
-/.vendor/
-/spec/
-/Rakefile
-/.vagrant/
-/.bundle/
-/.ruby-version
-/coverage/
-/log/
-/.idea/
-/.dependencies/
-/.github/
-/.librarian/
-/Puppetfile.lock
+docs/
+pkg/
+Gemfile
+Gemfile.lock
+Gemfile.local
+vendor/
+.vendor/
+spec/
+Rakefile
+.vagrant/
+.bundle/
+.ruby-version
+coverage/
+log/
+.idea/
+.dependencies/
+.github/
+.librarian/
+Puppetfile.lock
 *.iml
-/.editorconfig
-/.fixtures.yml
-/.gitignore
-/.msync.yml
-/.overcommit.yml
-/.pmtignore
-/.rspec
-/.rspec_parallel
-/.rubocop.yml
-/.sync.yml
+.editorconfig
+.fixtures.yml
+.gitignore
+.msync.yml
+.overcommit.yml
+.pmtignore
+.rspec
+.rspec_parallel
+.rubocop.yml
+.sync.yml
 .*.sw?
-/.yardoc/
-/.yardopts
-/Dockerfile
+.yardoc/
+.yardopts
+Dockerfile
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,77 +4,6 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
-## [v13.2.0](https://github.com/voxpupuli/puppet-prometheus/tree/v13.2.0) (2023-07-29)
-
-[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v13.1.0...v13.2.0)
-
-**Merged pull requests:**
-
-- systemd & archive: Allow latest deps [\#682](https://github.com/voxpupuli/puppet-prometheus/pull/682) ([bastelfreak](https://github.com/bastelfreak))
-
-## [v13.1.0](https://github.com/voxpupuli/puppet-prometheus/tree/v13.1.0) (2023-07-13)
-
-[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v13.0.0...v13.1.0)
-
-**Implemented enhancements:**
-
-- remove legacy function has\_keys [\#678](https://github.com/voxpupuli/puppet-prometheus/pull/678) ([marszip](https://github.com/marszip))
-
-## [v13.0.0](https://github.com/voxpupuli/puppet-prometheus/tree/v13.0.0) (2023-06-26)
-
-[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v12.5.0...v13.0.0)
-
-**Breaking changes:**
-
-- Drop Ubuntu 16.04 \(EOL\) [\#668](https://github.com/voxpupuli/puppet-prometheus/pull/668) ([smortex](https://github.com/smortex))
-- Drop Debian 9 \(EOL\) [\#667](https://github.com/voxpupuli/puppet-prometheus/pull/667) ([smortex](https://github.com/smortex))
-- puppetlabs/stdlib: Require 9.x [\#665](https://github.com/voxpupuli/puppet-prometheus/pull/665) ([hashworks](https://github.com/hashworks))
-- Drop Puppet 6 support [\#660](https://github.com/voxpupuli/puppet-prometheus/pull/660) ([bastelfreak](https://github.com/bastelfreak))
-
-**Implemented enhancements:**
-
-- Add Ubuntu 22.04 support [\#672](https://github.com/voxpupuli/puppet-prometheus/pull/672) ([bastelfreak](https://github.com/bastelfreak))
-- Add EL9 support [\#671](https://github.com/voxpupuli/puppet-prometheus/pull/671) ([bastelfreak](https://github.com/bastelfreak))
-- Add puppet 8 support [\#670](https://github.com/voxpupuli/puppet-prometheus/pull/670) ([bastelfreak](https://github.com/bastelfreak))
-
-**Merged pull requests:**
-
-- blackbox\_exporter: Move hiera data to class [\#675](https://github.com/voxpupuli/puppet-prometheus/pull/675) ([bastelfreak](https://github.com/bastelfreak))
-- postgres\_exporter: Move hiera data to class [\#674](https://github.com/voxpupuli/puppet-prometheus/pull/674) ([bastelfreak](https://github.com/bastelfreak))
-- redis\_exporter: Move hiera data to class [\#673](https://github.com/voxpupuli/puppet-prometheus/pull/673) ([bastelfreak](https://github.com/bastelfreak))
-
-## [v12.5.0](https://github.com/voxpupuli/puppet-prometheus/tree/v12.5.0) (2023-01-30)
-
-[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v12.4.0...v12.5.0)
-
-**Implemented enhancements:**
-
-- Add AlmaLinux/Rocky 8 support [\#649](https://github.com/voxpupuli/puppet-prometheus/pull/649) ([bastelfreak](https://github.com/bastelfreak))
-- bump puppet/systemd to \< 5.0.0 [\#645](https://github.com/voxpupuli/puppet-prometheus/pull/645) ([jhoblitt](https://github.com/jhoblitt))
-- Adapt web.config.file option for node\_exporter versions higher than 1.5.0 [\#644](https://github.com/voxpupuli/puppet-prometheus/pull/644) ([Pigueiras](https://github.com/Pigueiras))
-- feat: Support JMX exporter [\#636](https://github.com/voxpupuli/puppet-prometheus/pull/636) ([dploeger](https://github.com/dploeger))
-- Support time\_intervals with alertmanager \>= 0.24.0 [\#618](https://github.com/voxpupuli/puppet-prometheus/pull/618) ([treydock](https://github.com/treydock))
-
-**Fixed bugs:**
-
-- Replace $facts\['service\_provider'\] by $prometheus::init\_style \(except init.pp\) [\#642](https://github.com/voxpupuli/puppet-prometheus/pull/642) ([phaedriel](https://github.com/phaedriel))
-
-**Closed issues:**
-
-- Support JMX exporter [\#635](https://github.com/voxpupuli/puppet-prometheus/issues/635)
-- Toplevel parameter init\_style ignored [\#629](https://github.com/voxpupuli/puppet-prometheus/issues/629)
-
-**Merged pull requests:**
-
-- varnish\_exporter: Move hiera data to class [\#653](https://github.com/voxpupuli/puppet-prometheus/pull/653) ([bastelfreak](https://github.com/bastelfreak))
-- graphite\_exporter: Move hiera data to class [\#652](https://github.com/voxpupuli/puppet-prometheus/pull/652) ([bastelfreak](https://github.com/bastelfreak))
-- collectd\_exporter: Move hiera data to class [\#651](https://github.com/voxpupuli/puppet-prometheus/pull/651) ([bastelfreak](https://github.com/bastelfreak))
-- apache\_exporter: Move hiera data to class [\#650](https://github.com/voxpupuli/puppet-prometheus/pull/650) ([bastelfreak](https://github.com/bastelfreak))
-- config\_file: Enforce Stdlib::Absolutepath [\#648](https://github.com/voxpupuli/puppet-prometheus/pull/648) ([bastelfreak](https://github.com/bastelfreak))
-- grok\_exporter: Move hiera data to class [\#647](https://github.com/voxpupuli/puppet-prometheus/pull/647) ([bastelfreak](https://github.com/bastelfreak))
-- Debian OS family: Install apt-transport-https during CI [\#628](https://github.com/voxpupuli/puppet-prometheus/pull/628) ([bastelfreak](https://github.com/bastelfreak))
-- prometheus: Move hiera data to class [\#624](https://github.com/voxpupuli/puppet-prometheus/pull/624) ([bastelfreak](https://github.com/bastelfreak))
-
 ## [v12.4.0](https://github.com/voxpupuli/puppet-prometheus/tree/v12.4.0) (2022-06-03)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v12.3.0...v12.4.0)

diff --git a/Gemfile b/Gemfile
@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 6.0',   :require => false
+  gem 'voxpupuli-test', '~> 5.4',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 3.0',  :require => false
+  gem 'puppet_metadata', '~> 1.0',  :require => false
 end
 
 group :development do
@@ -16,19 +16,19 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
-  gem 'voxpupuli-release', '~> 3.0',              :require => false
-  gem 'faraday-retry', '~> 2.1',                  :require => false
+  gem 'github_changelog_generator', '>= 1.16.1',  :require => false if RUBY_VERSION >= '2.5'
+  gem 'voxpupuli-release', '>= 1.2.0',            :require => false
+  gem 'puppet-strings', '>= 2.2',                 :require => false
 end
 
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Vox Pupuli Security Policy

		Our vulnerabilities reporting process is at https://voxpupuli.org/security/