Andrew Bogott has submitted this change and it was merged.
Change subject: Updated a bunch of file headers.
......................................................................
Updated a bunch of file headers.
Nothin' but comments!
Change-Id: Ia0a56b71e73014ed2237fb1c962e6f9891f106b9
---
M modules/sysctlfile/files/50-advanced-routing-ipv6.conf
M modules/sysctlfile/files/50-advanced-routing.conf
M modules/sysctlfile/files/50-ipv6-disable-ra.conf
M modules/sysctlfile/files/50-lvs.conf
M modules/sysctlfile/files/50-wikimedia-base.conf
M modules/sysctlfile/files/60-high-bandwidth-rsync.conf
M modules/sysctlfile/files/60-high-http-performance.conf
M modules/sysctlfile/files/99-big-rmem.conf
8 files changed, 26 insertions(+), 7 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/sysctlfile/files/50-advanced-routing-ipv6.conf
b/modules/sysctlfile/files/50-advanced-routing-ipv6.conf
index 0e8b410..fc28404 100644
--- a/modules/sysctlfile/files/50-advanced-routing-ipv6.conf
+++ b/modules/sysctlfile/files/50-advanced-routing-ipv6.conf
@@ -1,4 +1,7 @@
-# This file is managed by Puppet!
+#####################################################################
+#### THIS FILE IS MANAGED BY PUPPET
+#### puppet:///modules/sysctlfile/50-advanced-routing-ipv6.conf
+######################################################################
# Enable router advertisements even when forwarding is enabled
# ("all" doesn't work with accept_ra, add eth0 here as a hack)
diff --git a/modules/sysctlfile/files/50-advanced-routing.conf
b/modules/sysctlfile/files/50-advanced-routing.conf
index ec9cb6b..f727030 100644
--- a/modules/sysctlfile/files/50-advanced-routing.conf
+++ b/modules/sysctlfile/files/50-advanced-routing.conf
@@ -1,4 +1,7 @@
-# This file is managed by Puppet!
+#####################################################################
+#### THIS FILE IS MANAGED BY PUPPET
+#### puppet:///modules/sysctlfile/50-advanced-routing.conf
+######################################################################
# Turn OFF RP filter
net.ipv4.conf.default.rp_filter=0
diff --git a/modules/sysctlfile/files/50-ipv6-disable-ra.conf
b/modules/sysctlfile/files/50-ipv6-disable-ra.conf
index fafb130..c986bbe 100644
--- a/modules/sysctlfile/files/50-ipv6-disable-ra.conf
+++ b/modules/sysctlfile/files/50-ipv6-disable-ra.conf
@@ -1,4 +1,8 @@
-# This file is managed by Puppet!
+#####################################################################
+#### THIS FILE IS MANAGED BY PUPPET
+#### puppet:///modules/sysctlfile/60-ipv6-disable-ra.conf
+######################################################################
+
# Turn off ra
net.ipv6.conf.all.accept_ra=0
diff --git a/modules/sysctlfile/files/50-lvs.conf
b/modules/sysctlfile/files/50-lvs.conf
index 50198d2..2a04070 100644
--- a/modules/sysctlfile/files/50-lvs.conf
+++ b/modules/sysctlfile/files/50-lvs.conf
@@ -1,4 +1,7 @@
-# This file is managed by Puppet!
+#####################################################################
+#### THIS FILE IS MANAGED BY PUPPET
+#### puppet:///modules/sysctlfile/50-lvs.conf
+######################################################################
# Turn OFF RP filter
net.ipv4.conf.default.rp_filter=0
diff --git a/modules/sysctlfile/files/50-wikimedia-base.conf
b/modules/sysctlfile/files/50-wikimedia-base.conf
index 7bf1f80..02a1a59 100644
--- a/modules/sysctlfile/files/50-wikimedia-base.conf
+++ b/modules/sysctlfile/files/50-wikimedia-base.conf
@@ -1,6 +1,6 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/misc/50-wikimedia-base.conf.sysctl
+### puppet:///modules/sysctlfile/50-wikimedia-base.conf
#####################################################################
# increase TCP max buffer size
diff --git a/modules/sysctlfile/files/60-high-bandwidth-rsync.conf
b/modules/sysctlfile/files/60-high-bandwidth-rsync.conf
index cbcd8bb..9013c00 100644
--- a/modules/sysctlfile/files/60-high-bandwidth-rsync.conf
+++ b/modules/sysctlfile/files/60-high-bandwidth-rsync.conf
@@ -1,6 +1,6 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/misc/60-high-bandwidth-rsync.conf.sysctl
+### puppet:///modules/sysctlfile/60-high-bandwidth-rsync.conf
#####################################################################
diff --git a/modules/sysctlfile/files/60-high-http-performance.conf
b/modules/sysctlfile/files/60-high-http-performance.conf
index 9300682..0528b74 100644
--- a/modules/sysctlfile/files/60-high-http-performance.conf
+++ b/modules/sysctlfile/files/60-high-http-performance.conf
@@ -1,6 +1,6 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/sysctlfile/60-high-http-performance.conf.sysctl
+### puppet:///modules/sysctlfile/60-high-http-performance.conf
#####################################################################
diff --git a/modules/sysctlfile/files/99-big-rmem.conf
b/modules/sysctlfile/files/99-big-rmem.conf
index d5c38f4..ed4c261 100644
--- a/modules/sysctlfile/files/99-big-rmem.conf
+++ b/modules/sysctlfile/files/99-big-rmem.conf
@@ -1,3 +1,9 @@
+#####################################################################
+### THIS FILE IS MANAGED BY PUPPET
+### puppet:///modules/sysctlfile/99-big-rmem.conf
+#####################################################################
+
+
net.core.rmem_max = 536870912
net.core.rmem_default = 4194304
--
To view, visit https://gerrit.wikimedia.org/r/74794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0a56b71e73014ed2237fb1c962e6f9891f106b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
