Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(MODULES-10413) Allow custom ntp user and daemon options #551

Merged
merged 2 commits into from
Jan 13, 2020

Conversation

david22swan
Copy link
Member

Rebase of #489

@david22swan david22swan requested a review from a team as a code owner January 8, 2020 16:39
@david22swan david22swan force-pushed the devel-user branch 4 times, most recently from 1cf1749 to 8d48a10 Compare January 10, 2020 12:50
@david22swan david22swan changed the title (WIP) Allow custom ntp user and daemon options (MODULES-10413) Allow custom ntp user and daemon options Jan 10, 2020
match => '^OPTIONS\=',
}
}
# if $ntp::user {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@david22swan should we keep the commented block or remove them

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed :)

REFERENCE.md Outdated
Data type: `Optional[String]`

Specifies any arguments to pass to ntp daemon. Default value: '-g'.
Example value: '-g -i /var/lib/ntp' to enaible jaildir options.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small type 'enable'

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed :)

REFERENCE.md Outdated

Specifies user to run ntpd daemon. Default value: ntp.
Usually set by default on Centos7 (/etc/systemd/system/multi-user.target.wants/ntpd.service) and ubuntu 18.04 (/usr/lib/ntp/ntp-systemd-wrapper)
This is currently restricted to Redhat based systems of version 7 and aboce and Ubuntu 18.04.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small type 'above'

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed :)

@@ -28,6 +28,11 @@
# Specifies an absolute or relative file path to an ERB template for the config file.
# Example value: 'ntp/ntp.conf.erb'. A validation error is thrown if both this **and** the `config_epp` parameter are specified.
#
# @param daemon_extra_opts
# Specifies any arguments to pass to ntp daemon. Default value: '-g'.
# Example value: '-g -i /var/lib/ntp' to enaible jaildir options.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small typo 'enable'

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed :)

# @param user
# Specifies user to run ntpd daemon. Default value: ntp.
# Usually set by default on Centos7 (/etc/systemd/system/multi-user.target.wants/ntpd.service) and ubuntu 18.04 (/usr/lib/ntp/ntp-systemd-wrapper)
# This is currently restricted to Redhat based systems of version 7 and aboce and Ubuntu 18.04.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small typo 'above'

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed :)

@david22swan
Copy link
Member Author

Screen Shot 2020-01-10 at 5 25 06 PM

@sheenaajay sheenaajay merged commit 70b3cf7 into puppetlabs:master Jan 13, 2020
@david22swan david22swan deleted the devel-user branch April 25, 2022 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants