Merge pull request #54 from bstopp/feature/restart-apache

Restart apache when Dispatcher changes.

Author: bstopp

Gemfile

@@ -4,7 +4,6 @@ group :development, :tests do
   gem 'rspec', '~> 3.4',           :require => false
   gem 'rake',                      :require => false
   gem 'metadata-json-lint',        :require => false
-#  gem 'rspec-puppet', '2.3.0',     :require => false
   gem 'rspec-puppet',              :require => false
   gem 'webmock',                   :require => false
   gem 'puppetlabs_spec_helper',    :require => false

Gemfile.lock

@@ -31,32 +31,32 @@ GEM
       rsync (~> 1.0.9)
       stringify-hash (~> 0.0)
       unf (~> 0.1)
-    beaker-answers (0.5.2)
+    beaker-answers (0.6.0)
       hocon (~> 0.9.5)
       require_all (~> 1.3.2)
       stringify-hash (~> 0.0.0)
     beaker-hiera (0.1.1)
       stringify-hash (~> 0.0.0)
-    beaker-pe (0.4.0)
+    beaker-pe (0.5.0)
       stringify-hash (~> 0.0.0)
     beaker-puppet_install_helper (0.4.4)
       beaker (~> 2.0)
-    beaker-rspec (5.4.0)
+    beaker-rspec (5.6.0)
       beaker (~> 2.0)
       rspec
       serverspec (~> 2)
       specinfra (~> 2)
     builder (3.2.2)
-    codeclimate-test-reporter (0.5.1)
+    codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    docker-api (1.28.0)
+    docker-api (1.29.0)
       excon (>= 0.38.0)
       json
-    excon (0.49.0)
+    excon (0.50.1)
     facter (2.4.6)
       CFPropertyList (~> 2.2.6)
     faraday (0.9.2)
@@ -90,8 +90,8 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.9.2)
-      fog-core (~> 1.27)
+    fog-aws (0.9.4)
+      fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
@@ -141,7 +141,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.1.1)
+    fog-softlayer (1.1.2)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -219,12 +219,12 @@ GEM
       ast (~> 2.2)
     pkg-config (1.1.7)
     powerpack (0.1.1)
-    puppet (4.5.1)
+    puppet (4.5.2)
       CFPropertyList (~> 2.2.6)
       facter (> 2.0, < 4)
       hiera (>= 2.0, < 4)
       json_pure
-    puppet-lint (1.1.0)
+    puppet-lint (2.0.0)
     puppet-syntax (2.1.0)
       rake
     puppetlabs_spec_helper (1.1.1)
@@ -262,8 +262,8 @@ GEM
       rspec
     rspec-support (3.4.1)
     rsync (1.0.9)
-    rubocop (0.40.0)
-      parser (>= 2.3.1.0, < 3.0)
+    rubocop (0.41.1)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -276,7 +276,7 @@ GEM
       rspec-its
       specinfra (~> 2.53)
     sfl (2.2)
-    signet (0.7.2)
+    signet (0.7.3)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (~> 1.5)
@@ -287,7 +287,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     spdx-licenses (1.1.0)
-    specinfra (2.59.0)
+    specinfra (2.59.3)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet
@@ -299,7 +299,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.0.5)
+    unicode-display_width (1.1.0)
     webmock (2.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)

Rakefile

@@ -3,7 +3,8 @@ require 'puppet-syntax/tasks/puppet-syntax'
 require 'rubocop/rake_task'
 
 exclude_paths = [
-  'spec/fixtures/**/*'
+  'spec/fixtures/**/*',
+  'vendor/**/*'
 ]
 
 task :default => [:spec, :lint, :rubocop]

docs/aem-instance/Service-Configuration.md

@@ -12,7 +12,7 @@ By default a Puppet service will be created and started for AEM. You can disable
 ~~~ puppet
 aem::instance { 'aem' :
   source => '/path/to/aem-quickstart.jar',
-  service => 'unmanaged'
+  status => 'unmanaged'
 }
 ~~~
 
@@ -27,7 +27,7 @@ You can also ensure AEM Service is not running, and not enabled it on boot:
 ~~~ puppet
 aem::instance { 'aem' :
   source => '/path/to/aem-quickstart.jar',
-  service => 'disabled'
+  status => 'disabled'
 }
 ~~~
 
@@ -42,7 +42,7 @@ AEM can be running, but not enabled on boot:
 ~~~ puppet
 aem::instance { 'aem' :
   source => '/path/to/aem-quickstart.jar',
-  service => 'running'
+  status => 'running'
 }
 ~~~
 

docs/dispatcher/Propagate-Synd-Post.md

@@ -7,7 +7,7 @@ This example creates a farm definition with custom Propagate Synd Post:
 
 ~~~ puppet
 aem::dispatcher::farm { 'site' :
-  docroot => '/var/www',
+  docroot             => '/var/www',
   propagate_synd_post => '1',
 }
 ~~~

docs/dispatcher/Renders.md

@@ -87,8 +87,8 @@ aem::dispatcher::farm { 'site' :
       'ipv4'           => 0,
     },
     {
-      'hostname'       => 'author.hostname.com',
-      'port'           => 9009,
+      'hostname' => 'author.hostname.com',
+      'port'     => 9009,
     }
   ]
 }

docs/dispatcher/Session-Management.md

@@ -7,8 +7,8 @@ This example creates a Farm definition with custom session management definition
 
 ~~~ puppet
 aem::dispatcher::farm { 'site' :
-  docroot => '/var/www',
-  session_management  => {
+  docroot            => '/var/www',
+  session_management => {
     'directory' => '/path/to/cache',
     'encode'    => 'md5',
     'header'    => 'HTTP:authorization',

docs/dispatcher/Unavailability-Penalty.md

@@ -5,8 +5,8 @@
 
 ~~~ puppet
 aem::dispatcher::farm { 'site' :
-  docroot    => '/var/www',
-  statistics => [
+  docroot             => '/var/www',
+  statistics          => [
     {
       'glob'     => '*.html',
       'category' => 'html'

docs/dispatcher/render-errors/Retry-Count.md

@@ -6,7 +6,7 @@
 ~~~ puppet
 aem::dispatcher::farm { 'site' :
   docroot => '/var/www',
-  retries => "5",
+  retries => '5',
 }
 ~~~
 

docs/license/User-Group.md

@@ -6,7 +6,6 @@ In the event you changed the default AEM user/group.
 ~~~ puppet
 aem::instance { 'aem' :
   source  => '/path/to/aem-quickstart.jar',
-  service => 'unmanaged',
   user    => 'vagrant',
   group   => 'vagrant',
 }
@@ -16,8 +15,8 @@ aem::license { 'aem' :
   home        => '/opt/aem',
   license_key => 'enter-your-key-here',
   version     => '6.1.0',
-  user    => 'vagrant',
-  group   => 'vagrant',
+  user        => 'vagrant',
+  group       => 'vagrant',
 }
 
 Aem::License['aem'] ~> Aem::Service['aem-aem']

docs/osgi-config/Console-Type.md

@@ -31,7 +31,7 @@ $cfgs = {
 aem::osgi::config { 'org.apache.sling.security.impl.ReferrerFilter' :
   ensure         => present,
   properties     => $cfgs,
-  handle_missing => 'remove\',
+  handle_missing => 'remove',
   home           => '/opt/aem/author',
   password       => 'admin',
   type           => 'console',

docs/replication/types/Reverse.md

@@ -8,14 +8,14 @@ This example creates a Reverse replication agent, the custom type.
 
 ~~~ puppet
 aem::agent::replication::reverse { 'Reverse Agent' :
-  home            => '/opt/aem',
-  name            => 'publish_reverse',
-  password        => 'admin',
-  runmode         => 'author',
-  trans_password  => 'admin',
-  trans_uri       => 'http://localhost:4503/bin/receive?authRequestLogin=1',
-  trans_user      => 'admin',
-  username        => 'admin',
+  home           => '/opt/aem',
+  name           => 'publish_reverse',
+  password       => 'admin',
+  runmode        => 'author',
+  trans_password => 'admin',
+  trans_uri      => 'http://localhost:4503/bin/receive?authRequestLogin=1',
+  trans_user     => 'admin',
+  username       => 'admin',
 }
 ~~~
 

docs/replication/types/flush/Default.md

@@ -6,14 +6,14 @@ This example creates a Publish replication agent, using the minimal resource def
 
 ~~~ puppet
 aem::agent::replication::flush { 'Flush Agent' :
-  home            => '/opt/aem',
-  name            => 'flush',
-  password        => 'admin',
-  runmode         => 'author',
-  trans_password  => 'admin',
-  trans_uri       => 'http://localhost:80/dispatcher/invalidate.cache',
-  trans_user      => 'admin',
-  username        => 'admin',
+  home           => '/opt/aem',
+  name           => 'flush',
+  password       => 'admin',
+  runmode        => 'author',
+  trans_password => 'admin',
+  trans_uri      => 'http://localhost:80/dispatcher/invalidate.cache',
+  trans_user     => 'admin',
+  username       => 'admin',
 }
 ~~~
 

docs/replication/types/flush/Log-Level.md

@@ -6,14 +6,14 @@ This example manages the Log Level for the replication agent.
 
 ~~~ puppet
 aem::agent::replication::flush { 'Flush Agent' :
-  home            => '/opt/aem',
-  log_level       => 'error',
-  name            => 'flush',
-  password        => 'admin',
-  runmode         => 'author',
-  trans_password  => 'admin',
-  trans_uri       => 'http://localhost:80/dispatcher/invalidate.cache',
-  trans_user      => 'admin',
-  username        => 'admin',
+  home           => '/opt/aem',
+  log_level      => 'error',
+  name           => 'flush',
+  password       => 'admin',
+  runmode        => 'author',
+  trans_password => 'admin',
+  trans_uri      => 'http://localhost:80/dispatcher/invalidate.cache',
+  trans_user     => 'admin',
+  username       => 'admin',
 }
 ~~~

docs/replication/types/flush/Transport-User.md

@@ -6,13 +6,13 @@ This example creates a Flush replication agent, with a custom transport user cre
 
 ~~~ puppet
 aem::agent::replication::flush { 'Flush Agent' :
-  home            => '/opt/aem',
-  name            => 'flush',
-  password        => 'admin',
-  runmode         => 'author',
-  trans_password  => 'not-the-admin-password',
-  trans_uri       => 'http://localhost:80/dispatcher/invalidate.cache',
-  trans_user      => 'not-the-admin-user',
-  username        => 'admin',
+  home           => '/opt/aem',
+  name           => 'flush',
+  password       => 'admin',
+  runmode        => 'author',
+  trans_password => 'not-the-admin-password',
+  trans_uri      => 'http://localhost:80/dispatcher/invalidate.cache',
+  trans_user     => 'not-the-admin-user',
+  username       => 'admin',
 }
 ~~~

docs/replication/types/publish/Agent-User.md

@@ -6,15 +6,15 @@ This example configures the agent to use a specific user for aggregating content
 
 ~~~ puppet
 aem::agent::replication::publish { 'Publish Agent' :
-  agent_user      => 'custom-user',
-  home            => '/opt/aem',
-  name            => 'publish',
-  password        => 'admin',
-  runmode         => 'author',
-  trans_password  => 'admin',
-  trans_uri       => 'http://localhost:4503/bin/receive?authRequestLogin=1',
-  trans_user      => 'admin',
-  username        => 'admin',
+  agent_user     => 'custom-user',
+  home           => '/opt/aem',
+  name           => 'publish',
+  password       => 'admin',
+  runmode        => 'author',
+  trans_password => 'admin',
+  trans_uri      => 'http://localhost:4503/bin/receive?authRequestLogin=1',
+  trans_user     => 'admin',
+  username       => 'admin',
 }
 ~~~
 

docs/replication/types/publish/Default.md

@@ -6,14 +6,14 @@ This example creates a Publish replication agent, using the minimal resource def
 
 ~~~ puppet
 aem::agent::replication::publish { 'Publish Agent' :
-  home            => '/opt/aem',
-  name            => 'publish',
-  password        => 'admin',
-  runmode         => 'author',
-  trans_password  => 'admin',
-  trans_uri       => 'http://localhost:4503/bin/receive?authRequestLogin=1',
-  trans_user      => 'admin',
-  username        => 'admin',
+  home           => '/opt/aem',
+  name           => 'publish',
+  password       => 'admin',
+  runmode        => 'author',
+  trans_password => 'admin',
+  trans_uri      => 'http://localhost:4503/bin/receive?authRequestLogin=1',
+  trans_user     => 'admin',
+  username       => 'admin',
 }
 ~~~
 

docs/replication/types/publish/Log-Level.md

@@ -6,14 +6,14 @@ This example manages the Log Level for the replication agent.
 
 ~~~ puppet
 aem::agent::replication::publish { 'Publish Agent' :
-  home            => '/opt/aem',
-  log_level       => 'error',
-  name            => 'publish',
-  password        => 'admin',
-  runmode         => 'author',
-  trans_password  => 'admin',
-  trans_uri       => 'http://localhost:4503/bin/receive?authRequestLogin=1',
-  trans_user      => 'admin',
-  username        => 'admin',
+  home           => '/opt/aem',
+  log_level      => 'error',
+  name           => 'publish',
+  password       => 'admin',
+  runmode        => 'author',
+  trans_password => 'admin',
+  trans_uri      => 'http://localhost:4503/bin/receive?authRequestLogin=1',
+  trans_user     => 'admin',
+  username       => 'admin',
 }
 ~~~