Jgreen has submitted this change and it was merged.
Change subject: add webserver::apache to iodine
......................................................................
add webserver::apache to iodine
Change-Id: Id287a1659f9766de18fc67b53c7ba74bdc125152
---
M manifests/role/otrs.pp
M manifests/site.pp
2 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Jgreen: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 135bc5c..409a306 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -3,7 +3,12 @@
class role::otrs::webserver {
+ $apache_ssl = true
+
system_role { 'role::otrs::webserver': description => 'OTRS Web
Application Server' }
+
+ include standard-noexim,
+ webserver::apache2
package {
['libapache-dbi-perl', 'libapache2-mod-perl2', 'libdbd-mysql-perl',
'libgd-graph-perl',
@@ -14,10 +19,6 @@
}
install_certificate{ "star.wikimedia.org": }
-
- # enable modperl
- #apache_module { 'perl': name => 'perl',
- #}
file {
'/etc/apache2/sites-available/ticket.wikimedia.org':
@@ -35,5 +36,7 @@
}
apache_site { 'ticket': name => 'ticket.wikimedia.org' }
+ apache_module { 'perl': name => 'perl' }
+ apache_module { 'rewrite': name => 'rewrite' }
}
diff --git a/manifests/site.pp b/manifests/site.pp
index d10928e..12d8ab8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2914,8 +2914,7 @@
}
node "iodine.wikimedia.org" {
- include standard-noexim,
- role::otrs::webserver
+ include role::otrs::webserver
}
node /(cerium|titanium)\.wikimedia\.org/ {
--
To view, visit https://gerrit.wikimedia.org/r/77363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id287a1659f9766de18fc67b53c7ba74bdc125152
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
