Andrew Bogott has submitted this change and it was merged.
Change subject: Remove lucid umask setting
......................................................................
Remove lucid umask setting
Since Fenari is on precise and tin is the deploy host, sepcial umask setting is
redundant.
Change-Id: I2d59d10dd8c76a4ec307e7bccc3fa39629d14b6b
---
D files/environment/profile-deploy-host
M manifests/generic-definitions.pp
2 files changed, 0 insertions(+), 46 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/environment/profile-deploy-host
b/files/environment/profile-deploy-host
deleted file mode 100644
index 8b1351b..0000000
--- a/files/environment/profile-deploy-host
+++ /dev/null
@@ -1,35 +0,0 @@
-# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
-# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-
-# ! this file is generated by puppet !
-# this /etc/profile does NOT set umask
-# instead that is being handled in /etc/profile.d/umask-wikidev.sh
-# based on group membership in "wikidev" (RT-804)
-# this is ONLY applied on deployment hosts (fenari) on lucid or older
-# precise and newer does not have a umask line there any longer
-
-if [ -d /etc/profile.d ]; then
- for i in /etc/profile.d/*.sh; do
- if [ -r $i ]; then
- . $i
- fi
- done
- unset i
-fi
-
-if [ "$PS1" ]; then
- if [ "$BASH" ]; then
- PS1='\u@\h:\w\$ '
- if [ -f /etc/bash.bashrc ]; then
- . /etc/bash.bashrc
- fi
- else
- if [ "`id -u`" -eq 0 ]; then
- PS1='# '
- else
- PS1='$ '
- fi
- fi
-fi
-
-export PATH=$PATH:/home/wikipedia/bin
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 539447f..a1bfbce 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -303,17 +303,6 @@
mode => 0444,
source =>
"puppet:///files/environment/umask-wikidev-profile-d.sh";
}
- # if lucid or earlier /etc/profile would overwrite umask after incl.
above
- # FIXME: remove this once fenari became precise or there is a new
deploy host
- if versioncmp($::lsbdistrelease, "10.04") <= 0 {
- file {
- "/etc/profile":
- ensure => present,
- owner => root,
- group => root,
- source =>
"puppet:///files/environment/profile-deploy-host";
- }
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/86816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d59d10dd8c76a4ec307e7bccc3fa39629d14b6b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <matanya.mo...@gmail.com>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
