From 8a82c5f8043e632cdd4afaf3874ee969d4a1bdf8 Mon Sep 17 00:00:00 2001 From: Christian Pearce Date: Wed, 21 Dec 2016 15:47:23 -0500 Subject: [PATCH] Reverse Solaris-11 and Solaris transpose fix The commit to params to data-in-modules got the Solaris data backawards. https://github.com/puppetlabs/puppetlabs-ntp/commit/5a6bfb71fe1f4796964400f2fc264c8094786d5c --- data/Solaris-11.yaml | 11 +++++++++-- data/Solaris.yaml | 6 ++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/data/Solaris-11.yaml b/data/Solaris-11.yaml index 503160cf..979b1ce6 100644 --- a/data/Solaris-11.yaml +++ b/data/Solaris-11.yaml @@ -1,4 +1,11 @@ -ntp::package_name: [ 'SUNWntpr', 'SUNWntpu' ] +ntp::config: '/etc/inet/ntp.conf' +ntp::driftfile: '/var/ntp/ntp.drift' +ntp::keys_file: '/etc/inet/ntp.keys' +ntp::package_name: [ 'service/network/ntp' ] ntp::restrict: - - 'default nomodify notrap nopeer noquery' + - 'default kod nomodify notrap nopeer noquery' + - '-6 default kod nomodify notrap nopeer noquery' - '127.0.0.1' + - '-6 ::1' +ntp::service_name: 'network/ntp' +ntp::iburst_enable: false diff --git a/data/Solaris.yaml b/data/Solaris.yaml index 979b1ce6..2bec49f3 100644 --- a/data/Solaris.yaml +++ b/data/Solaris.yaml @@ -1,11 +1,9 @@ ntp::config: '/etc/inet/ntp.conf' ntp::driftfile: '/var/ntp/ntp.drift' ntp::keys_file: '/etc/inet/ntp.keys' -ntp::package_name: [ 'service/network/ntp' ] +ntp::package_name: [ 'SUNWntpr', 'SUNWntpu' ] ntp::restrict: - - 'default kod nomodify notrap nopeer noquery' - - '-6 default kod nomodify notrap nopeer noquery' + - 'default nomodify notrap nopeer noquery' - '127.0.0.1' - - '-6 ::1' ntp::service_name: 'network/ntp' ntp::iburst_enable: false