Merge branch 'voxpupuli:master' into custom-plugin-installation

.editorconfig

@@ -1,6 +1,7 @@
 # editorconfig.org
 
-# MANAGED BY MODULESYNC
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
 root = true
 

.github/CONTRIBUTING.md

@@ -25,7 +25,7 @@ By participating in this project you agree to abide by its terms.
 
 * Fork the repo.
 * Create a separate branch for your change.
-* We only take pull requests with passing tests, and documentation. [travis-ci](http://travis-ci.org) runs the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
+* We only take pull requests with passing tests, and documentation. [GitHub Actions](https://docs.github.com/en/actions) run the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
 * Checkout [our docs](https://voxpupuli.org/docs/reviewing_pr/) we use to review a module and the [official styleguide](https://puppet.com/docs/puppet/6.0/style_guide.html). They provide some guidance for new code that might help you before you submit a pull request.
 * Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test.
 * Squash your commits down into logical components. Make sure to rebase against our current master.

.github/workflows/ci.yml

@@ -1,3 +1,7 @@
+---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 name: CI
 
 on: pull_request
@@ -8,20 +12,19 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 40
     outputs:
-      beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }}
-      puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
       puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
+      github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }}
     env:
-      BUNDLE_WITHOUT: development:release
+      BUNDLE_WITHOUT: development:system_tests:release
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.0'
           bundler-cache: true
-      - name: Run rake validate
-        run: bundle exec rake validate
+      - name: Run static validations
+        run: bundle exec rake validate lint check
       - name: Run rake rubocop
         run: bundle exec rake rubocop
       - name: Setup Test Matrix
@@ -48,7 +51,7 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Run tests
-        run: bundle exec rake
+        run: bundle exec rake parallel_spec
 
   acceptance:
     needs: setup_matrix
@@ -58,22 +61,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
-        puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
+        include: ${{fromJson(needs.setup_matrix.outputs.github_action_test_matrix)}}
     name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.0'
           bundler-cache: true
       - name: Run tests
         run: bundle exec rake beaker
         env:
-          # Yes, this should be in modulesync, but for now, just work around weird test failures
-          # caused by locale on CentOS 7 with Puppet 7
-          LANG: en_US
-          LC_ALL: en_US.UTF-8
           BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }}
           BEAKER_setfile: ${{ matrix.setfile.value }}
+
+  tests:
+    needs:
+      - unit
+      - acceptance
+    runs-on: ubuntu-latest
+    name: Test suite
+    steps:
+      - run: echo Test suite completed

.github/workflows/release.yml

@@ -1,3 +1,7 @@
+---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 name: Release
 
 on:
@@ -12,6 +16,7 @@ jobs:
   deploy:
     name: 'deploy to forge'
     runs-on: ubuntu-latest
+    if: github.repository_owner == 'voxpupuli'
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

.gitignore

@@ -1,3 +1,6 @@
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 pkg/
 Gemfile.lock
 Gemfile.local

.msync.yml

@@ -1,2 +1,5 @@
 ---
-modulesync_config_version: '4.1.0'
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+modulesync_config_version: '4.2.0'

.overcommit.yml

@@ -1,4 +1,5 @@
-# Managed by https://github.com/voxpupuli/modulesync_configs
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 #
 # Hooks are only enabled if you take action.
 #

.pmtignore

@@ -1,3 +1,6 @@
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 docs/
 pkg/
 Gemfile

.rspec

@@ -1,2 +1,5 @@
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 --format documentation
 --color

.rspec_parallel

@@ -1 +1,4 @@
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 --format progress

.rubocop.yml

@@ -1,3 +1,6 @@
 ---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 inherit_gem:
   voxpupuli-test: rubocop.yml

.sync.yml

@@ -1,5 +1,5 @@
 ---
 Gemfile:
   optional:
-    ':test:':
+    ':test':
       - gem: puppet-lint-param-docs

CHANGELOG.md

