From 0ebd6594c86c4f27c35ddd483beeeb9b1e5dee83 Mon Sep 17 00:00:00 2001
From: David Bruha <d.bruha@virtis.cz>
Date: Fri, 18 Mar 2016 17:32:29 +0100
Subject: [PATCH] GlassFish version is in "version" not "glassfish_version"\nWe
 need passwordfile to start given domain

---
 templates/glassfish-init-domain-debian.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/glassfish-init-domain-debian.erb b/templates/glassfish-init-domain-debian.erb
index 7808fcb..795ea6d 100644
--- a/templates/glassfish-init-domain-debian.erb
+++ b/templates/glassfish-init-domain-debian.erb
@@ -1,17 +1,17 @@
 #! /bin/bash
 
 ### BEGIN INIT INFO
-# Provides:		glassfishv<%= scope.lookupvar('glassfish::glassfish_version') %>
+# Provides:		glassfishv<%= scope.lookupvar('glassfish::version') %>
 # Required-Start:	$network $local_fs $remote_fs
 # Required-Stop:
 # Default-Start:	2 3 4 5
 # Default-Stop:		0 1 6
-# Short-Description:	Oracle Glassfish Java EE Application Server ver. <%= scope.lookupvar('glassfish::glassfish_version') %>
+# Short-Description:	Oracle Glassfish Java EE Application Server ver. <%= scope.lookupvar('glassfish::version') %>
 ### END INIT INFO
 
 USER=<%= @runuser %>
 GLASSFISHPATH=<%= scope.lookupvar('glassfish::glassfish_dir') %>/glassfish/bin
-__NAME="Oracle Glassfish Java EE Application Server ver. <%= scope.lookupvar('glassfish::glassfish_version') %>"
+__NAME="Oracle Glassfish Java EE Application Server ver. <%= scope.lookupvar('glassfish::version') %>"
 
 test -x ${GLASSFISHPATH}/asadmin || exit 2
 
@@ -25,7 +25,7 @@ function procStart() {
 	fi
 	log_daemon_msg "Starting $__NAME"
 	_isOk=0
-	sudo -u $USER $GLASSFISHPATH/asadmin start-domain > /dev/null
+	sudo -u $USER $GLASSFISHPATH/asadmin --passwordfile <%= scope.lookupvar('glassfish::asadmin_passfile') %> start-domain > /dev/null
 	if [[ $? -ne 0 ]]; then
 		_isOk=2
 	fi