update systemd params and unit file to match trunk

redhat/varnish.params

@@ -20,13 +20,6 @@ VARNISH_ADMIN_LISTEN_PORT=6082
 # Shared secret file for admin interface
 VARNISH_SECRET_FILE=/etc/varnish/secret   
 
-# The minimum and maximum number of worker threads to start
-VARNISH_MIN_THREADS=1                     
-VARNISH_MAX_THREADS=1000                  
-
-# Idle timeout for worker threads
-VARNISH_THREAD_TIMEOUT=120                
-
 # Backend storage specification, see Storage Types in the varnishd(5)
 # man page for details.
 VARNISH_STORAGE="file,/var/lib/varnish/varnish_storage.bin,1G"
@@ -38,3 +31,5 @@ VARNISH_TTL=120
 VARNISH_USER=varnish                      
 VARNISH_GROUP=varnish                     
 
+# Other options, see the man page varnishd(1)
+#DAEMON_OPTS="-p thread_pool_min=5 -p thread_pool_max=500 -p thread_pool_timeout=300"

redhat/varnish.service

@@ -33,7 +33,6 @@ ExecStart=/usr/sbin/varnishd \
 	-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
 	-T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
 	-t $VARNISH_TTL \
-	-w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} \
 	-u $VARNISH_USER \
 	-g $VARNISH_GROUP \
 	-S $VARNISH_SECRET_FILE \