Merge pull request #128 from ghoneycutt/puppetserver_sysconfig

Puppetserver sysconfig

.rubocop.yml

@@ -40,3 +40,6 @@ Style/HashSyntax:
 
 Style/BracesAroundHashParameters:
   Enabled: false
+
+Bundler/DuplicatedGem:
+  Enabled: false

.travis.yml

@@ -14,6 +14,13 @@ env:
 
 sudo: false
 
+before_install:
+  - bundle -v
+  - gem update --system
+  - gem update bundler
+  - gem --version
+  - bundle -v
+
 script: 'SPEC_OPTS="--format documentation" bundle exec rake $CHECK'
 
 matrix:

Gemfile

@@ -6,14 +6,10 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'metadata-json-lint', :require => false
-gem 'rspec-puppet', :require => false
-gem 'rspec-puppet-facts', :require => false
-gem 'rubocop', :require => false
-gem 'puppetlabs_spec_helper', '>= 1.2.0', :require => false
+gem 'activesupport', '~> 4.0', :require => false if RUBY_VERSION < '2.2'
 gem 'facter', '>= 2.0', :require => false
 gem 'hiera', '~> 3.0', :require => false
-gem 'rubocop', :require => false
+gem 'metadata-json-lint', :require => false
 gem 'puppet-lint', '~> 2.0', :require => false
 gem 'puppet-lint-absolute_classname-check', :require => false
 gem 'puppet-lint-alias-check', :require => false
@@ -29,8 +25,12 @@ gem 'puppet-lint-undef_in_function-check', :require => false
 gem 'puppet-lint-unquoted_string-check', :require => false
 gem 'puppet-lint-variable_contains_upcase', :require => false
 gem 'puppet-lint-version_comparison-check', :require => false
+gem 'puppetlabs_spec_helper', '>= 1.2.0', :require => false
+gem 'rspec-puppet', :require => false
+gem 'rspec-puppet-facts', :require => false
+gem 'rubocop', :require => false
 
-# Rack if a dependency of github_changelog_generator
+# Rack is a dependency of github_changelog_generator
 gem 'github_changelog_generator', require: false
 gem 'rack', '~> 1.0', :require => false if RUBY_VERSION <= '2.2.2'
 gem 'rack', :require => false if RUBY_VERSION > '2.2.2'

spec/fixtures/puppetserver_sysconfig

@@ -20,9 +20,17 @@ CONFIG="/etc/puppetlabs/puppetserver/conf.d"
 # Bootstrap path
 BOOTSTRAP_CONFIG="/etc/puppetlabs/puppetserver/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"
 
+# SERVICE_STOP_RETRIES can be set here to alter the default stop timeout in
+# seconds.  For systemd, the shorter of this setting or 'TimeoutStopSec' in
+# the systemd.service definition will effectively be the timeout which is used.
 SERVICE_STOP_RETRIES=60
 
 # START_TIMEOUT can be set here to alter the default startup timeout in
-# seconds.  This is used in System-V style init scripts only, and will have no
-# effect in systemd.
-# START_TIMEOUT=300
+# seconds.  For systemd, the shorter of this setting or 'TimeoutStartSec'
+# in the service's systemd.service configuration file will effectively be the
+# timeout which is used.
+START_TIMEOUT=300
+
+# Maximum number of seconds that can expire for a service reload attempt before
+# the result of the attempt is interpreted as a failure.
+RELOAD_TIMEOUT=120

templates/puppetserver_sysconfig.erb

@@ -20,9 +20,17 @@ CONFIG="/etc/puppetlabs/puppetserver/conf.d"
 # Bootstrap path
 BOOTSTRAP_CONFIG="/etc/puppetlabs/puppetserver/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"
 
+# SERVICE_STOP_RETRIES can be set here to alter the default stop timeout in
+# seconds.  For systemd, the shorter of this setting or 'TimeoutStopSec' in
+# the systemd.service definition will effectively be the timeout which is used.
 SERVICE_STOP_RETRIES=60
 
 # START_TIMEOUT can be set here to alter the default startup timeout in
-# seconds.  This is used in System-V style init scripts only, and will have no
-# effect in systemd.
-# START_TIMEOUT=300
+# seconds.  For systemd, the shorter of this setting or 'TimeoutStartSec'
+# in the service's systemd.service configuration file will effectively be the
+# timeout which is used.
+START_TIMEOUT=300
+
+# Maximum number of seconds that can expire for a service reload attempt before
+# the result of the attempt is interpreted as a failure.
+RELOAD_TIMEOUT=120