Move to our standard idiom of per-host files. You wouldn't think ntp

would be difficult ....
Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/ntp/files/client.conf b/modules/ntp/files/client.conf
deleted file mode 100644 (file)
index 729f2c8..0000000
--- a/modules/ntp/files/client.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-driftfile /var/lib/ntp/ntp.drift
-statsdir /var/log/ntpstats/
-
-statistics loopstats peerstats clockstats
-filegen loopstats file loopstats type day enable
-filegen peerstats file peerstats type day enable
-filegen clockstats file clockstats type day enable
-server geo1.debian.org iburst dynamic
-server geo2.debian.org iburst dynamic
-server geo3.debian.org iburst dynamic
-
-restrict -4 default kod notrap nomodify nopeer noquery
-restrict -6 default kod notrap nomodify nopeer noquery
-
-restrict 127.0.0.1
-restrict ::1

diff --git a/modules/ntp/files/common/client.conf b/modules/ntp/files/common/client.conf
new file mode 100644 (file)
index 0000000..729f2c8
--- /dev/null
+++ b/modules/ntp/files/common/client.conf
@@ -0,0 +1,21 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+driftfile /var/lib/ntp/ntp.drift
+statsdir /var/log/ntpstats/
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+server geo1.debian.org iburst dynamic
+server geo2.debian.org iburst dynamic
+server geo3.debian.org iburst dynamic
+
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+restrict 127.0.0.1
+restrict ::1

diff --git a/modules/ntp/files/common/server.conf b/modules/ntp/files/common/server.conf
new file mode 100644 (file)
index 0000000..6511b02
--- /dev/null
+++ b/modules/ntp/files/common/server.conf
@@ -0,0 +1,22 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+driftfile /var/lib/ntp/ntp.drift
+statsdir /var/log/ntpstats/
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+server 0.debian.pool.ntp.org iburst dynamic
+server 1.debian.pool.ntp.org iburst dynamic
+server 2.debian.pool.ntp.org iburst dynamic
+server 3.debian.pool.ntp.org iburst dynamic
+
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+restrict 127.0.0.1
+restrict ::1

diff --git a/modules/ntp/files/per-host/ancina.debian.org/client.conf b/modules/ntp/files/per-host/ancina.debian.org/client.conf
new file mode 100644 (file)
index 0000000..486e087
--- /dev/null
+++ b/modules/ntp/files/per-host/ancina.debian.org/client.conf
@@ -0,0 +1,19 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+driftfile /var/lib/ntp/ntp.drift
+statsdir /var/log/ntpstats/
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+server ntp.ugent.be iburst dynamic
+
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+restrict 127.0.0.1
+restrict ::1

diff --git a/modules/ntp/files/server.conf b/modules/ntp/files/server.conf
deleted file mode 100644 (file)
index 6511b02..0000000
--- a/modules/ntp/files/server.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-driftfile /var/lib/ntp/ntp.drift
-statsdir /var/log/ntpstats/
-
-statistics loopstats peerstats clockstats
-filegen loopstats file loopstats type day enable
-filegen peerstats file peerstats type day enable
-filegen clockstats file clockstats type day enable
-server 0.debian.pool.ntp.org iburst dynamic
-server 1.debian.pool.ntp.org iburst dynamic
-server 2.debian.pool.ntp.org iburst dynamic
-server 3.debian.pool.ntp.org iburst dynamic
-
-restrict -4 default kod notrap nomodify nopeer noquery
-restrict -6 default kod notrap nomodify nopeer noquery
-
-restrict 127.0.0.1
-restrict ::1

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index c30316c..0882e49 100644 (file)
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -3,7 +3,8 @@ class ntp::client inherits ntp {
                owner   => root,
                group   => root,
                mode    => 444,
-               source  => [ "puppet:///ntp/client.conf" ],
+               source  => [ "puppet:///ntp/per-host/$fqdn/client.conf",
+                            "puppet:///ntp/common/client.conf" ],
                notify  => Exec["ntp restart"],
                require => Package["ntp"]
                ;

diff --git a/modules/ntp/manifests/server.pp b/modules/ntp/manifests/server.pp
index ded54e7..ab250f6 100644 (file)
--- a/modules/ntp/manifests/server.pp
+++ b/modules/ntp/manifests/server.pp
@@ -3,7 +3,8 @@ class ntp::server inherits ntp {
                owner   => root,
                group   => root,
                mode    => 444,
-               source  => [ "puppet:///ntp/server.conf" ],
+               source  => [ "puppet:///ntp/per-host/$fqdn/server.conf",
+                            "puppet:///ntp/common/server.conf" ],
                notify  => Exec["ntp restart"],
                require => Package["ntp"]
                ;