Showing with 1,021 additions and 499 deletions.
  1. +4 −0 .github/CONTRIBUTING.md
  2. +5 −0 .gitignore
  3. +1 −1 .msync.yml
  4. +63 −0 .overcommit.yml
  5. +20 −0 .pmtignore
  6. +1 −0 .rspec_parallel
  7. +47 −39 .rubocop.yml
  8. +12 −20 .travis.yml
  9. +1 −0 .yardopts
  10. +161 −64 CHANGELOG.md
  11. +17 −14 Gemfile
  12. +0 −4 Guardfile
  13. +12 −2 README.md
  14. +12 −0 Rakefile
  15. +6 −4 lib/facter/confluence_version.rb
  16. +3 −4 manifests/config.pp
  17. +48 −66 manifests/init.pp
  18. +8 −7 manifests/install.pp
  19. +9 −13 manifests/sso.pp
  20. +3 −4 metadata.json
  21. +13 −0 spec/acceptance/nodesets/archlinux-2-x64.yml
  22. +15 −0 spec/acceptance/nodesets/centos-6-x64.yml
  23. +15 −0 spec/acceptance/nodesets/centos-7-x64.yml
  24. +2 −1 spec/acceptance/nodesets/docker/centos-7.yml
  25. +1 −0 spec/acceptance/nodesets/docker/debian-8.yml
  26. +1 −1 spec/acceptance/nodesets/docker/ubuntu-14.04.yml
  27. +1 −1 spec/acceptance/nodesets/docker/ubuntu-16.04.yml
  28. +31 −0 spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml
  29. +34 −0 spec/acceptance/nodesets/ec2/image_templates.yaml
  30. +29 −0 spec/acceptance/nodesets/ec2/rhel-73-x64.yml
  31. +29 −0 spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml
  32. +29 −0 spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml
  33. +29 −0 spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml
  34. +1 −1 spec/acceptance/nodesets/fedora-25-x64.yml
  35. +124 −80 spec/classes/confluence_config_spec.rb
  36. +82 −72 spec/classes/confluence_install_spec.rb
  37. +24 −7 spec/classes/confluence_service_spec.rb
  38. +22 −12 spec/classes/confluence_spec.rb
  39. +58 −59 spec/classes/confluence_sso_spec.rb
  40. +32 −19 spec/classes/confluence_upgrade_spec.rb
  41. +2 −2 spec/spec_helper_acceptance.rb
  42. +14 −2 spec/unit/facter/util/fact_confluence_version_spec.rb
4 changes: 4 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,7 @@ If you don't want to have to recreate the virtual machine every time you
can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will
at least need `BEAKER_PROVISION` set to yes (the default). The Vagrantfile
for the created virtual machines will be in `.vagrant/beaker_vagrant_fies`.

The easiest way to debug in a docker container is to open a shell:

docker exec -it -u root ${container_id_or_name} bash
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ spec/fixtures/manifests/
spec/fixtures/modules/
.vagrant/
.bundle/
.ruby-version
coverage/
log/
.idea/
.dependencies/
.librarian/
Puppetfile.lock
*.iml
.*.sw?
.yardoc/
Guardfile
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.16.11'
modulesync_config_version: '1.1.0'
63 changes: 63 additions & 0 deletions .overcommit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Managed by https://github.com/voxpupuli/modulesync_configs
#
# Hooks are only enabled if you take action.
#
# To enable the hooks run:
#
# ```
# bundle exec overcommit --install
# # ensure .overcommit.yml does not harm to you and then
# bundle exec overcommit --sign
# ```
#
# (it will manage the .git/hooks directory):
#
# Examples howto skip a test for a commit or push:
#
# ```
# SKIP=RuboCop git commit
# SKIP=PuppetLint git commit
# SKIP=RakeTask git push
# ```
#
# Don't invoke overcommit at all:
#
# ```
# OVERCOMMIT_DISABLE=1 git commit
# ```
#
# Read more about overcommit: https://github.com/brigade/overcommit
#
# To manage this config yourself in your module add
#
# ```
# .overcommit.yml:
# unmanaged: true
# ```
#
# to your modules .sync.yml config
---
PreCommit:
RuboCop:
enabled: true
description: 'Runs rubocop on modified files only'
command: ['bundle', 'exec', 'rubocop']
PuppetLint:
enabled: true
description: 'Runs puppet-lint on modified files only'
command: ['bundle', 'exec', 'puppet-lint']
YamlSyntax:
enabled: true
JsonSyntax:
enabled: true
TrailingWhitespace:
enabled: true

PrePush:
RakeTarget:
enabled: true
description: 'Run rake targets'
targets:
- 'test'
- 'rubocop'
command: [ 'bundle', 'exec', 'rake' ]
20 changes: 20 additions & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
docs/
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/
1 change: 1 addition & 0 deletions .rspec_parallel
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--format progress
86 changes: 47 additions & 39 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ AllCops:
- .vendor/**/*
- pkg/**/*
- spec/fixtures/**/*
- Gemfile
- Rakefile
- Guardfile
Lint/ConditionPosition:
Enabled: True

Expand Down Expand Up @@ -48,7 +51,7 @@ Lint/AmbiguousOperator:
Lint/AssignmentInCondition:
Enabled: True

Style/SpaceBeforeComment:
Layout/SpaceBeforeComment:
Enabled: True

Style/AndOr:
Expand Down Expand Up @@ -116,7 +119,7 @@ Lint/UselessAssignment:
Lint/Void:
Enabled: True

