fixes #37 : archive install now checks if user/service are defined be…

README.md

@@ -45,6 +45,7 @@ This assumes that you with to install Grafana using the 'package' method. To est
       install_method  => 'docker',
     }
 ```
+
 ##Usage
 
 ###Classes and Defined Types
@@ -167,6 +168,34 @@ The name of the service managed with the 'archive' and 'package' install methods
 
 The version of Grafana to install and manage. Defaults to the latest version of Grafana available at the time of module release.
 
+##Advanced usage:
+
+The archive install method will create the user and a "command line" service by default. 
+There are no extra parameters to manage user/service for archive. However, both check to see if they are defined before defining. This way you can creat your own user and service with your own specifications. (sort of overriding)
+The service can be a bit tricky, in this example below, the class sensu_install::grafana::service creates a startup script and a service{'grafana-server':}
+
+Example:
+```puppet
+    user { 'grafana':
+      ensure   => present,
+      uid      => '1234',
+    }
+    ->
+    class { 'grafana':
+      install_method  => 'archive',
+    }
+
+    include sensu_install::grafana::service
+
+    # run your service after install/config but before grafana::service
+    Class[::grafana::install]
+    ->
+    Class[sensu_install::grafana::service]
+    ->
+    Class[::grafana::service]
+
+```
+
 ##Limitations
 
 This module has been tested on Ubuntu 14.04, using each of the 'archive', docker' and 'package' installation methods. Other configurations should work with minimal, if any, additional effort.

manifests/install.pp

@@ -110,10 +110,12 @@
         url              => $::grafana::archive_source
       }
 
-      user { 'grafana':
-        ensure  => present,
-        home    => $::grafana::install_dir,
-        require => Archive['grafana']
+      if !defined(User['grafana']){
+        user { 'grafana':
+          ensure  => present,
+          home    => $::grafana::install_dir,
+          require => Archive['grafana']
+        }
       }
 
       file { $::grafana::install_dir:

manifests/service.pp

@@ -27,13 +27,15 @@
       $service_path   = "${::grafana::install_dir}/bin/${::grafana::service_name}"
       $service_config = "${::grafana::install_dir}/conf/custom.ini"
 
-      service { $::grafana::service_name:
-        ensure     => running,
-        provider   => base,
-        binary     => "su - grafana -c '${service_path} -config=${service_config} -homepath=${::grafana::install_dir} web &'",
-        hasrestart => false,
-        hasstatus  => false,
-        status     => "ps -ef | grep ${::grafana::service_name} | grep -v grep"
+      if !defined(Service[$::grafana::service_name]){
+        service { $::grafana::service_name:
+          ensure     => running,
+          provider   => base,
+          binary     => "su - grafana -c '${service_path} -config=${service_config} -homepath=${::grafana::install_dir} web &'",
+          hasrestart => false,
+          hasstatus  => false,
+          status     => "ps -ef | grep ${::grafana::service_name} | grep -v grep"
+        }
       }
     }
     default: {

spec/classes/grafana_spec.rb

@@ -152,6 +152,31 @@
       it { should contain_service('grafana-server').with_ensure('running').with_provider('base') }
       it { should contain_service('grafana-server').with_hasrestart(false).with_hasstatus(false) }
     end
+
+    context 'when user already defined' do
+      let(:pre_condition) {
+        'user{"grafana":
+          ensure => present,
+        }'
+      }
+      describe 'do NOT create grafana user' do
+        it { should_not contain_user('grafana').with_ensure('present').with_home(install_dir) }
+      end
+    end
+
+    context 'when service already defined' do
+      let(:pre_condition) {
+        'service{"grafana-server":
+          ensure     => running,
+          hasrestart => true,
+          hasstatus  => true,
+        }'
+      }
+      # let(:params) {{ :service_name => 'grafana-server'}}
+      describe 'do NOT run service' do
+        it { should_not contain_service('grafana-server').with_hasrestart(false).with_hasstatus(false) }
+      end
+    end
   end
 
   context 'invalid parameters' do