Skip to content
This repository was archived by the owner on Nov 7, 2024. It is now read-only.

Commit 34bd8b0

Browse files
juniorsysadminjuniorsysadmin
committed
Multiple fixes, bump default to 0.8.3
(Thanks to @fkleon for raising some of these) - Applies modulesync changes (from Voxpupuli modulesync_configs). - Changes default version to 0.8.3. - Adds new configuration parameters for 0.8.x. - Splits off the nginx.conf contents into a new variable. - Cleans up the kong.yml template, double quoting variables and removes (most) commented sections taken from the default upstream file. - Adds better documentation for parameters. - Changes validation of certain IP addresses to IPv4 only. - Adds validation of the database type. - Adds ```dns_resolvers_available``` parameter. - Replaces ```proxy_listen_address``` and ```proxy_listen_port``` parameters with ```proxy_listen```. - Replaces ```proxy_listen_ssl_address``` and ```proxy_listen_ssl_port``` parameters with ```proxy_listen_ssl```. - Replaces ```admin_api_listen_address``` and ```admin_api_listen_port``` parameters with ```admin_api_listen```. - Replaces ```cluster_listen_address``` and ```cluster_listen_port``` parameters with ```cluster_listen```. - Replaces ```cluster_listen_rpc_address``` and ```cluster_listen_rpc_port``` parameters with ```cluster_listen_rpc```. - Changes ```config_file_group``` to 0 rather than root in preparation for FreeBSD support. - Adds better validation of parameters. - Adds ```staging_dir``` parameter. - Fixes ```custom_plugins``` to be empty since supported plugins are loaded by default. - Fixes printing of ```cassandra_ssl_*``` values. - Fixes metadata.json formatting. - Fixes variable quoting in initscripts.pp. - Fixes the Upstart script to include ```start```. - Fixes inconsistent Puppet-managed template headers. - Fixes installation issues due to the native package provider not supporting the source package attribute. - Attempts to fix up non-working OSX installation.
1 parent b81a920 commit 34bd8b0

19 files changed

+616
-545
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
pkg/
22
Gemfile.lock
3+
Gemfile.local
34
vendor/
5+
.vendor/
46
spec/fixtures/
57
.vagrant/
68
.bundle/

‎.rubocop.yml

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
require: rubocop-rspec
12
AllCops:
3+
TargetRubyVersion: 1.9
24
Include:
35
- ./**/*.rb
46
Exclude:
57
- vendor/**/*
8+
- .vendor/**/*
69
- pkg/**/*
710
- spec/fixtures/**/*
811

@@ -39,8 +42,12 @@ Style/TrailingCommaInArguments:
3942
Enabled: false
4043
Style/TrailingCommaInLiteral:
4144
Enabled: false
45+
4246
Style/ClosingParenthesisIndentation:
43-
Enabled: false
47+
Enabled: true
48+
49+
Style/BlockDelimiters:
50+
Enabled: true
4451

4552
Lint/AmbiguousRegexpLiteral:
4653
Enabled: true
@@ -64,3 +71,13 @@ Style/BlockDelimiters:
6471

6572
Style/MultilineBlockLayout:
6673
Enabled: False
74+
75+
# Rspec
76+
77+
# We don't use rspec in this way
78+
RSpec/DescribeClass:
79+
Enabled: False
80+
81+
# Example length is not necessarily an indicator of code quality
82+
RSpec/ExampleLength:
83+
Enabled: False

‎.sync.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
CONTRIBUTING.md:
3+
unmanaged: true

‎.travis.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,33 @@
22
sudo: false
33
language: ruby
44
cache: bundler
5-
bundler_args: --without system_tests
6-
before_install: rm Gemfile.lock || true
5+
bundler_args: --without system_tests development
6+
before_install:
7+
- bundle -v
8+
- rm Gemfile.lock || true
9+
- gem update --system
10+
- gem update bundler
11+
- gem --version
12+
- bundle -v
713
script:
814
- 'bundle exec rake $CHECK'
915
matrix:
1016
fast_finish: true
1117
include:
1218
- rvm: 1.9.3
1319
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
14-
- rvm: 2.1.8
15-
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
1620
- rvm: 1.9.3
17-
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test FUTURE_PARSER=yes
18-
- rvm: 2.1.8
19-
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test FUTURE_PARSER=yes
20-
- rvm: 2.1.8
21+
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test
22+
- rvm: 2.1
23+
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
24+
- rvm: 2.1
2125
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
22-
- rvm: 2.2.4
26+
- rvm: 2.2
2327
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
24-
- rvm: 2.2.4
28+
- rvm: 2.3.1
2529
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop
26-
- rvm: 2.3.0
30+
- rvm: 2.3.1
2731
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
28-
allow_failures:
29-
- rvm: 2.3.0
30-
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
3132
notifications:
3233
email: false
3334
deploy:
@@ -40,5 +41,4 @@ deploy:
4041
# all_branches is required to use tags
4142
all_branches: true
4243
# Only publish if our main Ruby target builds
43-
rvm: 1.9.3
44-
condition: "$FUTURE_PARSER = yes"
44+
rvm: 2.2

‎.yardopts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--markup markdown

‎CHANGELOG.md

+48-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,50 @@
1+
## Future
2+
3+
### Summary
4+
5+
This release provides several bugfixes, bumps the default version to 0.8.2 and
6+
adds new parameters for the 0.8.x version of Kong.
7+
8+
#### Features
9+
10+
- Applies modulesync changes (from Voxpupuli modulesync_configs).
11+
- Changes default version to 0.8.3.
12+
- Adds new configuration parameters for 0.8.x.
13+
- Splits off the nginx.conf contents into a new variable.
14+
- Cleans up the kong.yml template, double quoting variables and removes
15+
(most) commented sections taken from the default upstream file.
16+
- Adds better documentation for parameters.
17+
- Changes validation of certain IP addresses to IPv4 only.
18+
- Adds validation of the database type.
19+
- Adds ```dns_resolvers_available``` parameter.
20+
- Replaces ```proxy_listen_address``` and ```proxy_listen_port``` parameters
21+
with ```proxy_listen```.
22+
- Replaces ```proxy_listen_ssl_address``` and ```proxy_listen_ssl_port```
23+
parameters with ```proxy_listen_ssl```.
24+
- Replaces ```admin_api_listen_address``` and ```admin_api_listen_port```
25+
parameters with ```admin_api_listen```.
26+
- Replaces ```cluster_listen_address``` and ```cluster_listen_port```
27+
parameters with ```cluster_listen```.
28+
- Replaces ```cluster_listen_rpc_address``` and ```cluster_listen_rpc_port```
29+
parameters with ```cluster_listen_rpc```.
30+
- Changes ```config_file_group``` to 0 rather than root in preparation for
31+
FreeBSD support.
32+
- Adds better validation of parameters.
33+
- Adds ```staging_dir``` parameter.
34+
35+
#### Bugfixes
36+
37+
- Fixes ```custom_plugins``` to be empty since supported plugins are loaded
38+
by default.
39+
- Fixes printing of ```cassandra_ssl_*``` values.
40+
- Fixes metadata.json formatting.
41+
- Fixes variable quoting in initscripts.pp.
42+
- Fixes the Upstart script to include ```start```.
43+
- Fixes inconsistent Puppet-managed template headers.
44+
- Fixes installation issues due to the native package provider not supporting
45+
the source package attribute.
46+
- Attempts to fix up non-working OSX installation.
47+
148
## 2016-04-12 Release 0.0.1
249

3-
- Initial module release
50+
- Initial module release.

‎Gemfile

+9-10
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,23 @@ def location_for(place, fake_version = nil)
1111
end
1212

1313
group :test do
14-
gem 'rake', :require => false
14+
gem 'puppetlabs_spec_helper', :require => false
1515
gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
16-
gem 'puppet-lint', :require => false, :git => 'https://github.com/rodjek/puppet-lint.git'
17-
gem 'metadata-json-lint', :require => false
1816
gem 'rspec-puppet-facts', :require => false
19-
gem 'rspec', :require => false
20-
gem 'puppet-blacksmith', :require => false, :git => 'https://github.com/voxpupuli/puppet-blacksmith.git'
21-
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
22-
gem 'rubocop', '~> 0.39', :require => false
2317
gem 'rspec-puppet-utils', :require => false
24-
gem 'puppetlabs_spec_helper', :require => false
18+
gem 'puppet-lint', :require => false, :git => 'https://github.com/rodjek/puppet-lint.git'
2519
gem 'puppet-lint-absolute_classname-check', :require => false
2620
gem 'puppet-lint-leading_zero-check', :require => false
2721
gem 'puppet-lint-trailing_comma-check', :require => false
2822
gem 'puppet-lint-version_comparison-check', :require => false
2923
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
3024
gem 'puppet-lint-unquoted_string-check', :require => false
3125
gem 'puppet-lint-variable_contains_upcase', :require => false
26+
gem 'metadata-json-lint', :require => false
27+
gem 'puppet-blacksmith', :require => false, :git => 'https://github.com/voxpupuli/puppet-blacksmith.git'
28+
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
29+
gem 'puppet-strings', :require => false, :git => 'https://github.com/puppetlabs/puppetlabs-strings.git'
30+
gem 'rubocop-rspec', '~> 1.5', :require => false
3231
end
3332

3433
group :development do
@@ -58,7 +57,7 @@ else
5857
gem 'facter', :require => false, :groups => [:test]
5958
end
6059

61-
ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 3.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
60+
ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
6261
gem 'puppet', puppetversion, :require => false, :groups => [:test]
6362

64-
# vim:ft=ruby
63+
# vim: syntax=ruby

0 commit comments

Comments
 (0)