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

Use a space-separated in timesyncd.conf #50

Merged
merged 2 commits into from Nov 23, 2017

Conversation

hfm
Copy link
Contributor

@hfm hfm commented Nov 22, 2017

According to timesyncd.conf(5) in man, NTP and FallbackNTP need a space-separated list: https://www.freedesktop.org/software/systemd/man/timesyncd.conf.html

According to timesyncd.conf(5) in man, NTP and FallbackNTP need a space-separated list: https://www.freedesktop.org/software/systemd/man/timesyncd.conf.html
README.md Outdated
$ntp_server => '0.pool.ntp.org,1.pool.ntp.org',
$fallback_ntp_server => '2.pool.ntp.org,3.pool.ntp.org',
$ntp_server => '0.pool.ntp.org 1.pool.ntp.org',
$fallback_ntp_server => '2.pool.ntp.org 3.pool.ntp.org',
Copy link
Member

Choose a reason for hiding this comment

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

How about passing an array instead?

Copy link
Contributor Author

@hfm hfm Nov 22, 2017

Choose a reason for hiding this comment

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

$ntp_server and $fallback_ntp_server in systemd class now don't allow Array: https://github.com/camptocamp/puppet-systemd/blob/1.1.0/manifests/init.pp#L43-L44

Copy link
Contributor Author

Choose a reason for hiding this comment

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

IMO, it's better that systemd class allow $ntp_server and $ntp_fallback_server to use both Array and String. If you're okay, I'll do.

Copy link
Member

Choose a reason for hiding this comment

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

Oh ok. That's weird, cause the timesyncd class accepts arrays. @bastelfreak you originally wrote that class, what do you think?

Copy link
Member

Choose a reason for hiding this comment

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

Sounds like an oversight and init.pp should match the types of timesyncd.pp

Copy link
Member

Choose a reason for hiding this comment

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

spaces are correct, not sure how I missed it. @hfm can you also allow array as datatype in the init.pp?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

okay i'll change it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed it by 2c38f1a

@bastelfreak bastelfreak merged commit 246992e into voxpupuli:master Nov 23, 2017
@hfm hfm deleted the space-separated branch November 23, 2017 13:48
@raphink raphink added the enhancement New feature or request label Aug 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants