apache-frontend: Put graceful, reload and prepare in etc/run in order to avoid bang

software/apache-frontend/instance.cfg

@@ -44,6 +44,7 @@ backup = $${:srv}/backup
 log = $${:var}/log
 run = $${:var}/run
 service = $${:etc}/service
+etc-run = $${:etc}/run
 promise = $${:etc}/promise
 
 logrotate-backup = $${:backup}/logrotate
@@ -390,7 +391,7 @@ create = true
 
 [squid-cache]
 recipe = slapos.cookbook:squid
-prepare-path = $${directory:service}/squid-prepare
+prepare-path = $${directory:etc-run}/squid-prepare
 wrapper-path = $${directory:service}/squid
 binary-path = ${squid:location}/sbin/squid
 conf-path = $${directory:etc}/squid.cfg
@@ -407,17 +408,17 @@ pid-filename-path = $${directory:run}/squid.pid
 [squid-reload]
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/killpidfromfile $${squid-cache:pid-filename-path} SIGHUP
-wrapper-path = $${directory:service}/squid-reload
+wrapper-path = $${directory:etc-run}/squid-reload
 
 [frontend-apache-graceful]
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/killpidfromfile $${apache-configuration:pid-file} SIGUSR1
-wrapper-path = $${directory:service}/frontend-apache-graceful
+wrapper-path = $${directory:etc-run}/frontend-apache-graceful
 
 [cached-apache-graceful]
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/killpidfromfile $${apache-configuration:cache-pid-file} SIGUSR1
-wrapper-path = $${directory:service}/cached-apache-graceful
+wrapper-path = $${directory:etc-run}/cached-apache-graceful
 
 [promise-apache-frontend-v4-https]
 recipe = slapos.cookbook:check_port_listening