Faidon Liambotis has submitted this change and it was merged.
Change subject: mediawiki: remove ssh.override/nice -10 for SSH
......................................................................
mediawiki: remove ssh.override/nice -10 for SSH
Changing the nice level of sshd (or any property of sshd) from the
mediawiki module is just a bad practice. It also breaks overriding ssh
server settings by including ssh::server unconditionally, which is now a
parameterized class and also adds a superfluous upstart dependency.
Remove the stanza entirely; it should be readded to either the ssh or
the base module if there is a need for that.
Change-Id: Ic594062ef33d2106e5974f32bb735c6c4dd2076f
---
M modules/mediawiki/manifests/init.pp
1 file changed, 0 insertions(+), 18 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index d12256e..d29936e 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -26,36 +26,18 @@
include ::mediawiki::syslog
include ::mediawiki::php
- include ::ssh::server
-
if os_version('ubuntu >= trusty') {
include ::mediawiki::hhvm
}
-
# Set the Salt grain 'php' to the name of the PHP runtime, to make
# it easier to select a subset of MediaWiki servers. For example:
# $ salt -G php:hhvm cmd.run 'apt-show-versions hhvm'
-
$php = $::lsbdistcodename ? { trusty => 'hhvm', default => 'php5' }
salt::grain { 'php': value => $php }
-
- # Increase the scheduling priority of sshd so we can still
- # log in remotely in cases of overload.
-
- file { '/etc/init/ssh.override':
- content => "nice -10\n",
- owner => 'root',
- group => 'root',
- mode => '0444',
- notify => Service['ssh'],
- }
-
-
# /var/log/mediawiki contains log files for the MediaWiki jobrunner
# and for various periodic jobs that are managed by cron.
-
file { '/var/log/mediawiki':
ensure => directory,
owner => 'apache',
--
To view, visit https://gerrit.wikimedia.org/r/177863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic594062ef33d2106e5974f32bb735c6c4dd2076f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
