Showing with 1,710 additions and 299 deletions.
  1. +7 −0 .fixtures.yml
  2. +9 −0 .gitignore
  3. +5 −0 .pmtignore
  4. +32 −0 .travis.yml
  5. +29 −0 CHANGELOG.md
  6. +92 −0 CONTRIBUTING.md
  7. +4 −0 CONTRIBUTORS
  8. +22 −0 Gemfile
  9. +4 −0 Guardfile
  10. +20 −0 LICENSE.md
  11. +0 −11 Modulefile
  12. +0 −16 README
  13. +210 −0 README.markdown
  14. +50 −0 Rakefile
  15. +53 −41 manifests/config.pp
  16. +44 −0 manifests/facts.pp
  17. +63 −44 manifests/init.pp
  18. +68 −48 manifests/install.pp
  19. +28 −0 manifests/params.pp
  20. +13 −42 manifests/service.pp
  21. +64 −0 metadata.json
  22. +80 −0 spec/acceptance/1_default_parameters_spec.rb
  23. +73 −0 spec/acceptance/2_default_parameters_upgrade_spec.rb
  24. +81 −0 spec/acceptance/3_custom_parameters_spec.rb
  25. +12 −0 spec/acceptance/nodesets/centos-64-x64-pe.yml
  26. +10 −0 spec/acceptance/nodesets/centos-64-x64.yml
  27. +10 −0 spec/acceptance/nodesets/centos-65-x64.yml
  28. +11 −0 spec/acceptance/nodesets/centos-70-x64.yml
  29. +10 −0 spec/acceptance/nodesets/debian-70rc1-x64.yml
  30. +11 −0 spec/acceptance/nodesets/debian-73-x64.yml
  31. +10 −0 spec/acceptance/nodesets/fedora-18-x64.yml
  32. +9 −0 spec/acceptance/nodesets/gce-centos7.yml
  33. +10 −0 spec/acceptance/nodesets/sles-11-x64.yml
  34. +10 −0 spec/acceptance/nodesets/sles-11sp1-x64.yml
  35. +10 −0 spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
  36. +11 −0 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
  37. +60 −0 spec/classes/confluence_config_spec.rb
  38. +20 −0 spec/classes/confluence_facts_spec.rb
  39. +74 −0 spec/classes/confluence_install_deploy_spec.rb
  40. +89 −0 spec/classes/confluence_install_staging_spec.rb
  41. +13 −0 spec/classes/confluence_service_spec.rb
  42. +17 −0 spec/classes/confluence_spec.rb
  43. +26 −0 spec/classes/confluence_upgrade_spec.rb
  44. +1 −0 spec/classes/coverage_spec.rb
  45. 0 spec/spec.opts
  46. +10 −16 spec/spec_helper.rb
  47. +46 −0 spec/spec_helper_acceptance.rb
  48. +0 −33 templates/confluence.cfg.xml.erb
  49. +64 −48 templates/confluence.initscript.erb
  50. +13 −0 templates/facts.sh.erb
  51. +54 −0 templates/server.xml.erb
  52. +48 −0 templates/setenv.sh.erb
7 changes: 7 additions & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
fixtures:
symlinks:
confluence: "#{source_dir}"
repositories:
deploy: "http://github.com/mkrakowitzer/puppet-deploy"
staging: "http://github.com/nanliu/puppet-staging"
stdlib: "http://github.com/puppetlabs/puppetlabs-stdlib.git"
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
*kate-swp
pkg/
*.swp
*.settings
*.project
spec/fixtures/modules
Gemfile.lock
.vagrant
log
5 changes: 5 additions & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pkg/
.vagrant
spec/fixtures
.fixtures.yml
Guardfile
32 changes: 32 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
language: ruby
bundler_args: --without development system_tests
before_install: rm Gemfile.lock || true
sudo: false
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
env:
- PUPPET_GEM_VERSION="~> 3.3.0"
- PUPPET_GEM_VERSION="~> 3.4.0"
- PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES=yes
- PUPPET_GEM_VERSION="~> 3.6.0" STRICT_VARIABLES=yes
- PUPPET_GEM_VERSION="~> 3.7.0" STRICT_VARIABLES=yes
- PUPPET_GEM_VERSION="~> 3.7.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes
- PUPPET_GEM_VERSION="~> 3.7.0" FUTURE_PARSER=yes
notifications:
email:
- merritt@krakowitzer.com
script: bundle exec rake test
deploy:
provider: puppetforge
user: puppet
password:
secure: "bca3Ebj/IE9a1X/BpLPVpMYw/zx9VkFRp1WjQZ437jYnpjyl2M/bC1cyW/A7TnzPX7WOpemT5+CVlVF/WE6f0Hrn6EqSzNwrVF8HOkGD8LqVLopXkaEn1zjcrhF4uMaleDpnNxQUx9nMAnqksiw2xphF1yxABqMt3l42SV7ajVw="
on:
tags: true
# all_branches is required to use tags
all_branches: true
# Only publish if our main Ruby target builds
rvm: 1.9.3
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
##2014-03-22 - Release 2.1.1

