Index: supervisor/skel/sample.conf
--- supervisor/skel/sample.conf.orig
+++ supervisor/skel/sample.conf
@@ -20,7 +20,7 @@
 ;  is deleted, supervisorctl will be unable to connect to supervisord.
 
 [unix_http_server]
-file=/tmp/supervisor.sock   ; the path to the socket file
+file=${LOCALSTATEDIR}/run/supervisor/supervisor.sock   ; the path to the socket file
 ;chmod=0700                 ; socket file mode (default 0700)
 ;chown=nobody:nogroup       ; socket file uid:gid owner
 ;username=user              ; default is no username (open server)
@@ -42,11 +42,11 @@ file=/tmp/supervisor.sock   ; the path to the socket f
 ;password=123               ; default is no password (open server)
 
 [supervisord]
-logfile=/tmp/supervisord.log ; main log file; default $CWD/supervisord.log
+logfile=${LOCALSTATEDIR}/log/supervisord.log ; main log file; default $CWD/supervisord.log
 logfile_maxbytes=50MB        ; max main logfile bytes b4 rotation; default 50MB
 logfile_backups=10           ; # of main logfile backups; 0 means none, default 10
 loglevel=info                ; log level; default info; others: debug,warn,trace
-pidfile=/tmp/supervisord.pid ; supervisord pidfile; default supervisord.pid
+pidfile=${LOCALSTATEDIR}/run/supervisor/supervisord.pid ; supervisord pidfile; default supervisord.pid
 nodaemon=false               ; start in foreground if true; default false
 silent=false                 ; no logs to stdout if true; default false
 minfds=1024                  ; min. avail startup file descriptors; default 1024
@@ -72,7 +72,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterf
 ; or inet_http_server section.
 
 [supervisorctl]
-serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl=unix://${LOCALSTATEDIR}/run/supervisor/supervisor.sock ; use a unix:// URL  for a unix socket
 ;serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket
 ;username=chris              ; should be same as in [*_http_server] if set
 ;password=123                ; should be same as in [*_http_server] if set
@@ -91,7 +91,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// 
 ;umask=022                     ; umask for process (default None)
 ;priority=999                  ; the relative start priority (default 999)
 ;autostart=true                ; start at supervisord start (default: true)
-;startsecs=1                   ; # of secs prog must stay up to be running (def. 1)
+;startsecs=10                  ; # of secs prog must stay up to be running (def. 1)
 ;startretries=3                ; max # of serial start failures when starting (default 3)
 ;autorestart=unexpected        ; when to restart if exited after running (def: unexpected)
 ;exitcodes=0                   ; 'expected' exit codes used with autorestart (default 0)
@@ -113,7 +113,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// 
 ;stderr_capture_maxbytes=1MB   ; number of bytes in 'capturemode' (default 0)
 ;stderr_events_enabled=false   ; emit events on stderr writes (default false)
 ;stderr_syslog=false           ; send stderr to syslog with process name (default false)
-;environment=A="1",B="2"       ; process environment additions (def no adds)
+;environment=A=1,B=2           ; process environment additions (def no adds)
 ;serverurl=AUTO                ; override serverurl computation (childutils)
 
 ; The sample eventlistener section below shows all possible eventlistener
@@ -130,7 +130,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// 
 ;umask=022                     ; umask for process (default None)
 ;priority=-1                   ; the relative start priority (default -1)
 ;autostart=true                ; start at supervisord start (default: true)
-;startsecs=1                   ; # of secs prog must stay up to be running (def. 1)
+;startsecs=10                  ; # of secs prog must stay up to be running (def. 1)
 ;startretries=3                ; max # of serial start failures when starting (default 3)
 ;autorestart=unexpected        ; autorestart if exited after running (def: unexpected)
 ;exitcodes=0                   ; 'expected' exit codes used with autorestart (default 0)
@@ -150,7 +150,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// 
 ;stderr_logfile_backups=10     ; # of stderr logfile backups (0 means none, default 10)
 ;stderr_events_enabled=false   ; emit events on stderr writes (default false)
 ;stderr_syslog=false           ; send stderr to syslog with process name (default false)
-;environment=A="1",B="2"       ; process environment additions
+;environment=A=1,B=2           ; process environment additions
 ;serverurl=AUTO                ; override serverurl computation (childutils)
 
 ; The sample group section below shows all possible group values.  Create one
@@ -166,5 +166,5 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// 
 ; interpreted as relative to this file.  Included files *cannot*
 ; include files themselves.
 
-;[include]
-;files = relative/directory/*.ini
+[include]
+files = supervisord.d/*.ini
