interpolate $prog in init.d script

amine2z · Oct 2, 2013 · d742263 · d742263
1 parent 80373a6
commit d742263
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -21,6 +21,7 @@
 class selenium::config {
 
   $options = '-Dwebdriver.enable.native.events=1'
+  $prog    = 'selenium'
 
   file { '/etc/init.d/selenium':
     ensure  => 'file',

diff --git a/spec/classes/selenium_config_spec.rb b/spec/classes/selenium_config_spec.rb
@@ -22,7 +22,8 @@
           with_content(/SLNM_USER='selenium'/).
           with_content(/SLNM_INSTALL_PATH='\/opt\/selenium'/).
           with_content(/SLNM_JAR_NAME='selenium-server-standalone-2.35.0.jar'/).
-          with_content(/SLNM_OPTIONS='-Dwebdriver.enable.native.events=1'/)
+          with_content(/SLNM_OPTIONS='-Dwebdriver.enable.native.events=1'/).
+          with_content(/prog='selenium'/)
       end
     end
   end

diff --git a/templates/init.d/selenium.erb b/templates/init.d/selenium.erb
@@ -32,7 +32,7 @@ SLNM_LOG="${SLNM_INSTALL_PATH}/log/server.log"
 SLNM_ERROR_LOG="${SLNM_INSTALL_PATH}/log/error.log"
 SLNM_JAR="${SLNM_INSTALL_PATH}/jars/${SLNM_JAR_NAME}"
 
-prog="selenium"
+prog='<%= scope.lookupvar('selenium::config::prog') %>'
 #config="<path to major config file>"
 
 #[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog