diff options
author | Micah Anderson <micah@riseup.net> | 2012-09-25 16:27:37 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2012-09-25 16:27:37 -0400 |
commit | 16e77b3a8b257dafcf059bfcebc095178995fda5 (patch) | |
tree | 2673fa226de03b0be14ceef4df64140372643ea6 /manifests/service/ntp.pp | |
parent | ad1f714b06faf229ec1b0f310e81c425a6906581 (diff) | |
parent | eafb4c73ee82915bf83eac01bb26265c531a68e2 (diff) |
Merge branch 'merge_immerda'
Conflicts:
manifests/apache.pp
this conflict was just a indentation difference.
Diffstat (limited to 'manifests/service/ntp.pp')
-rw-r--r-- | manifests/service/ntp.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/service/ntp.pp b/manifests/service/ntp.pp index eca255a..b3cde2a 100644 --- a/manifests/service/ntp.pp +++ b/manifests/service/ntp.pp @@ -1,9 +1,9 @@ # manifests/service/ntp.pp class nagios::service::ntp { - nagios::service{ "check_ntp": - check_command => "check_ntp_time", - host_name => $fqdn, - } + nagios::service{ "check_ntp": + check_command => "check_ntp_time", + host_name => $::fqdn, + } } |