Merge branch 'master' into FlorentPoinsaut-patch-2

voxpupuli · May 11, 2023 · c61a83d · c61a83d
2 parents cbb7ca5 + 0ac4a44
commit c61a83d
Show file tree

Hide file tree

Showing 53 changed files with 2,911 additions and 1,906 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -124,7 +124,7 @@ If you have Ruby 2.x or want a specific version of Puppet,
 you must set an environment variable such as:
 
 ```sh
-export PUPPET_GEM_VERSION="~> 5.5.6"
+export PUPPET_GEM_VERSION="~> 6.1.0"
 ```
 
 You can install all needed gems for spec tests into the modules directory by

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
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: '5.2.0'
+modulesync_config_version: '5.5.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/Gemfile b/Gemfile
@@ -1,13 +1,13 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.0',   :require => false
+  gem 'voxpupuli-test', '~> 5.4',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 1.0',  :require => false
+  gem 'puppet_metadata', '~> 2.0',  :require => false
 end
 
 group :development do
@@ -21,8 +21,7 @@ end
 
 group :release do
   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
+  gem 'voxpupuli-release', '~> 2.0',              :require => false
 end
 
 gem 'rake', :require => false

diff --git a/README.md b/README.md
@@ -47,18 +47,17 @@ A good starting point is too look into the profile classes `bareos::profile::dir
 
 Please note, this is only the minimal subset of an bareos configuration. You may use only some of the default configurations such like the schedules, messages, filesets or profiles.
 
-It is highly recommend **not** to use sqlite3 as bareos catalog backend. Please ensure you provide an mysql or postgresql database. See also define `bareos::director::catalog` for the possible database configuration.
+*Note that Bareos >= 21 only supports `postgresql` as a DB backend.*
 
 ```puppet
 # Install and configure an Director Server
 $storage_password = 'Password of the storage instance',
 class { '::bareos::profile::director':
   password     => 'Password of the director instance itself',
   catalog_conf => {
-    'db_driver'   => 'mysql',
     'db_name'     => 'bareos_catalog',
-    'db_address'  => 'fqdn',
-    'db_port'     => 3306,
+    'db_address'  => '127.0.0.1',
+    'db_port'     => 5432,
     'db_user'     => 'user',
     'db_password' => 'password'
   },
@@ -403,7 +402,6 @@ bareos::director::director::name_director: 'example'
 bareos::director::director::password: 'foobar'
 bareos::director::catalogs:
   'testing':
-    db_driver: 'postgresql'
     db_name: 'test'
 bareos::director::clients:
   'alice':

diff --git a/REFERENCE.md b/REFERENCE.md
diff --git a/Rakefile b/Rakefile
@@ -24,6 +24,10 @@ end
 begin
   require 'voxpupuli/release/rake_tasks'
 rescue LoadError
+  # voxpupuli-release not present
+else
+  GCGConfig.user = 'voxpupuli'
+  GCGConfig.project = 'puppet-bareos'
 end
 
 desc "Run main 'test' task and report merged results to coveralls"
@@ -37,36 +41,4 @@ task test_with_coveralls: [:test] do
   end
 end
 
-desc 'Generate REFERENCE.md'
-task :reference, [:debug, :backtrace] do |t, args|
-  patterns = ''
-  Rake::Task['strings:generate:reference'].invoke(patterns, args[:debug], args[:backtrace])
-end
-
-begin
-  require 'github_changelog_generator/task'
-  require 'puppet_blacksmith'
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    metadata = Blacksmith::Modulefile.new
-    config.future_release = "v#{metadata.version}" if metadata.version =~ /^\d+\.\d+.\d+$/
-    config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module."
-    config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
-    config.user = 'voxpupuli'
-    config.project = metadata.metadata['name']
-  end
-
-  # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
-  require 'rbconfig'
-  if RbConfig::CONFIG['host_os'] =~ /linux/
-    task :changelog do
-      puts 'Fixing line endings...'
-      changelog_file = File.join(__dir__, 'CHANGELOG.md')
-      changelog_txt = File.read(changelog_file)
-      new_contents = changelog_txt.gsub(%r{\r\n}, "\n")
-      File.open(changelog_file, "w") {|file| file.puts new_contents }
-    end
-  end
-
-rescue LoadError
-end
 # vim: syntax=ruby
diff --git a/lib/puppet/parser/functions/bareos_settings.rb b/lib/puppet/parser/functions/bareos_settings.rb
@@ -102,7 +102,7 @@ module Puppet::Parser::Functions
         when 'replace_option'
           value_in_array = %w[always ifnewer ifolder never]
         when 'device_type'
-          value_in_array = %w[tape file fifo gfapi rados]
+          value_in_array = %w[tape file fifo gfapi rados droplet]
         when 'compression_algorithm'
           value_in_array = %w[gzip lzo lzfast lz4 lz4hc]
         else

diff --git a/manifests/client/client.pp b/manifests/client/client.pp
@@ -399,7 +399,7 @@
         $_require_res_messages,
     ])
 
-    $_settings = bareos_settings( [$name_client, 'Name', 'name', true],
+    $_settings = bareos_settings([$name_client, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$absolute_job_timeout, 'Absolute Job Timeout', 'pint32', false],
       [$allow_bandwidth_bursting, 'Allow Bandwidth Bursting', 'boolean', false],

diff --git a/manifests/client/director.pp b/manifests/client/director.pp
@@ -197,7 +197,7 @@
   }
 
   if $ensure == 'present' {
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$address, 'Address', 'string', false],
       [$allowed_job_command, 'Allowed Job Command', 'string_list', false],

diff --git a/manifests/client/messages.pp b/manifests/client/messages.pp
@@ -158,7 +158,7 @@
   }
 
   if $ensure == 'present' {
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$append, 'Append', 'messages_list', false],
       [$catalog, 'Catalog', 'messages_list', false],

diff --git a/manifests/console/console.pp b/manifests/console/console.pp
@@ -170,7 +170,7 @@
   }
 
   if $ensure == 'present' {
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$director, 'Director', 'string', false],
       [$heartbeat_interval, 'Heartbeat Interval', 'time', false],

diff --git a/manifests/console/director.pp b/manifests/console/director.pp
@@ -157,7 +157,7 @@
   }
 
   if $ensure == 'present' {
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$address, 'Address', 'string', false],
       [$dir_port, 'Dir Port', 'pint32', false],

diff --git a/manifests/director/catalog.pp b/manifests/director/catalog.pp
@@ -18,8 +18,13 @@
 #   Db Driver
 #
 #   Bareos Datatype: string
-#   Bareos Default: Not set
-#   Required: true
+#   Bareos Default: postgresql
+#   Required: false
+#
+#   This parameter is deprecated. The only valid value under bareos >= 21 is
+#   `postgresql`.
+#
+#   See https://docs.bareos.org/Configuration/Director.html#config-Dir_Catalog_DbDriver
 #
 # [*db_name*]
 #   Db Name
@@ -156,7 +161,7 @@
   }
 
   if $ensure == 'present' {
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$db_address, 'Db Address', 'string', false],
       [$db_driver, 'Db Driver', 'string', true],

diff --git a/manifests/director/client.pp b/manifests/director/client.pp
@@ -331,7 +331,7 @@
         $_require_res_catalog,
     ])
 
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$address, 'Address', 'string', true],
       [$auth_type, 'Auth Type', 'auth_type', false],

diff --git a/manifests/director/console.pp b/manifests/director/console.pp
@@ -243,7 +243,7 @@
         $_require_res_profiles,
     ])
 
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$catalog_acl, 'Catalog ACL', 'acl', false],
       [$client_acl, 'Client ACL', 'acl', false],

diff --git a/manifests/director/counter.pp b/manifests/director/counter.pp
@@ -65,7 +65,7 @@
         $_require_res_catalog,
     ])
 
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$catalog, 'Catalog', 'res', false],
       [$maximum, 'Maximum', 'pint32', false],

diff --git a/manifests/director/director.pp b/manifests/director/director.pp
@@ -413,7 +413,7 @@
         $_require_res_messages,
     ])
 
-    $_settings = bareos_settings( [$name_director, 'Name', 'name', true],
+    $_settings = bareos_settings([$name_director, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$absolute_job_timeout, 'Absolute Job Timeout', 'pint32', false],
       [$audit_events, 'Audit Events', 'audit_command_list', false],

diff --git a/manifests/director/fileset.pp b/manifests/director/fileset.pp
@@ -59,7 +59,7 @@
   }
 
   if $ensure == 'present' {
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$enable_vss, 'Enable VSS', 'boolean', false],
       [$exclude, 'Exclude', 'include_exclude_item', false],

diff --git a/manifests/director/job.pp b/manifests/director/job.pp
@@ -725,7 +725,7 @@
         $_require_res_storage,
     ])
 
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$accurate, 'Accurate', 'boolean', false],
       [$add_prefix, 'Add Prefix', 'string', false],

diff --git a/manifests/director/jobdefs.pp b/manifests/director/jobdefs.pp
@@ -716,7 +716,7 @@
         $_require_res_storage,
     ])
 
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$accurate, 'Accurate', 'boolean', false],
       [$add_prefix, 'Add Prefix', 'string', false],

diff --git a/manifests/director/messages.pp b/manifests/director/messages.pp
@@ -159,7 +159,7 @@
   }
 
   if $ensure == 'present' {
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$append, 'Append', 'messages_list', false],
       [$catalog, 'Catalog', 'messages_list', false],

diff --git a/manifests/director/pool.pp b/manifests/director/pool.pp
@@ -283,7 +283,7 @@
         $_require_res_storage,
     ])
 
-    $_settings = bareos_settings( [$name, 'Name', 'name', true],
+    $_settings = bareos_settings([$name, 'Name', 'name', true],
       [$description, 'Description', 'string', false],
       [$action_on_purge, 'Action On Purge', 'action_on_purge', false],
       [$auto_prune, 'Auto Prune', 'boolean', false],