Jgreen has submitted this change and it was merged.
Change subject: merge otrs classes into one, add nrpe since mail::roled breaks
without it
......................................................................
merge otrs classes into one, add nrpe since mail::roled breaks without it
Change-Id: Ie92e9f07b0256c58346e1304712aa0d47eed1871
---
M manifests/role/otrs.pp
1 file changed, 23 insertions(+), 18 deletions(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index a38812e..21fcc91 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -2,29 +2,20 @@
# role/otrs.pp
class role::otrs {
- include role::otrs::webserver
+ system_role { 'role::otrs::webserver': description => 'OTRS Web
Application Server' }
+
+ $nagios_group = "${cluster}_${::site}"
+
+ include standard-noexim,
+ webserver::apache,
+ nrpe
+
systemuser { 'otrs':
name => 'otrs',
home => '/opt/otrs-home',
- groups => 'www-data'
+ groups => 'www-data',
}
- class { 'spamassassin':
- required_score => '5.0',
- use_bayes => '1',
- bayes_auto_learn => '1',
- }
- class { 'exim::roled':
- enable_otrs_server => 'true',
- enable_imap_delivery => 'true',
- enable_spamassassin => 'true',
- }
-}
-
-class role::otrs::webserver {
- system_role { 'role::otrs::webserver': description => 'OTRS Web
Application Server' }
- include standard-noexim,
- webserver::apache
package {
['libapache-dbi-perl', 'libapache2-mod-perl2', 'libdbd-mysql-perl',
'libgd-graph-perl',
'libgd-text-perl', 'libio-socket-ssl-perl', 'libjson-xs-perl',
'libnet-dns-perl',
@@ -32,6 +23,7 @@
'libtimedate-perl', 'perl-doc', 'mysql-client']:
ensure => 'present',
}
+
file {
'/etc/apache2/sites-available/ticket.wikimedia.org':
ensure => present,
@@ -40,9 +32,22 @@
mode => '0444',
source => 'puppet:///files/apache/sites/ticket.wikimedia.org';
}
+
install_certificate{ "star.wikimedia.org": }
apache_module { 'perl': name => 'perl' }
apache_module { 'rewrite': name => 'rewrite' }
apache_module { 'ssl': name => 'ssl' }
apache_site { 'ticket': name => 'ticket.wikimedia.org' }
+
+ class { 'spamassassin':
+ required_score => '5.0',
+ use_bayes => '1',
+ bayes_auto_learn => '1',
+ }
+
+ class { 'exim::roled':
+ enable_otrs_server => 'true',
+ enable_imap_delivery => 'true',
+ enable_spamassassin => 'true',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/77724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie92e9f07b0256c58346e1304712aa0d47eed1871
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <[email protected]>
Gerrit-Reviewer: Jgreen <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
