.github/CONTRIBUTING.md

@@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
 with:
 
 ```sh
-BEAKER_setfile=debian11-64 bundle exec rake beaker
+BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
 ```
 
-You can replace the string `debian10` with any common operating system.
+You can replace the string `debian11` with any common operating system.
 The following strings are known to work:
 
-* ubuntu1804
 * ubuntu2004
-* debian10
+* ubuntu2204
 * debian11
 * centos7
 * centos8
+* centos9
+* almalinux8
+* almalinux9
+* fedora36
 
 For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
 

.github/workflows/ci.yml

@@ -13,6 +13,6 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
       pidfile_workaround: 'false'

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
     with:
       allowed_owner: 'voxpupuli'
     secrets:

.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

.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.3.0'
+modulesync_config_version: '7.2.0'

.pmtignore

@@ -1,37 +1,38 @@
 # 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
+/HISTORY.md

CHANGELOG.md

@@ -4,6 +4,23 @@ 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.
 
+## [v6.0.0](https://github.com/voxpupuli/puppet-confluence/tree/v6.0.0) (2024-01-24)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-confluence/compare/v5.0.0...v6.0.0)
+
+**Breaking changes:**
+
+- Fix modulesync 7.2.0 tests; Drop Debian/Ubutnu 16.04 support [\#232](https://github.com/voxpupuli/puppet-confluence/pull/232) ([h-haaks](https://github.com/h-haaks))
+- Drop Puppet 6 support [\#228](https://github.com/voxpupuli/puppet-confluence/pull/228) ([bastelfreak](https://github.com/bastelfreak))
+
+**Implemented enhancements:**
+
+- feat: stdlib9 and puppet8 compatibility [\#231](https://github.com/voxpupuli/puppet-confluence/pull/231) ([dploeger](https://github.com/dploeger))
+
+**Merged pull requests:**
+
+- Add variable to configure maxHttpHeaderSize attribute [\#221](https://github.com/voxpupuli/puppet-confluence/pull/221) ([danifr](https://github.com/danifr))
+
 ## [v5.0.0](https://github.com/voxpupuli/puppet-confluence/tree/v5.0.0) (2022-12-02)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-confluence/compare/v4.0.0...v5.0.0)

Gemfile

@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.4',   :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 1.0',  :require => false
+  gem 'puppet_metadata', '~> 3.5',  :require => false
 end
 
 group :development do
@@ -16,19 +16,17 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 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', '~> 3.0',  :require => false
 end
 
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby

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-confluence'
 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 = 'puppet-confluence'
-  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

manifests/config.pp

@@ -3,15 +3,16 @@
 # Install confluence, See README.md for more.
 #
 class confluence::config (
-  $tomcat_port          = $confluence::tomcat_port,
-  $tomcat_redirect_port = $confluence::tomcat_redirect_port,
-  $tomcat_max_threads   = $confluence::tomcat_max_threads,
-  $tomcat_accept_count  = $confluence::tomcat_accept_count,
-  $tomcat_proxy         = $confluence::tomcat_proxy,
-  $tomcat_extras        = $confluence::tomcat_extras,
-  $manage_server_xml    = $confluence::manage_server_xml,
-  $context_path         = $confluence::context_path,
-  $ajp                  = $confluence::ajp,
+  $tomcat_port                 = $confluence::tomcat_port,
+  $tomcat_redirect_port        = $confluence::tomcat_redirect_port,
+  $tomcat_max_threads          = $confluence::tomcat_max_threads,
+  $tomcat_accept_count         = $confluence::tomcat_accept_count,
+  $tomcat_max_http_header_size = $confluence::tomcat_max_http_header_size,
+  $tomcat_proxy                = $confluence::tomcat_proxy,
+  $tomcat_extras               = $confluence::tomcat_extras,
+  $manage_server_xml           = $confluence::manage_server_xml,
+  $context_path                = $confluence::context_path,
+  $ajp                         = $confluence::ajp,
   # Additional connectors in server.xml
   Confluence::Tomcat_connectors $tomcat_additional_connectors = $confluence::tomcat_additional_connectors,
 ) {
@@ -33,12 +34,13 @@
   }
 
   if $manage_server_xml == 'augeas' {
-    $_tomcat_max_threads   = { maxThreads   => $tomcat_max_threads }
-    $_tomcat_accept_count  = { acceptCount  => $tomcat_accept_count }
-    $_tomcat_port          = { port         => $tomcat_port }
-    $_tomcat_redirect_port = { redirectPort => $tomcat_redirect_port }
+    $_tomcat_max_threads          = { maxThreads        => $tomcat_max_threads }
+    $_tomcat_max_http_header_size = { maxHttpHeaderSize => $tomcat_max_http_header_size }
+    $_tomcat_accept_count         = { acceptCount       => $tomcat_accept_count }
+    $_tomcat_port                 = { port              => $tomcat_port }
+    $_tomcat_redirect_port        = { redirectPort      => $tomcat_redirect_port }
 
-    $parameters = merge($_tomcat_max_threads, $_tomcat_accept_count, $tomcat_proxy, $tomcat_extras, $_tomcat_port, $_tomcat_redirect_port )
+    $parameters = merge($_tomcat_max_threads, $_tomcat_max_http_header_size, $_tomcat_accept_count, $tomcat_proxy, $tomcat_extras, $_tomcat_port, $_tomcat_redirect_port )
 
     if versioncmp($facts['augeas']['version'], '1.0.0') < 0 {
       fail('This module requires Augeas >= 1.0.0')

manifests/init.pp

@@ -39,6 +39,7 @@
   $tomcat_port                                                   = 8090,
   $tomcat_redirect_port                                          = 8443,
   $tomcat_max_threads                                            = 150,
+  $tomcat_max_http_header_size                                   = 8192,
   $tomcat_accept_count                                           = 100,
   # Reverse https proxy setting for tomcat
   Hash $tomcat_proxy                                             = {},

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppet-confluence",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "author": "Vox Pupuli",
   "summary": "Install atlassian confluence",
   "license": "MIT",
@@ -11,21 +11,21 @@
   "dependencies": [
     {
       "name": "puppet/archive",
-      "version_requirement": ">= 1.0.0 < 7.0.0"
+      "version_requirement": ">= 1.0.0 < 8.0.0"
     },
     {
       "name": "puppet/mysql_java_connector",
-      "version_requirement": ">= 3.0.2 < 6.0.0"
+      "version_requirement": ">= 3.0.2 < 7.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 9.0.0"
+      "version_requirement": ">= 4.13.1 < 10.0.0"
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 6.1.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -44,14 +44,13 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
         "18.04"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "9"
+        "10"
       ]
     }
   ]

spec/classes/confluence_config_spec.rb

@@ -47,6 +47,7 @@
               context_path: '/confluence1',
               tomcat_port: 8089,
               tomcat_redirect_port: 443,
+              tomcat_max_http_header_size: 8192,
               tomcat_max_threads: 999,
               tomcat_accept_count: 999,
               tomcat_proxy: {
@@ -64,6 +65,7 @@
             is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/conf/server.xml').
               with_content(%r{port="8089"}).
               with_content(%r{redirectPort="443"}).
+              with_content(%r{maxHttpHeaderSize="8192"}).
               with_content(%r{maxThreads="999"}).
               with_content(%r{acceptCount="999"}).
               with_content(%r{scheme="https"}).

spec/spec_helper.rb

@@ -17,3 +17,4 @@
     add_custom_fact name.to_sym, value
   end
 end
+Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }