summaryrefslogtreecommitdiff
path: root/manifests/config.pp
diff options
context:
space:
mode:
authorAshley Penney <ashley.penney@puppetlabs.com>2013-07-31 10:48:09 -0700
committerAshley Penney <ashley.penney@puppetlabs.com>2013-07-31 10:48:09 -0700
commite3feec2486002038b7d960e78a68cab747f2e731 (patch)
tree087fd6eedad720c6b762da3a28c65ae6a9ee398b /manifests/config.pp
parentc5408ae4b17bc3b395b13d10c9473e15661d2d38 (diff)
parentef93b7e5db9d495b9437dfb7ba9d9bbfd966949e (diff)
Merge pull request #80 from apenney/single_template
Merge all the templates together, add a few new features to help with the merge.
Diffstat (limited to 'manifests/config.pp')
-rw-r--r--manifests/config.pp33
1 files changed, 26 insertions, 7 deletions
diff --git a/manifests/config.pp b/manifests/config.pp
index 0a4a710..c8a5625 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,10 +1,29 @@
-class ntp::config (
- $config = $ntp::config,
- $config_template = $ntp::config_template,
- $panic = $ntp::panic,
- $restrict = $ntp::restrict,
- $servers = $ntp::servers,
-) inherits ntp {
+#
+class ntp::config {
+
+ $config = $ntp::config
+ $config_template = $ntp::config_template
+ $driftfile = $ntp::driftfile
+ $keys_enable = $ntp::keys_enable
+ $keys_file = $ntp::keys_file
+ $keys_controlkey = $ntp::keys_controlkey
+ $keys_requestkey = $ntp::keys_requestkey
+ $keys_trusted = $ntp::keys_trusted
+ $panic = $ntp::panic
+ $preferred_servers = $ntp::preferred_servers
+ $restrict = $ntp::restrict
+ $servers = $ntp::servers
+
+ if $keys_enable {
+ $directory = dirname($keys_file)
+ file { $directory:
+ ensure => directory,
+ owner => 0,
+ group => 0,
+ mode => '0755',
+ recurse => true,
+ }
+ }
file { $config:
ensure => file,