Lcarr has submitted this change and it was merged.
Change subject: Use the sysctlfile module in base::sysctl.
......................................................................
Use the sysctlfile module in base::sysctl.
Change-Id: I8455b508f593e0af03593661fe3950639906dee1
---
M manifests/base.pp
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
Lcarr: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/base.pp b/manifests/base.pp
index 90034c8..28706d6 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -303,13 +303,11 @@
refreshonly => true;
}
- file { wikimedia-base-sysctl:
- name => "/etc/sysctl.d/50-wikimedia-base.conf",
- owner => root,
- group => root,
- mode => 0444,
+ sysctlfile { 'wikimedia-base':
+ source =>
'puppet:///modules/sysctlfile/50-wikimedia-base.conf',
+ number_prefix => '50',
+ ensure => $ensure,
notify => Exec["/sbin/start procps"],
- source =>
"puppet:///files/misc/50-wikimedia-base.conf.sysctl"
}
# Disable IPv6 privacy extensions, we rather not see our
servers hide
--
To view, visit https://gerrit.wikimedia.org/r/74804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8455b508f593e0af03593661fe3950639906dee1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
