Set pid and socket directories based on OS

Author: kimor79

manifests/params.pp

@@ -22,11 +22,15 @@
     case $::osfamily {
         redhat: {
             $app_directory = '/etc/uwsgi.d'
+            $pidfile       = '/var/run/uwsgi/uwsgi.pid'
             $python_dev    = 'python-devel'
+            $socket        = '/var/run/uwsgi/uwsgi.socket'
         }
         default: {
             $app_directory = '/etc/uwsgi/apps-enabled'
+            $pidfile       = '/run/uwsgi/uwsgi.pid'
             $python_dev    = 'python-dev'
+            $socket        = '/run/uwsgi/uwsgi.socket'
         }
     }
 }

templates/uwsgi.ini.erb

@@ -4,8 +4,8 @@
 # uWSGI main process configuration
 #
 [uwsgi]
-socket = /run/uwsgi/uwsgi.socket
-pidfile = /run/uwsgi/uwsgi.pid
+socket = <%= @socket %>
+pidfile = <%= @pidfile %>
 emperor = <%= @app_directory %>
 emperor-tyrant = true
 master = true

templates/uwsgi_service-redhat.erb

@@ -19,9 +19,24 @@
 . /etc/rc.d/init.d/functions
 
 OPTIONS="--daemonize --die-on-term --ini <%= @config_file %>"
+UWSGIPID="<%= @pidfile %>"
+UWSGISOCKET="<%= @socket %>"
+
+UWSGIPIDDIR="${UWSGIPID%/*}"
+UWSGISOCKETDIR="${UWSGISOCKET%/*}"
 
 [ -f /etc/sysconfig/uwsgi ] && . /etc/sysconfig/uwsgi
 
+if [ ! -d "${UWSGIPIDDIR}" ]; then
+	mkdir -p "${UWSGIPIDDIR}"
+	[ -n "${RUNAS}" ] && chown "${RUNAS}:" "${UWSGIPIDDIR}"
+fi
+
+if [ ! -d "${UWSGISOCKETDIR}" ]; then
+	mkdir -p "${UWSGISOCKETDIR}"
+	[ -n "${RUNAS}" ] && chown "${RUNAS}:" "${UWSGISOCKETDIR}"
+fi
+
 RETVAL=0
 prog=uwsgi
 lockfile=/var/lock/subsys/$prog