now copies jar explicitly, removed name/startas as start-stop-daemon …

…doesn't work on ubuntu as documented Signed-off-by: Brian Coca <bcoca@ondeck.com>
bcoca · Mar 27, 2014 · 42a1724 · 42a1724
1 parent 1ebf398
commit 42a1724
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -5,7 +5,7 @@
   get_url: url={{download_url}}  dest={{cur_dir}}/{{jar_file}} force=no
 
 - name: Copy selenium into place
-  copy: src={{jar_file}}  dest=/usr/local/lib/ owner=root group=root mode=644
+  copy: src={{jar_file}}  dest=/usr/local/lib/{{jar_file}} owner=root group=root mode=644
 
 - name: Install Config
   template: src=defaults.j2 dest=/etc/default/selenium_{{sel_role}} owner=root group=root mode=644

diff --git a/templates/init.j2 b/templates/init.j2
@@ -100,7 +100,6 @@ start)
                         --make-pidfile \
                         --user "${SE_USER}" \
                         --group "${SE_GROUP}" \
-                        --startas ${NAME} \
                         --exec ${JAVA_HOME}/bin/java -- ${JAVA_OPTS} -jar /usr/local/lib/{{jar_file}} ${JAR_ARGS} ${EXTRA_ARGS}  2>&1 \
         | logger -t "${NAME}"
 ;;
@@ -110,7 +109,6 @@ stop)
     if [ $? -eq 0 ]; then
         start-stop-daemon   --stop \
                             --pidfile "${SE_PID}" \
-                            --name ${NAME} \
                             --retry=TERM/30/KILL/5
         rc=$?
         if [ $? -eq 0 ]; then