@@ -4,6 +4,30 @@ 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.
 
+## [v5.1.0](https://github.com/voxpupuli/puppet-jira/tree/v5.1.0) (2021-08-20)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-jira/compare/v5.0.1...v5.1.0)
+
+**Implemented enhancements:**
+
+- Configure recommended JDBC connection-properties by default for PostgreSQL databases [\#381](https://github.com/voxpupuli/puppet-jira/pull/381) ([oranenj](https://github.com/oranenj))
+- Allow managing installation and home directory modes and enforce installdir permissions by default [\#378](https://github.com/voxpupuli/puppet-jira/pull/378) ([oranenj](https://github.com/oranenj))
+
+**Fixed bugs:**
+
+- use variable instead of literal in server.xml [\#385](https://github.com/voxpupuli/puppet-jira/pull/385) ([dacron](https://github.com/dacron))
+
+**Closed issues:**
+
+- connection-settings parameter in dbconfig.xml template should be connection-properties instead [\#380](https://github.com/voxpupuli/puppet-jira/issues/380)
+- JIRA will not start if the installation directory mode is missing o+x [\#377](https://github.com/voxpupuli/puppet-jira/issues/377)
+
+**Merged pull requests:**
+
+- switch from camptocamp/systemd to voxpupuli/systemd [\#386](https://github.com/voxpupuli/puppet-jira/pull/386) ([bastelfreak](https://github.com/bastelfreak))
+- Extend the version check to the tailored jira servicedesk version [\#383](https://github.com/voxpupuli/puppet-jira/pull/383) ([diLLec](https://github.com/diLLec))
+- Add note about RHEL 8 and SELinux and clean up a bit [\#379](https://github.com/voxpupuli/puppet-jira/pull/379) ([oranenj](https://github.com/oranenj))
+
 ## [v5.0.1](https://github.com/voxpupuli/puppet-jira/tree/v5.0.1) (2021-04-23)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-jira/compare/v5.0.0...v5.0.1)

Dockerfile

@@ -1,3 +1,6 @@
+# MANAGED BY MODULESYNC
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 FROM ruby:2.7
 
 WORKDIR /opt/puppet

Gemfile

@@ -1,10 +1,14 @@
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :test do
-  gem 'voxpupuli-test', '~> 2.1',  :require => false
-  gem 'coveralls',                 :require => false
-  gem 'simplecov-console',         :require => false
-  gem 'puppet-lint-param-docs',    :require => false
+  gem 'voxpupuli-test', '~> 2.5',   :require => false
+  gem 'coveralls',                  :require => false
+  gem 'simplecov-console',          :require => false
+  gem 'puppet_metadata', '~> 1.0',  :require => false
+  gem 'puppet-lint-param-docs',     :require => false
 end
 
 group :development do
@@ -13,22 +17,19 @@ group :development do
 end
 
 group :system_tests do
-  gem 'puppet_metadata', '~> 0.3.0',  :require => false
-  gem 'voxpupuli-acceptance',         :require => false
+  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
-  gem 'puppet-blacksmith',                        :require => false
-  gem 'voxpupuli-release',                        :require => false
+  gem 'github_changelog_generator', '>= 1.16.1',  :require => false if RUBY_VERSION >= '2.5'
+  gem 'voxpupuli-release', '>= 1.0.2',            :require => false
   gem 'puppet-strings', '>= 2.2',                 :require => false
 end
 
-gem 'puppetlabs_spec_helper', '~> 2.0', :require => false
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_VERSION'] || '~> 6.0'
+puppetversion = ENV['PUPPET_VERSION'] || '>= 6.0'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby

REFERENCE.md

@@ -64,6 +64,10 @@ The following parameters are available in the `jira` class:
 * [`manage_user`](#manage_user)
 * [`user`](#user)
 * [`group`](#group)
+* [`installdir_owner`](#installdir_owner)
+* [`installdir_group`](#installdir_group)
+* [`installdir_mode`](#installdir_mode)
+* [`homedir_mode`](#homedir_mode)
 * [`uid`](#uid)
 * [`gid`](#gid)
 * [`shell`](#shell)
@@ -180,7 +184,7 @@ Default value: `'8.13.5'`
 
 ##### <a name="product"></a>`product`
 
-Data type: `String`
+Data type: `String[1]`
 
 Atlassian product to install.
 
@@ -226,6 +230,38 @@ Group that the service will run as
 
 Default value: `'jira'`
 
+##### <a name="installdir_owner"></a>`installdir_owner`
+
+Data type: `String[1]`
+
+The owner of the installation directory.
+
+Default value: `'root'`
+
+##### <a name="installdir_group"></a>`installdir_group`
+
+Data type: `String[1]`
+
+The group of the installation directory.
+
+Default value: `'root'`
+
+##### <a name="installdir_mode"></a>`installdir_mode`
+
+Data type: `Stdlib::Filemode`
+
+The permissions of the installation directory. Note that the JIRA service user must have at least execute permission on the directory.
+
+Default value: `'0755'`
+
+##### <a name="homedir_mode"></a>`homedir_mode`
+
+Data type: `Optional[Stdlib::Filemode]`
+
+The permissions of the service user's home directory, where JIRA's data will reside
+
+Default value: ``undef``
+
 ##### <a name="uid"></a>`uid`
 
 Data type: `Optional[Integer[0]]`
@@ -373,7 +409,7 @@ Default value: ``undef``
 
 ##### <a name="dbschema"></a>`dbschema`
 
-Data type: `Any`
+Data type: `Optional[String[1]]`
 
 The database schema, if applicable. Defaults to 'public' with PostgreSQL
 
@@ -391,7 +427,9 @@ Default value: ``undef``
 
 Data type: `Optional[String]`
 
-Configures JDBC connection settings
+Configures additional JDBC connection properties in dbconfig.xml
+For PostgreSQL, a default value of "tcpKeepAlive=true;socketTimeout=240" will be used
+See https://confluence.atlassian.com/jirakb/connection-problems-to-postgresql-result-in-stuck-threads-in-jira-1047534091.html
 
 Default value: ``undef``
 

Rakefile

@@ -1,9 +1,22 @@
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 # Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
 # otherwise attempt to load it directly.
 begin
   require 'voxpupuli/test/rake'
 rescue LoadError
-  require 'puppetlabs_spec_helper/rake_tasks'
+  begin
+    require 'puppetlabs_spec_helper/rake_tasks'
+  rescue LoadError
+  end
+end
+
+# load optional tasks for acceptance
+# only available if gem group releases is installed
+begin
+  require 'voxpupuli/acceptance/rake'
+rescue LoadError
 end
 
 # load optional tasks for releases
@@ -34,14 +47,12 @@ begin
   require 'github_changelog_generator/task'
   require 'puppet_blacksmith'
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    version = (Blacksmith::Modulefile.new).version
-    config.future_release = "v#{version}" if version =~ /^\d+\.\d+.\d+$/
+    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'
-    metadata_json = File.join(File.dirname(__FILE__), 'metadata.json')
-    metadata = JSON.load(File.read(metadata_json))
-    config.project = metadata['name']
+    config.project = metadata.metadata['name']
   end
 
   # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppet-jira",
-  "version": "5.0.2-rc0",
+  "version": "5.1.1-rc0",
   "author": "Vox Pupuli",
   "summary": "Module to install, configure and manage Atlassian Jira",
   "license": "Apache-2.0",

spec/spec_helper.rb

@@ -1,6 +1,5 @@
-# This file is managed via modulesync
-# https://github.com/voxpupuli/modulesync
-# https://github.com/voxpupuli/modulesync_config
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
 # puppetlabs_spec_helper will set up coverage if the env variable is set.
 # We want to do this if lib exists and it hasn't been explicitly set.