Merge pull request #16 from dseira/master

Fixed CentOS 6/7 different config files (init, systemd) in map.jinja

README.md

@@ -132,14 +132,13 @@ varnish:
       DAEMON_OPTS: "-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} -f ${VARNISH_VCL_CONF} -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} -p thread_pool_min=${VARNISH_MIN_THREADS} -p thread_pool_max=${VARNISH_MAX_THREADS} -S ${VARNISH_SECRET_FILE} -s ${VARNISH_STORAGE}"
 ```
 
-* In CentOS 6, it must be explicitely defined the `install_from_repo` option because in the CentOS 6 repos it is the 2 version. It must be also explicitely defined the config file in the lookup section because in the [map.jinja](varnish/ng/map.jinja) it is defined the configfile for the CentOS 7 (varnish.params):
+* In CentOS 6, it must be explicitely defined the `install_from_repo` option because in the CentOS 6 repos it is the 2 version:
 
 ```yaml
 varnish:
   ng:
     lookup:
       repo: 'varnish41'
-      config: /etc/sysconfig/varnish
     install_from_repo: True
 ```
 

varnish/ng/map.jinja

@@ -13,7 +13,10 @@
         'pkg': 'varnish',
         'service': 'varnish',
         'varnishncsa_service': 'varnishncsa',
-        'config': '/etc/varnish/varnish.params',
+        'config': salt['grains.filter_by']({
+            '6': '/etc/sysconfig/varnish',
+            '7': '/etc/varnish/varnish.params',
+        }, grain='osmajorrelease'),
         'repo': 'varnish40',
     },
     'Suse': {