Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Import ntp version 1.1.8

  • Loading branch information...
commit 53d27ad3b508a422515c579aa783c5d3b9bd5e28 1 parent 43eb778
@akiernan authored
View
26 cookbooks/ntp/CHANGELOG.md
@@ -0,0 +1,26 @@
+## v1.1.8:
+
+* [COOK-1158] - RHEL family >= 6 has ntpdate package
+
+## v1.1.6:
+
+* Related to changes in COOK-1124, fix group for freebsd and else
+
+## v1.1.4:
+
+* [COOK-1124] - parameterised driftfile and statsdir to be
+ configurable by platform
+
+## v1.1.2:
+
+* [COOK-952] - freebsd support
+* [COOK-949] - check for any virtual system not just vmware
+
+## v1.1.0:
+
+* Fixes COOK-376 (use LAN peers, iburst option, LAN restriction attribute)
+
+## v1.0.1:
+
+* Support scientific linux
+* Use service name attribute in resource (fixes EL derivatives)
View
29 cookbooks/ntp/CONTRIBUTING
@@ -0,0 +1,29 @@
+If you would like to contribute, please open a ticket in JIRA:
+
+* http://tickets.opscode.com
+
+Create the ticket in the COOK project and use the cookbook name as the
+component.
+
+For all code contributions, we ask that contributors sign a
+contributor license agreement (CLA). Instructions may be found here:
+
+* http://wiki.opscode.com/display/chef/How+to+Contribute
+
+When contributing changes to individual cookbooks, please do not
+modify the version number in the metadata.rb. Also please do not
+update the CHANGELOG.md for a new version. Not all changes to a
+cookbook may be merged and released in the same versions. Opscode will
+handle the version updates during the release process. You are welcome
+to correct typos or otherwise make updates to documentation in the
+README.
+
+If a contribution adds new platforms or platform versions, indicate
+such in the body of the commit message(s), and update the relevant
+COOK ticket. When writing commit messages, it is helpful for others if
+you indicate the COOK ticket. For example:
+
+ git commit -m '[COOK-1041] Updated pool resource to correctly delete.'
+
+In the ticket itself, it is also helpful if you include log output of
+a successful Chef run, but this is not absolutely required.
View
201 cookbooks/ntp/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
View
39 cookbooks/ntp/README.md
@@ -6,7 +6,7 @@ Installs and configures ntp, optionally set up a local NTP server.
Requirements
============
-Should work on any Red Hat-family or Debian-family Linux distribution.
+Should work on any Red Hat-family or Debian-family Linux distribution or on FreeBSD.
Attributes
==========
@@ -33,12 +33,21 @@ Attributes
- Array, should be a list of restrict lines to restrict access to NTP
clients on your LAN.
-USAGE
+* ntp[:driftfile]
+
+ - String, the path to the frequency file.
+
+* ntp[:statsdir]
+
+ - String, the directory path for files created by the statistics facility.
+
+Usage
=====
Set up the ntp attributes in a role. For example in a base.rb role applied to all nodes:
name "base"
+ description "Role applied to all systems"
default_attributes(
"ntp" => {
"servers" => ["time0.int.example.org", "time1.int.example.org"]
@@ -47,36 +56,20 @@ Set up the ntp attributes in a role. For example in a base.rb role applied to al
Then in an ntpserver.rb role that is applied to NTP servers (e.g., time.int.example.org):
- name "base"
+ name "ntp_server"
+ description "Role applied to the system that should be an NTP server."
default_attributes(
"ntp" => {
"is_server" => "true",
- "servers" => ["0.pool.ntp.org", "1.pool.ntp.org"]
- "peers" => ["time0.int.example.org", "time1.int.example.org"]
+ "servers" => ["0.pool.ntp.org", "1.pool.ntp.org"],
+ "peers" => ["time0.int.example.org", "time1.int.example.org"],
"restrictions" => ["10.0.0.0 mask 255.0.0.0 nomodify notrap"]
}
)
The timeX.int.example.org used in these roles should be the names or IP addresses of internal NTP servers.
-Changes
-=======
-
-## v1.1.2:
-
-* [COOK-952] - freebsd support
-* [COOK-949] - check for any virtual system not just vmware
-
-## v1.1.0:
-
-* Fixes COOK-376 (use LAN peers, iburst option, LAN restriction attribute)
-
-## v1.0.1:
-
-* Support scientific linux
-* Use service name attribute in resource (fixes EL derivatives)
-
-LICENSE AND AUTHOR
+License and Author
==================
Author:: Joshua Timberman (<joshua@opscode.com>)
View
34 cookbooks/ntp/attributes/default.rb
@@ -1,4 +1,32 @@
-case platform
+#
+# Cookbook Name:: ntp
+# Attributes:: default
+#
+# Author:: Joshua Timberman (<joshua@opscode.com>)
+#
+# Copyright 2009-2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# default attributes for all platforms
+default[:ntp][:is_server] = false
+default[:ntp][:servers] = ["0.pool.ntp.org", "1.pool.ntp.org"]
+default[:ntp][:driftfile] = "/var/lib/ntp/ntp.drift"
+default[:ntp][:statsdir] = "/var/log/ntpstats/"
+
+# overrides on a platform-by-platform basis
+case platform
when "ubuntu","debian"
default[:ntp][:service] = "ntp"
default[:ntp][:root_group] = "root"
@@ -8,12 +36,12 @@
when "freebsd"
default[:ntp][:service] = "ntpd"
default[:ntp][:root_group] = "wheel"
+ default[:ntp][:driftfile] = "/var/db/ntpd.drift"
+ default[:ntp][:statsdir] = "/var/db/ntpstats/"
else
default[:ntp][:service] = "ntpd"
default[:ntp][:root_group] = "root"
end
-default[:ntp][:is_server] = false
-default[:ntp][:servers] = ["0.pool.ntp.org", "1.pool.ntp.org", "2.pool.ntp.org", "3.pool.ntp.org"]
default[:ntp][:peers] = []
default[:ntp][:restrictions] = []
View
35 cookbooks/ntp/metadata.json
@@ -1,7 +1,7 @@
{
"name": "ntp",
"description": "Installs and configures ntp as a client or server",
- "long_description": "Description\n===========\n\nInstalls and configures ntp, optionally set up a local NTP server.\n\nRequirements\n============\n\nShould work on any Red Hat-family or Debian-family Linux distribution.\n\nAttributes\n==========\n\n* ntp[:is_server]\n\n - Boolean, should be true or false, defaults to false\n\n* ntp[:servers] (applies to NTP Servers and Clients)\n\n - Array, should be a list of upstream NTP public servers. The NTP protocol\n works best with at least 3 servers. The NTPD maximum is 7 upstream\n servers, any more than that and some of them will be ignored by the daemon.\n\n* ntp[:peers] (applies to NTP Servers ONLY)\n\n - Array, should be a list of local NTP private servers. Configuring peer\n servers on your LAN will reduce traffic to upstream time sources, and\n provide higher availability of NTP on your LAN. Again the maximum is 7\n peers\n\n* ntp[:restrictions] (applies to NTP Servers only)\n\n - Array, should be a list of restrict lines to restrict access to NTP\n clients on your LAN.\n\nUSAGE\n=====\n\nSet up the ntp attributes in a role. For example in a base.rb role applied to all nodes:\n\n name \"base\"\n default_attributes(\n \"ntp\" => {\n \"servers\" => [\"time0.int.example.org\", \"time1.int.example.org\"]\n }\n )\n\nThen in an ntpserver.rb role that is applied to NTP servers (e.g., time.int.example.org):\n\n name \"base\"\n default_attributes(\n \"ntp\" => {\n \"is_server\" => \"true\",\n \"servers\" => [\"0.pool.ntp.org\", \"1.pool.ntp.org\"]\n \"peers\" => [\"time0.int.example.org\", \"time1.int.example.org\"]\n \"restrictions\" => [\"10.0.0.0 mask 255.0.0.0 nomodify notrap\"]\n }\n )\n\nThe timeX.int.example.org used in these roles should be the names or IP addresses of internal NTP servers.\n\nChanges\n=======\n\n## v1.1.2:\n\n* [COOK-952] - freebsd support\n* [COOK-949] - check for any virtual system not just vmware\n\n## v1.1.0:\n\n* Fixes COOK-376 (use LAN peers, iburst option, LAN restriction attribute)\n\n## v1.0.1:\n\n* Support scientific linux\n* Use service name attribute in resource (fixes EL derivatives)\n\nLICENSE AND AUTHOR\n==================\n\nAuthor:: Joshua Timberman (<joshua@opscode.com>)\n\nCopyright 2009-2011, Opscode, Inc.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
+ "long_description": "Description\n===========\n\nInstalls and configures ntp, optionally set up a local NTP server.\n\nRequirements\n============\n\nShould work on any Red Hat-family or Debian-family Linux distribution or on FreeBSD.\n\nAttributes\n==========\n\n* ntp[:is_server]\n\n - Boolean, should be true or false, defaults to false\n\n* ntp[:servers] (applies to NTP Servers and Clients)\n\n - Array, should be a list of upstream NTP public servers. The NTP protocol\n works best with at least 3 servers. The NTPD maximum is 7 upstream\n servers, any more than that and some of them will be ignored by the daemon.\n\n* ntp[:peers] (applies to NTP Servers ONLY)\n\n - Array, should be a list of local NTP private servers. Configuring peer\n servers on your LAN will reduce traffic to upstream time sources, and\n provide higher availability of NTP on your LAN. Again the maximum is 7\n peers\n\n* ntp[:restrictions] (applies to NTP Servers only)\n\n - Array, should be a list of restrict lines to restrict access to NTP\n clients on your LAN.\n\n* ntp[:driftfile]\n\n - String, the path to the frequency file.\n\n* ntp[:statsdir]\n\n - String, the directory path for files created by the statistics facility.\n\nUsage\n=====\n\nSet up the ntp attributes in a role. For example in a base.rb role applied to all nodes:\n\n name \"base\"\n description \"Role applied to all systems\"\n default_attributes(\n \"ntp\" => {\n \"servers\" => [\"time0.int.example.org\", \"time1.int.example.org\"]\n }\n )\n\nThen in an ntpserver.rb role that is applied to NTP servers (e.g., time.int.example.org):\n\n name \"ntp_server\"\n description \"Role applied to the system that should be an NTP server.\"\n default_attributes(\n \"ntp\" => {\n \"is_server\" => \"true\",\n \"servers\" => [\"0.pool.ntp.org\", \"1.pool.ntp.org\"],\n \"peers\" => [\"time0.int.example.org\", \"time1.int.example.org\"],\n \"restrictions\" => [\"10.0.0.0 mask 255.0.0.0 nomodify notrap\"]\n }\n )\n\nThe timeX.int.example.org used in these roles should be the names or IP addresses of internal NTP servers.\n\nLicense and Author\n==================\n\nAuthor:: Joshua Timberman (<joshua@opscode.com>)\n\nCopyright 2009-2011, Opscode, Inc.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
"maintainer": "Opscode, Inc.",
"maintainer_email": "cookbooks@opscode.com",
"license": "Apache 2.0",
@@ -11,7 +11,8 @@
"redhat": ">= 0.0.0",
"centos": ">= 0.0.0",
"fedora": ">= 0.0.0",
- "scientific": ">= 0.0.0"
+ "scientific": ">= 0.0.0",
+ "freebsd": ">= 0.0.0"
},
"dependencies": {
},
@@ -117,6 +118,34 @@
"recipes": [
]
+ },
+ "ntp/driftfile": {
+ "display_name": "NTP Driftfile",
+ "description": "Location of the NTP driftfile",
+ "default": "/var/lib/ntp/ntp.drift",
+ "choice": [
+
+ ],
+ "calculated": false,
+ "type": "string",
+ "required": "optional",
+ "recipes": [
+
+ ]
+ },
+ "ntp/statsdir": {
+ "display_name": "NTP Statsdir",
+ "description": "Location of the NTP statsdir",
+ "default": "/var/log/ntpstats/",
+ "choice": [
+
+ ],
+ "calculated": false,
+ "type": "string",
+ "required": "optional",
+ "recipes": [
+
+ ]
}
},
"groupings": {
@@ -124,5 +153,5 @@
"recipes": {
"ntp": "Installs and configures ntp either as a server or client"
},
- "version": "1.1.2"
+ "version": "1.1.8"
}
View
14 cookbooks/ntp/metadata.rb
@@ -3,11 +3,11 @@
license "Apache 2.0"
description "Installs and configures ntp as a client or server"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.1.2"
+version "1.1.8"
recipe "ntp", "Installs and configures ntp either as a server or client"
-%w{ ubuntu debian redhat centos fedora scientific }.each do |os|
+%w{ ubuntu debian redhat centos fedora scientific freebsd }.each do |os|
supports os
end
@@ -43,3 +43,13 @@
:description => "Array of restriction lines to apply to NTP servers",
:type => "array",
:default => []
+
+attribute "ntp/driftfile",
+ :display_name => "NTP Driftfile",
+ :description => "Location of the NTP driftfile",
+ :default => "/var/lib/ntp/ntp.drift"
+
+attribute "ntp/statsdir",
+ :display_name => "NTP Statsdir",
+ :description => "Location of the NTP statsdir",
+ :default => "/var/log/ntpstats/"
View
49 cookbooks/ntp/recipes/default.rb
@@ -17,42 +17,51 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-case node[:platform]
+root_group = node['ntp']['root_group']
+
+case node[:platform]
when "ubuntu","debian"
package "ntpdate" do
action :install
end
-end
-
-unless platform?("freebsd")
package "ntp" do
action :install
end
+when "redhat","centos","fedora","scientific"
+ package "ntp" do
+ action :install
+ end
+ package "ntpdate" do
+ action :install
+ end unless node[:platform_version].to_i < 6
+end
+case node[:platform]
+when "freebsd"
+ directory node[:ntp][:statsdir] do
+ owner "root"
+ group root_group
+ mode "0755"
+ end
+when "redhat","centos","fedora","scientific"
# ntpstats dir doesn't exist on RHEL/CentOS
- # It'd be better to not make assumptions about the target platform
- %w{ /var/lib/ntp /var/log/ntpstats }.each do |ntpdir|
- directory ntpdir do
- owner "ntp"
- group "ntp"
- mode 0755
- end
+else
+ directory node[:ntp][:statsdir] do
+ owner "ntp"
+ group "ntp"
+ mode "0755"
end
end
service node[:ntp][:service] do
- action :start
+ supports :status => true, :restart => true
+ action [ :enable, :start ]
end
template "/etc/ntp.conf" do
source "ntp.conf.erb"
owner "root"
- group node[:ntp][:root_group]
- mode 0644
- notifies :restart, "service[ntp]"
-end
-
-service "ntp" do
- service_name node[:ntp][:service]
- action [:enable, :start]
+ group root_group
+ mode "0644"
+ notifies :restart, resources(:service => node[:ntp][:service])
end
View
6 cookbooks/ntp/templates/default/ntp.conf.erb
@@ -4,8 +4,8 @@
<% if node[:virtualization][:role] == "guest" -%>
tinker panic 0
<% end -%>
-driftfile /var/lib/ntp/ntp.drift
-statsdir /var/log/ntpstats/
+driftfile <%= node[:ntp][:driftfile] %>
+statsdir <%= node[:ntp][:statsdir] %>
statistics loopstats peerstats clockstats
filegen loopstats file loopstats type day enable
@@ -41,7 +41,7 @@ restrict <%= restriction %>
<% end -%>
<% end -%>
-<%# It is best practice to use an high stratum undisciplined clock, if you have a real CMOS clock -%>
+<%# It is best practice to use a high stratum undisciplined clock, if you have a real CMOS clock -%>
<%# Except cases where you have a low stratum server, or a virtualized system without a real CMOS clock -%>
<% if ! node[:ntp][:is_server] and node[:virtualization][:role] != "guest" -%>
server 127.127.1.0 # local clock
Please sign in to comment.
Something went wrong with that request. Please try again.