Skip to content

fix FreeBSD support #455

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.

Sign up for GitHub

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

fix FreeBSD support #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3940b1c
fix FreeBSD support
fraenki Nov 3, 2022
820fc5a
Update instance.pp
bastelfreak Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/instance.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@
}
}

if $manage_service_file {
if $manage_service_file and $facts['service_provider'] == 'systemd' {
if $title != 'default' {
$real_service_ensure = $service_ensure == 'running'
$real_service_enable = $service_enable
Expand Down Expand Up @@ -453,7 +453,7 @@
),
}
} else {
if $ulimit_managed {
if $ulimit_managed and $facts['service_provider'] == 'systemd' {
systemd::service_limits { "${service_name}.service":
limits => {
'LimitNOFILE' => $ulimit,
Expand Down
2 changes: 1 addition & 1 deletion manifests/ulimit.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
class redis::ulimit {
assert_private('The redis::ulimit class is only to be called from the redis::config class')

if $redis::managed_by_cluster_manager {
if $redis::managed_by_cluster_manager and $facts['kernel'] == 'Linux' {
file { '/etc/security/limits.d/redis.conf':
ensure => 'file',
owner => 'root',
Expand Down