Style/AccessModifierIndentation:
Layout/AccessModifierIndentation:
Enabled: True

Style/AccessorMethodName:
Expand All @@ -125,13 +128,13 @@ Style/AccessorMethodName:
Style/Alias:
Enabled: True

Style/AlignArray:
Layout/AlignArray:
Enabled: True

Style/AlignHash:
Layout/AlignHash:
Enabled: True

Style/AlignParameters:
Layout/AlignParameters:
Enabled: True

Metrics/BlockNesting:
Expand All @@ -149,7 +152,7 @@ Style/BracesAroundHashParameters:
Style/CaseEquality:
Enabled: True

Style/CaseIndentation:
Layout/CaseIndentation:
Enabled: True

Style/CharacterLiteral:
Expand Down Expand Up @@ -183,64 +186,64 @@ Style/WordArray:
Style/UnneededPercentQ:
Enabled: True

Style/Tab:
Layout/Tab:
Enabled: True

Style/SpaceBeforeSemicolon:
Layout/SpaceBeforeSemicolon:
Enabled: True

Style/TrailingBlankLines:
Layout/TrailingBlankLines:
Enabled: True

Style/SpaceInsideBlockBraces:
Layout/SpaceInsideBlockBraces:
Enabled: True

Style/SpaceInsideBrackets:
Layout/SpaceInsideBrackets:
Enabled: True

Style/SpaceInsideHashLiteralBraces:
Layout/SpaceInsideHashLiteralBraces:
Enabled: True

Style/SpaceInsideParens:
Layout/SpaceInsideParens:
Enabled: True

Style/LeadingCommentSpace:
Layout/LeadingCommentSpace:
Enabled: True

Style/SpaceBeforeFirstArg:
Layout/SpaceBeforeFirstArg:
Enabled: True

Style/SpaceAfterColon:
Layout/SpaceAfterColon:
Enabled: True

Style/SpaceAfterComma:
Layout/SpaceAfterComma:
Enabled: True

Style/SpaceAfterMethodName:
Layout/SpaceAfterMethodName:
Enabled: True

Style/SpaceAfterNot:
Layout/SpaceAfterNot:
Enabled: True

Style/SpaceAfterSemicolon:
Layout/SpaceAfterSemicolon:
Enabled: True

Style/SpaceAroundEqualsInParameterDefault:
Layout/SpaceAroundEqualsInParameterDefault:
Enabled: True

Style/SpaceAroundOperators:
Layout/SpaceAroundOperators:
Enabled: True

Style/SpaceBeforeBlockBraces:
Layout/SpaceBeforeBlockBraces:
Enabled: True

Style/SpaceBeforeComma:
Layout/SpaceBeforeComma:
Enabled: True

Style/CollectionMethods:
Enabled: True

Style/CommentIndentation:
Layout/CommentIndentation:
Enabled: True

Style/ColonMethodCall:
Expand All @@ -265,7 +268,7 @@ Style/DefWithParentheses:
Style/PreferredHashMethods:
Enabled: True

Style/DotPosition:
Layout/DotPosition:
EnforcedStyle: trailing

Style/DoubleNegation:
Expand All @@ -274,25 +277,25 @@ Style/DoubleNegation:
Style/EachWithObject:
Enabled: True

Style/EmptyLineBetweenDefs:
Layout/EmptyLineBetweenDefs:
Enabled: True

Style/IndentArray:
Layout/IndentArray:
Enabled: True

Style/IndentHash:
Layout/IndentHash:
Enabled: True

Style/IndentationConsistency:
Layout/IndentationConsistency:
Enabled: True

Style/IndentationWidth:
Layout/IndentationWidth:
Enabled: True

Style/EmptyLines:
Layout/EmptyLines:
Enabled: True

Style/EmptyLinesAroundAccessModifier:
Layout/EmptyLinesAroundAccessModifier:
Enabled: True

Style/EmptyLiteral:
Expand All @@ -311,7 +314,7 @@ Style/MethodDefParentheses:
Style/LineEndConcatenation:
Enabled: True

Style/TrailingWhitespace:
Layout/TrailingWhitespace:
Enabled: True

Style/StringLiterals:
Expand Down Expand Up @@ -463,9 +466,6 @@ Metrics/ParameterLists:
Lint/RequireParentheses:
Enabled: True

Style/SpaceBeforeFirstArg:
Enabled: True

Style/ModuleFunction:
Enabled: True

Expand All @@ -481,7 +481,7 @@ Style/Encoding:
Style/BlockDelimiters:
Enabled: True

Style/MultilineBlockLayout:
Layout/MultilineBlockLayout:
Enabled: True

# 'Complexity' is very relative
Expand All @@ -495,11 +495,15 @@ Metrics/PerceivedComplexity:
Lint/UselessAssignment:
Enabled: True

Style/ClosingParenthesisIndentation:
Layout/ClosingParenthesisIndentation:
Enabled: True

# RSpec

RSpec/BeforeAfterAll:
Exclude:
- spec/acceptance/**/*

# We don't use rspec in this way
RSpec/DescribeClass:
Enabled: False
Expand All @@ -519,6 +523,10 @@ RSpec/RepeatedDescription:
RSpec/NestedGroups:
Enabled: False

# this is broken on ruby1.9
Layout/IndentHeredoc:
Enabled: False

# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
Security/YAMLLoad:
Enabled: false
Loading