[MediaWiki-commits] [Gerrit] Tool Labs: restore tools.wmflabs.org - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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


Change subject: Tool Labs: restore tools.wmflabs.org
......................................................................

Tool Labs: restore tools.wmflabs.org

Also:
- fix service refresh
- check for .forward

Change-Id: I66cc99c9ddaa67f6d02b2f20bf1507ba7a28bba9
---
M manifests/role/labs.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/mailrelay.pp
M modules/toollabs/templates/exim4.conf.erb
4 files changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/63797/1

diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 0835525..ca71010 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -52,7 +52,7 @@
   class mailrelay inherits role::labs::tools::config {
     system_role { "role::labs::tools::mailrelay": description => "Tool Labs 
mail relay" }
     class { 'toollabs::mailrelay':
-      maildomain => "toollabs.org",
+      maildomain => "tools.wmflabs.org",
     }
   }
 
diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 7b958b1..b4507d0 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -102,6 +102,7 @@
   File <| title == '/etc/exim4/exim4.conf' |> {
     content => undef,
     source => [ "$store/mail-relay", 
"puppet:///modules/toollabs/exim4-norelay.conf" ],
+    refresh => Service['exim4'],
   }
 
   file { "/var/mail":
diff --git a/modules/toollabs/manifests/mailrelay.pp 
b/modules/toollabs/manifests/mailrelay.pp
index bdf3eb8..24b2332 100644
--- a/modules/toollabs/manifests/mailrelay.pp
+++ b/modules/toollabs/manifests/mailrelay.pp
@@ -25,11 +25,13 @@
   File <| title == '/etc/exim4/exim4.conf' |> {
     source => undef,
     content => template("toollabs/exim4.conf.erb"),
+    refresh => Service['exim4'],
   }
 
   File <| title == '/etc/default/exim4' |> {
     content => undef,
     source =>  "puppet:///modules/toollabs/exim4.default.mailrelay",
+    refresh => Service['exim4'],
   }
 }
 
diff --git a/modules/toollabs/templates/exim4.conf.erb 
b/modules/toollabs/templates/exim4.conf.erb
index c69908b..691b8bf 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -65,6 +65,14 @@
   allow_defer
   data = ${lookup{$local_part}lsearch{/etc/aliases}}
 
+userforward:
+  driver = redirect
+  check_local_user
+  file = $home/.forward
+  no_verify
+  no_expn
+  check_ancestor
+
 localuser:
   driver = accept
   check_local_user

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66cc99c9ddaa67f6d02b2f20bf1507ba7a28bba9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>

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