- Rewrite README file
- Bump confluence version to 5.7.1
- Update metadata, CHANGELOG to point to new namespace.
- Add .pmtignore file

##2014-03-22 - Release 2.1.0

Note: This is the final release of this module before it is deprecated with a 999.999.999 version. This module will be moving the the puppet-community namespace on github and the puppet namespace on puppetforge soon.

- Make confluence users shell configurable.
- update README, metadata, .travis.yml
- Add CONTRIBUTING.md and test coverage spec.

##2014-01-23 - Release 2.0.1
- Resolve issue #22 - confluence_version fact detects wrong version
- Resolve issue #20 - param manage_server_xml acceptCount option is duplicated

##2014-01-21 - Release 2.0.0
- Replace mkrakowitzer-deploy with nanlui-staging as default for dropping files.
- Add tests
- Resolve issue #7 Make tomcat port / tomcat parameters configurable.
- Add parameter manage_server_xml, tomcat_max_threads, tomcat_accept_count, tomcat_extras.
- Add tests
- rename parameter proxy to tomcat_proxy, port to tomcat_port.
- Add support for STRICT_VARIABLES=yes FUTURE_PARSER=yes
- Resole issue #6 Handle confluence upgrades smoothly
- This will stop confluence if running version is less than manifest version. Attempt to upgrade and then start confluence.
92 changes: 92 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
This module has grown over time based on a range of contributions from
people using it. If you follow these contributing guidelines your patch
will likely make it into a release a little quicker.


## Contributing

1. Fork the repo.

2. Run the tests. We only take pull requests with passing tests, and
it's great to know that you have a clean slate.

3. 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.

4. Make the test pass.

5. Push to your fork and submit a pull request.


## Dependencies

The testing and development tools have a bunch of dependencies,
all managed by [Bundler](http://bundler.io/) according to the
[Puppet support matrix](http://docs.puppetlabs.com/guides/platforms.html#ruby-versions).

By default the tests use a baseline version of Puppet.

If you have Ruby 2.x or want a specific version of Puppet,
you must set an environment variable such as:

export PUPPET_VERSION="~> 3.2.0"

Install the dependencies like so...

bundle install

## Syntax and style

The test suite will run [Puppet Lint](http://puppet-lint.com/) and
[Puppet Syntax](https://github.com/gds-operations/puppet-syntax) to
check various syntax and style things. You can run these locally with:

bundle exec rake lint
bundle exec rake syntax

## Running the unit tests

The unit test suite covers most of the code, as mentioned above please
add tests if you're adding new functionality. If you've not used
[rspec-puppet](http://rspec-puppet.com/) before then feel free to ask
about how best to test your new feature. Running the test suite is done
with:

bundle exec rake spec

Note also you can run the syntax, style and unit tests in one go with:

bundle exec rake test

### Automatically run the tests

During development of your puppet module you might want to run your unit
tests a couple of times. You can use the following command to automate
running the unit tests on every change made in the manifests folder.

bundle exec guard

## Integration tests

The unit tests just check the code runs, not that it does exactly what
we want on a real machine. For that we're using
[Beaker](https://github.com/puppetlabs/beaker).

Beaker fires up a new virtual machine (using Vagrant) and runs a series of
simple tests against it after applying the module. You can run our
Beaker tests with:

bundle exec rake acceptance

This will use the host described in `spec/acceptance/nodeset/default.yml`
by default. To run against another host, set the `RS_SET` environment
variable to the name of a host described by a `.yml` file in the
`nodeset` directory. For example, to run against CentOS 6.4:

RS_SET=centos-64-x64 bundle exec rake acceptance

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_files`.
4 changes: 4 additions & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Merritt Krakowitzer
Bruce Morrison
gerhardsam
Jaco van Tonder
22 changes: 22 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
source 'https://rubygems.org'
group :test do
gem "rake"
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.0'
gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
gem "puppetlabs_spec_helper"
gem "metadata-json-lint"
gem "rspec-puppet-facts"
end
group :development do
gem "travis"
gem "travis-lint"
gem "vagrant-wrapper"
gem "puppet-blacksmith"
gem "guard-rake"
gem 'puppet-lint'
end
group :system_tests do
gem "beaker"
gem "beaker-rspec"
gem 'serverspec'
end
4 changes: 4 additions & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
notification :off
guard 'rake', :task => 'test' do
watch(%r{^manifests\/(.+)\.pp$})
end
20 changes: 20 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
The MIT License (MIT)

Copyright (c) {{{2014}}} {{{Merritt Krakowitzer}}}

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
11 changes: 0 additions & 11 deletions Modulefile

This file was deleted.

16 changes: 0 additions & 16 deletions README

This file was deleted.

Loading