Merge pull request #7 from noelmcloughlin/tidyup_pillar_example

Simplify pillar.example

README.rst

@@ -17,7 +17,7 @@ Installs the chrony package.
 
 ``chrony.config``
 -----------------
-This state manages the file ``chrony.conf`` under ``/etc`` (template found in "chrony/files"). The configuration is populated by values in "chrony/map.jinja", which are based on the package's default values (for RedHat, Debian and Arch family distributions), and are overridden by values of the same name in pillar.
+This state manages the file ``chrony.conf`` under ``/etc`` (template found in "chrony/files"). The configuration is populated by values in "chrony/map.jinja" based on the package's default values (and RedHat, Debian, Suse and Arch family distribution specific values), which can then be overridden by values of the same name in pillar.
 
 ``chrony.removed``
 -----------------

pillar.example

@@ -1,28 +1,10 @@
 chrony:
-  config:
-    package: chrony
-    service: chronyd
-    config: /etc/chrony.conf
-    config_src: salt://chrony/files/chrony_config
-    ntpservers:  [
-                 "0.us.pool.ntp.org",
-                 "1.us.pool.ntp.org",
-                 "2.us.pool.ntp.org",
-                 "3.us.pool.ntp.org"
-                 ]
-    options: iburst
-    logdir: /var/log/chrony
-    keyfile: /etc/chrony.keys
-    driftfile: /var/lib/chrony/drift,
-    otherparams: [
-                 "rtcsync",
-                 "makestep 10 3",
-                 "stratumweight 0",
-                 "bindcmdaddress 127.0.0.1",
-                 "bindcmdaddress ::1",
-                 "commandkey 1",
-                 "generatecommandkey",
-                 "noclientlog",
-                 "logchange 0.5",
-                  ]
-
+  ntpservers:
+    - 'ntp0.nl.net'
+    - 'ntp1.nl.net'
+    - 'ntp2.nl.net'
+    - 'ntp.xs4all.nl'
+    - '0.nl.pool.ntp.org'
+    - '1.nl.pool.ntp.org'
+    - '2.nl.pool.ntp.org'
+    - '3.nl.pool.ntp.org'