fix restart in upstart scripts due to upstart bug with pre-stop

wr0ngway · Jan 26, 2012 · 4563cb0 · 4563cb0
1 parent 7a0c907
commit 4563cb0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/templates/elasticsearch/config/rubber/role/elasticsearch/elasticsearch-upstart.conf b/templates/elasticsearch/config/rubber/role/elasticsearch/elasticsearch-upstart.conf
@@ -18,6 +18,6 @@ post-start script
   while ! curl -s 'http://localhost:<%= rubber_env.elasticsearch_http_port %>/_status' > /dev/null 2>&1; do sleep 1 ; done
 end script
 
-pre-stop script
-  rm <%= rubber_env.elasticsearch_pid_file %>
+post-stop script
+  rm -f <%= rubber_env.elasticsearch_pid_file %>
 end script
diff --git a/templates/graylog/config/rubber/role/graylog_server/graylog_server-upstart.conf b/templates/graylog/config/rubber/role/graylog_server/graylog_server-upstart.conf
@@ -19,6 +19,6 @@ post-start script
   status graylog-server | head -n1 | awk '{print $NF}' > <%= rubber_env.graylog_server_pid_file %>
 end script
 
-pre-stop script
-  rm <%= rubber_env.graylog_server_pid_file %>
+post-stop script
+  rm -f <%= rubber_env.graylog_server_pid_file %>
 end script
diff --git a/templates/graylog/config/rubber/role/graylog_web/graylog_web-upstart.conf b/templates/graylog/config/rubber/role/graylog_web/graylog_web-upstart.conf
@@ -16,6 +16,6 @@ post-start script
   status graylog-web | head -n1 | awk '{print $NF}' > <%= rubber_env.graylog_web_pid_file %>
 end script
 
-pre-stop script
-  rm <%= rubber_env.graylog_web_pid_file %>
+post-stop script
+  rm -f <%= rubber_env.graylog_web_pid_file %>
 end script