Siebrand has uploaded a new change for review.

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


Change subject: Add aliases
......................................................................

Add aliases

Change-Id: Ic4e06595099bd7d848577ad65fe736e918012129
---
A puppet/modules/users/files/aliases
M puppet/modules/users/manifests/init.pp
2 files changed, 41 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/14/92014/1

diff --git a/puppet/modules/users/files/aliases 
b/puppet/modules/users/files/aliases
new file mode 100644
index 0000000..d2f0e0e
--- /dev/null
+++ b/puppet/modules/users/files/aliases
@@ -0,0 +1,29 @@
+# /etc/aliases
+
+mailer-daemon: postmaster
+postmaster: root
+nobody: root
+hostmaster: root
+usenet: root
+news: root
+webmaster: root
+www: root
+www-data: root
+ftp: root
+abuse: root
+noc: root
+security: root
+l10n-bot: root
+
+root: [email protected], [email protected]
+
+amir: [email protected]
+lcawte: [email protected]
+mah: [email protected]
+nike: [email protected]
+raymond: [email protected]
+siebrand: [email protected]
+translatewiki: [email protected]
+federico: [email protected]
+
+blockly: [email protected]
diff --git a/puppet/modules/users/manifests/init.pp 
b/puppet/modules/users/manifests/init.pp
index 81e81b4..300df91 100644
--- a/puppet/modules/users/manifests/init.pp
+++ b/puppet/modules/users/manifests/init.pp
@@ -1,4 +1,16 @@
 class users {
+  # Pull down the main aliases file
+  file { '/etc/aliases':
+    source => 'puppet:///module/users/aliases'
+  }
+
+  # Rebuild the database, but only when the file changes
+  exec { newaliases:
+    path        => ["/usr/bin", "/usr/sbin"],
+    subscribe   => File["/etc/aliases"],
+    refreshonly => true
+  }
+
   group { "betawiki":
     ensure => present,
     gid => 1002
@@ -196,16 +208,4 @@
       home       => '/home/kartik',
       comment    => 'Kartik Mistry';
   }
-
-       # Pull down the main aliases file
-       file { "/etc/aliases":
-         source => "puppet://server/module/aliases"
-       }
-
-       # Rebuild the database, but only when the file changes
-       exec { newaliases:
-         path        => ["/usr/bin", "/usr/sbin"],
-         subscribe   => File["/etc/aliases"],
-         refreshonly => true
-       }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4e06595099bd7d848577ad65fe736e918012129
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to