Jgreen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/77717
Change subject: switch to exim::roled for otrs server
......................................................................
switch to exim::roled for otrs server
Change-Id: I30ced0d486941ef18802d28420e70384a4164d95
---
M manifests/mail.pp
M manifests/role/otrs.pp
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
3 files changed, 43 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/77717/1
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 6bc9dd7..89c6fa1 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -135,6 +135,8 @@
class roled(
$local_domains = [ "+system_domains" ],
$enable_mail_relay="false",
+ $enable_otrs_server="false",
+ $otrs_home="/opt/otrs-home",
$enable_mailman="false",
$enable_imap_delivery="false",
$enable_mail_submission="false",
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 6cfffcb..27a12d5 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -2,13 +2,16 @@
# role/otrs.pp
class role::otrs {
- include role::otrs::webserver,
- role::otrs::mailserver
-
+ include role::otrs::webserver
systemuser { 'otrs':
name => 'otrs',
home => '/opt/otrs-home',
groups => 'www-data'
+ }
+ class { 'exim::roled':
+ $enable_otrs_server => 'true',
+ $enable_imap_delivery => 'true',
+ $enable_spamassassin => 'true',
}
}
@@ -40,31 +43,26 @@
}
-class role::otrs::mailserver {
- include exim::smtp,
- exim::constants,
- network::constants
-
- class { 'spamassassin':
- required_score => '5.0',
- use_bayes => 1,
- bayes_auto_learn => 1
- }
-
- package { [ 'exim4-daemon-heavy', 'exim4-config' ]:
- ensure => latest;
- }
- File {
- owner => root,
- group => root,
- mode => '0444',
- }
- file {
- '/etc/exim4/exim4.conf':
- ensure => present,
- content => template('exim/exim4.otrs.erb');
- '/etc/exim4/system_filter':
- ensure => present,
- source => 'puppet:///files/exim/system_filter.otrs';
- }
-}
+#class role::otrs::mailserver {
+# include network::constants
+#
+# class { 'spamassassin':
+# required_score => '5.0',
+# use_bayes => 1,
+# bayes_auto_learn => 1
+# }
+#
+# File {
+# owner => root,
+# group => root,
+# mode => '0444',
+# }
+# file {
+# '/etc/exim4/exim4.conf':
+# ensure => present,
+# content => template('exim/exim4.otrs.erb');
+# '/etc/exim4/system_filter':
+# ensure => present,
+# source => 'puppet:///files/exim/system_filter.otrs';
+# }
+#}
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index cad7395..e6b8ada 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -22,14 +22,22 @@
MAILMAN_UID = list
MAILMAN_GID = list
+# OTRS
+OTRS_POSTMASTER=/opt/otrs/bin/PostMaster.pl
+OTRS_HOME=/opt/otrs-home
+OTRS_USER=otrs
+OTRS_GROUP=otrs
+
###############################
# Main configuration settings #
###############################
-<% if enable_mail_relay == "primary" then -%>
+<% if enable_mail_relay == "primary" or enable_otrs_server == "yes" then -%>
# MySQL lookups (OTRS)
hide mysql_servers = db48.pmtpa.wmnet/otrs/exim/<%=
scope.lookupvar('exim::smtp::otrs_mysql_password') %> :
db49.pmtpa.wmnet/otrs/exim/<%=
scope.lookupvar('exim::smtp::otrs_mysql_password') %>
+<% end -%>
+<% if enable_mail_relay == "primary" then -%>
# LDAP lookups (Office)
ldap_default_servers = sanger.wikimedia.org
LDAPPASSWORD=<%= scope.lookupvar('exim::smtp::smtp_ldap_password') %>
@@ -59,7 +67,9 @@
hostlist relay_from_hosts = <; @[] ; 127.0.0.1 ; ::1 ; <% if enable_mail_relay
!= "false" -%><%=
scope.lookupvar('network::constants::external_networks').join(" ; ") %>;
10.0.0.0/8<% end %>
# Relay @mx_secondary domains only to these hosts
hostlist primary_mx = <; <%=
scope.lookupvar('exim::constants::primary_mx').join(" ; ") %>
-
+<% if enable_otrs_server == "yes" then -%>
+hostlist otrs_mail_from_hosts = mchenry.wikimedia.org
+<% end -%>
<% if enable_imap_delivery == "true" then -%>
# Interfaces
--
To view, visit https://gerrit.wikimedia.org/r/77717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30ced0d486941ef18802d28420e70384a4164d95
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
