Merge pull request #20 from christianharke/fix-upstart-scripts

Fix upstart scripts

Author: frne

defaults/main.yml

@@ -112,9 +112,15 @@ deploy_log_stderr_path: "{{ deploy_dir_logs }}/stderr.log"
 # If true, use deploy_service_prestart_script to run every time before the service is (re-)started
 deploy_service_has_prestart_script: False
 
+# If true, use deploy_service_poststart_script to run every time after the service is (re-)started
+deploy_service_has_poststart_script: False
+
 # Shell script to run if deploy_service_has_prestart_script is true
 deploy_service_prestart_script: ""
 
+# Shell script to run if deploy_service_has_poststart_script is true
+deploy_service_poststart_script: ""
+
 # The shell command used by the service to start your application
 deploy_service_start_command: "bin/{{ deploy_app_name }}"
 
@@ -124,13 +130,13 @@ deploy_service_pidfile: "/var/run/{{ deploy_service_name }}.pid"
 # If true, use deploy_service_prestop_script to run every time before the service is stopped
 deploy_service_has_prestop_script: False
 
-# If true, use deploy_service_poststop_script to run every time before the service is stopped
+# If true, use deploy_service_poststop_script to run every time after the service is stopped
 deploy_service_has_poststop_script: False
 
-# Shell script to run if deploy_service_has_prestart_script is true
-deploy_service_preststop_script: ""
+# Shell script to run if deploy_service_has_prestop_script is true
+deploy_service_prestop_script: ""
 
-# Shell script to run if deploy_service_has_prestart_script is true
+# Shell script to run if deploy_service_has_poststop_script is true
 deploy_service_poststop_script: ""
 
 # If true, service will start at boot time

templates/service/upstart.conf.j2

@@ -16,11 +16,7 @@
 
 description "Upstart script for {{ deploy_service_name }}"
 author "https://github.com/acme-software/ansible-java-deployment"
-version 1.0.0
-
-# Set environment variables
-env HOME={{ deploy_dir_app }}
-env PIDFILE={{ deploy_service_pidfile }}
+version 1.0.1
 
 # Respawn parameters with limit: dies 3 times within 60 seconds
 respawn
@@ -43,8 +39,15 @@ pre-start script
 end script
 {% endif %}
 
+{% if deploy_service_has_poststart_script == True %}
+# Post-Start Script
+post-start script
+  {{ deploy_service_poststart_script }}
+end script
+{% endif %}
+
 # Execute deploy_service_start_command and log stdout
-exec su -c "{{ deploy_service_start_command }} {% if deploy_log_stdout == True %}1>>{{ deploy_log_stdout_path }}{% endif %} {% if deploy_log_stderr == True %}2>>{{ deploy_log_stderr_path }}{% endif %}" {{ deploy_app_user }} -- --pid $PIDFILE
+exec su -s /bin/sh -c '{{ deploy_service_start_command }} {% if deploy_log_stdout == True %}1>>{{ deploy_log_stdout_path }}{% endif %} {% if deploy_log_stderr == True %}2>>{{ deploy_log_stderr_path }}{% endif %}' {{ deploy_app_user }}
 
 {% if deploy_service_has_prestop_script == True %}
 # Pre-Stop Script