From: Grant Slater <git@firefishy.com>
Date: Sun, 31 Jan 2016 20:26:44 +0000 (+0000)
Subject: Imagery - make mapserv upstart restart safe
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/4937cb3f874eb62ce184db287d45d26a2311ccff?hp=072e28ef2f6608113b47e49e010ad5a6b668e46b

Imagery - make mapserv upstart restart safe
---

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index 7c3d186aa..99a8c1700 100644
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -40,13 +40,6 @@ package "imagemagick"
 package "xz-utils"
 package "unzip"
 
-# Create Directory for mapserver-fastcgi imagery sockets
-directory "/var/run/mapserver-fastcgi" do
-  owner "imagery"
-  group "imagery"
-  mode 0755
-end
-
 directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"
diff --git a/cookbooks/imagery/templates/default/mapserv_fcgi.conf.erb b/cookbooks/imagery/templates/default/mapserv_fcgi.conf.erb
index 9f6e25093..4e71350fb 100644
--- a/cookbooks/imagery/templates/default/mapserv_fcgi.conf.erb
+++ b/cookbooks/imagery/templates/default/mapserv_fcgi.conf.erb
@@ -9,9 +9,6 @@ stop on runlevel [!2345]
 
 respawn
 
-setuid imagery
-setgid imagery
-
 limit nofile 16384 16384
 
 # https://trac.osgeo.org/mapserver/wiki/EnvironmentVariables
@@ -20,9 +17,16 @@ env MS_MAP_PATTERN="^/srv/imagery/mapserver/"
 env MS_ERRORFILE="/tmp/mapserver-layer-<%= @name %>.log"
 env MS_DEBUGLEVEL="5"
 
+pre-start script
+    mkdir -p -m 0775 /var/run/mapserver-fastcgi
+    chown imagery:imagery /var/run/mapserver-fastcgi
+end script
+
 script
     exec /usr/bin/spawn-fcgi \
         -n \
+        -u imagery \
+        -g imagery \
         -s /var/run/mapserver-fastcgi/layer-<%= @name %>.socket \
         -M 0666 \
         -f /usr/lib/cgi-bin/mapserv