poise-monit 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5910f2212aae422952d183c3181c7a9f16ba7645
-  data.tar.gz: be58c2407526be1cfdc0f618898c18b1333447a9
+  metadata.gz: 3428e8e8bb8c8f1e1d92944526544f9127c5390c
+  data.tar.gz: 7e416f1611d2bbfc56b1c0a667aeab2652ade403
 SHA512:
-  metadata.gz: a72322971a42e15e31d8c6c5008d1186b4b66bf38a4f7339a0cfaf2a5a069267077d2c228b1308a82a99f2f42adbf680de67e48b1dcbc9bed2a34cb3e09cf633
-  data.tar.gz: 7918da029cf7e55e252f69cf166e66998bdefe6939bc8b8a90209990b40b189b33bca84f1decc79abb776fba327713a9851f8fadc76d4b762793834cff126e56
+  metadata.gz: 6b893215424d741a5ce7a3b697e16bcf10f1f247ca2573c581403b402338097622b7b05ce763781abc4fd42e0c355aef1842bce79a4decbfec768e90f5a9f696
+  data.tar.gz: a9f74101c31bc8bf3aadda6f9b5ac531f633428d3c6c217d6f98bff5cae6da1bd3674d25d3c3bc69a6267a9ac2eaef602ba2aca263771dd4cc9bf0806e095915

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Poise-Monit Changelog
 
+## v1.5.0
+
+* Allow overriding the template used for the `monit` service provider.
+
 ## v1.4.0
 
 * Allow tuning the timeout and wait for `monit_service` via node attributes.

data/README.md

@@ -268,6 +268,26 @@ The service provider has two node attributes that can used for global tuning:
 * `node['poise-monit']['monit_service_wait']` – Seconds to wait between attempts
   when registering a new service with Monit. *(default: 1)*
 
+### Options
+
+* `pid_file` – Path to PID file that the service command will create.
+* `pid_file_external` – If true, assume the service will create the PID file
+  itself. *(default: true if `pid_file` option is set)*
+* `template` – Override the default script template. If you want to use a
+  template in a different cookbook use `'cookbook:template'`.
+* `monit_template` – Override the default monit template. If you want to use a
+  template in a different cookbook use `'cookbook:template'`.
+* `command` – Override the service command.
+* `directory` – Override the service directory.
+* `environment` – Override the service environment variables.
+* `reload_signal` – Override the service reload signal.
+* `stop_signal` – Override the service stop signal.
+* `user` – Override the service user.
+* `never_restart` – Never try to restart the service.
+* `never_reload` – Never try to reload the service.
+* `script_path` – Override the path to the generated service script.
+* `parent` – Override the auto-detection of which `monit` resource to use.
+
 ## Upgrading From `monit`
 
 Upgrading from the older [`monit` cookbook](https://github.com/poise/poise-monit-compat)

data/lib/poise_monit/service_providers/monit.rb

@@ -94,9 +94,22 @@ module PoiseMonit
         _parent = service_resource.parent
         _script_path = script_path
         monit_config new_resource.service_name do
-          cookbook 'poise-monit'
+          if options['monit_template']
+            # If we have a template override, allow specifying a cookbook via
+            # "cookbook:template".
+            parts = options['monit_template'].split(/:/, 2)
+            if parts.length == 2
+              source parts[1]
+              cookbook parts[0]
+            else
+              source parts.first
+              cookbook new_resource.cookbook_name.to_s
+            end
+          else
+            source 'monit_service.conf.erb'
+            cookbook 'poise-monit'
+          end
           parent _parent
-          source 'monit_service.conf.erb'
           variables service_resource: new_resource, options: _options, pid_file: _pid_file, script_path: _script_path
           # Don't trigger a restart if the template doesn't already exist, this
           # prevents restarting on the run that first creates the service.

data/lib/poise_monit/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseMonit
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-monit
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite