From 32308cacfb8356fa60f337a3eeb71aff5597b8ef Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 27 Dec 2016 11:43:29 -0600 Subject: PR #21 Follow-up: document new vars, fix YAML formatting. --- README.md | 18 ++++++++++++++---- defaults/main.yml | 26 ++++++++++---------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 2ff2920..d8e4bb0 100644 --- a/README.md +++ b/README.md @@ -24,14 +24,24 @@ Set the timezone for your server. Set to true to allow this role to manage the NTP configuration file (`/etc/ntp.conf`). + ntp_area: '' + +Set the [NTP Pool Area](http://support.ntp.org/bin/view/Servers/NTPPoolServers) to use. Defaults to none, which uses the worldwide pool. + ntp_servers: - - 0.pool.ntp.org iburst - - 1.pool.ntp.org iburst - - 2.pool.ntp.org iburst - - 3.pool.ntp.org iburst + - "0{{ ntp_area }}.pool.ntp.org iburst" + - "1{{ ntp_area }}.pool.ntp.org iburst" + - "2{{ ntp_area }}.pool.ntp.org iburst" + - "3{{ ntp_area }}.pool.ntp.org iburst" Specify the NTP servers you'd like to use. Only takes effect if you allow this role to manage NTP's configuration, by setting `ntp_manage_config` to `true`. + ntp_restrict: + - "127.0.0.1" + - "::1" + +Restrict NTP access to these hosts; loopback only, by default. + ## Dependencies None. diff --git a/defaults/main.yml b/defaults/main.yml index 8d4c702..5d18cd7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,22 +3,16 @@ ntp_enabled: true ntp_timezone: Etc/UTC ntp_manage_config: false -### choose ntp server area ### -# http://support.ntp.org/bin/view/Servers/NTPPoolServers -### -# Leave empty for Worldwide Area -# Worldwide: '' -# Asia: '.asia' -# Europe: '.europe' -# North America: '.north-america' -# Oceania: '.oceania' -# South America: '.south-america' + +# NTP server area configuration (leave empty for 'Worldwide'). +# See: http://support.ntp.org/bin/view/Servers/NTPPoolServers ntp_area: '' ntp_servers: - - 0{{ ntp_area }}.pool.ntp.org iburst - - 1{{ ntp_area }}.pool.ntp.org iburst - - 2{{ ntp_area }}.pool.ntp.org iburst - - 3{{ ntp_area }}.pool.ntp.org iburst + - "0{{ ntp_area }}.pool.ntp.org iburst" + - "1{{ ntp_area }}.pool.ntp.org iburst" + - "2{{ ntp_area }}.pool.ntp.org iburst" + - "3{{ ntp_area }}.pool.ntp.org iburst" + ntp_restrict: - - 127.0.0.1 - - ::1 + - "127.0.0.1" + - "::1" -- cgit v1.2.1