[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Undo obsolete /var/mail customization

2017-11-15 Thread Rush (Code Review) 
Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326306 )

Change subject: Tools: Undo obsolete /var/mail customization
..


Tools: Undo obsolete /var/mail customization

Starting with 5d48443710d8064954ea00d1bbe29878ef65c2eb/
e0e617f9041a115d7a3155e2b7d577222f0e2e84, mail for user and tool
accounts was stored in /data/project/.system/store/mail.
17ee544c1fb8eb1dd539aa1efb5cca1268406e07 replaced this with the
current setup where mail is only forwarded, but not stored.

Thus /data/project/.system/store/mail is no longer in any use, and
after cleaning out old mail it is also empty.

This change removes /data/project/.system/store/mail and replaces the
symbolic link for /var/mail with the default directory created by
base-files's postinst to minimize the differences with standard
installations.

Change-Id: If5005dd85ef395d502a6ebdb516b61f95a8d8aca
---
M modules/toollabs/manifests/init.pp
1 file changed, 11 insertions(+), 4 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, but someone else must approve
  Rush: Looks good to me, approved
  Merlijn van Deen: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 146df24..ea4d0c5 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -131,11 +131,18 @@
 }
 }
 
+# TODO: Remove after Puppet cycle.
 file { '/var/mail':
-ensure  => link,
-force   => true,
-target  => "${store}/mail",
-require => File[$store],
+ensure => directory,
+owner  => 'root',
+group  => 'mail',
+mode   => '2775',
+}
+
+# TODO: Remove after Puppet cycle.
+file { "${store}/mail":
+ensure => absent,
+force  => true,
 }
 
 # Link to currently active proxy

-- 
To view, visit https://gerrit.wikimedia.org/r/326306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If5005dd85ef395d502a6ebdb516b61f95a8d8aca
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Undo obsolete /var/mail customization

2016-12-10 Thread Tim Landscheidt (Code Review) 
Hello Merlijn van Deen,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/326306

to review the following change.


Change subject: Tools: Undo obsolete /var/mail customization
..

Tools: Undo obsolete /var/mail customization

Starting with 5d48443710d8064954ea00d1bbe29878ef65c2eb/
e0e617f9041a115d7a3155e2b7d577222f0e2e84, mail for user and tool
accounts was stored in /data/project/.system/store/mail.
17ee544c1fb8eb1dd539aa1efb5cca1268406e07 replaced this with the
current setup where mail is only forwarded, but not stored.

Thus /data/project/.system/store/mail is no longer in any use, and
after cleaning out old mail it is also empty.

This change removes /data/project/.system/store/mail and replaces the
symbolic link for /var/mail with the default directory created by
base-files's postinst to minimize the differences with standard
installations.

Change-Id: If5005dd85ef395d502a6ebdb516b61f95a8d8aca
---
M modules/toollabs/manifests/init.pp
1 file changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/326306/1

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index a590802..4558ff3 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -146,11 +146,18 @@
 }
 }
 
+# TODO: Remove after Puppet cycle.
 file { '/var/mail':
-ensure  => link,
-force   => true,
-target  => "${store}/mail",
-require => File[$store],
+ensure => directory,
+owner  => 'root',
+group  => 'mail',
+mode   => '2775',
+}
+
+# TODO: Remove after Puppet cycle.
+file { "${store}/mail":
+ensure => absent,
+force  => true,
 }
 
 # Link to currently active proxy

-- 
To view, visit https://gerrit.wikimedia.org/r/326306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5005dd85ef395d502a6ebdb516b61f95a8d8aca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Merlijn van Deen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits