only write out chef config if necessary, restart based on pid files

Author: Gabriel Monroy

controller/bin/start

@@ -7,5 +7,8 @@ cd /app
 # run an idempotent database migration
 sudo -E -u deis ./manage.py syncdb --migrate --noinput
 
+# spawn celery worker in the background
+sudo -E -u deis celery worker --app=deis --loglevel=INFO --workdir=/app/deis/controller --pidfile=/tmp/celery.pid &
+
 # spawn a gunicorn server in the foreground
-sudo -E -u deis ./manage.py run_gunicorn -b 0.0.0.0 -w 8 -t 600 -n deis --log-level debug # -k gevent
+sudo -E -u deis ./manage.py run_gunicorn -b 0.0.0.0 -w 8 -t 600 -n deis --log-level debug --pid=/tmp/gunicorn.pid # -k gevent

controller/templates/reload

@@ -1,14 +1,25 @@
 #!/bin/bash
 
-# write out chef configuration
-sudo mkdir -p /etc/chef
-sudo chown deis /etc/chef
-echo {{ .deis_chef_clientKey }} | base64 -d > /etc/chef/client.pem
-echo {{ .deis_chef_validationKey }} | base64 -d > /etc/chef/validation.pem
-cat > /etc/chef/client.rb <<EOF
+# write out chef configuration if necessary
+if [[ "{{ .deis_controller_cmModule }}" == "cm.chef" ]]; then
+
+	# write out chef configuration
+	sudo mkdir -p /etc/chef
+	sudo chown deis /etc/chef
+	echo "{{ .deis_chef_clientKey }}" | base64 -d > /etc/chef/client.pem
+	echo "{{ .deis_chef_validationKey }}" | base64 -d > /etc/chef/validation.pem
+	cat > /etc/chef/client.rb <<EOF
 log_level        :auto
 log_location     STDOUT
 chef_server_url  "{{ .deis_chef_url }}"
 validation_client_name "{{ .deis_chef_validationName }}"
 node_name        "{{ .deis_chef_clientName }}"
 EOF
+
+fi
+
+# gracefully reload celery and gunicorn
+test -e /tmp/celery.pid && kill -HUP `cat /tmp/celery.pid`
+test -e /tmp/gunicorn.pid && kill -HUP `cat /tmp/gunicorn.pid`
+
+exit 0