Alexandros Kosiaris has submitted this change and it was merged.
Change subject: puppetize ports-wikitech.conf on wikitech hosts.
......................................................................
puppetize ports-wikitech.conf on wikitech hosts.
Change-Id: I49fa3244cd3a74f320b3b53fa3bf59057c4fe123
---
M manifests/openstack.pp
A templates/openstack/common/controller/ports-wikitech.conf.erb
2 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 091c302..a1fe533 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -400,6 +400,15 @@
source => "puppet:///files/openstack/mw-xml.sh";
}
+ file { '/etc/apache2/conf.d/ports-wikitech.conf':
+ ensure => present,
+ require =>
File["/etc/apache2/sites-available/${controller_hostname}"],
+ mode => '0644',
+ owner => 'root',
+ group => 'root',
+ content =>
template('openstack/common/controller/ports-wikitech.conf.erb'),
+ }
+
cron {
"run-jobs":
user => mwdeploy,
diff --git a/templates/openstack/common/controller/ports-wikitech.conf.erb
b/templates/openstack/common/controller/ports-wikitech.conf.erb
new file mode 100644
index 0000000..24c3bb2
--- /dev/null
+++ b/templates/openstack/common/controller/ports-wikitech.conf.erb
@@ -0,0 +1,2 @@
+Listen 80
+Listen 443
--
To view, visit https://gerrit.wikimedia.org/r/112421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49fa3244cd3a74f320b3b53fa3bf59057c4fe123
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
