Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153993
Change subject: Revert "openstack - use apache::conf for port"
......................................................................
Revert "openstack - use apache::conf for port"
This reverts commit 1041eab5f24f860bab028cf474082736c19738bc.
Change-Id: I301d1efe6ec2059a91587bd26226c978d8fcb22c
---
A files/openstack/controller/ports-wikitech.conf
M manifests/openstack.pp
2 files changed, 14 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/153993/1
diff --git a/files/openstack/controller/ports-wikitech.conf
b/files/openstack/controller/ports-wikitech.conf
new file mode 100644
index 0000000..3d6bcd0
--- /dev/null
+++ b/files/openstack/controller/ports-wikitech.conf
@@ -0,0 +1,7 @@
+#####################################################################
+### THIS FILE IS MANAGED BY PUPPET
+### puppet:///files/openstack/controller/ports-wikitech.conf
+#####################################################################
+
+Listen 80
+Listen 443
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 5115270..187eeac 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -407,9 +407,13 @@
source => "puppet:///files/openstack/mw-xml.sh";
}
- # listen on 443 for HTTPS
- apache::conf { 'wikitech_https_port':
- content => "Listen 443\n",
+ file { '/etc/apache2/conf.d/ports-wikitech.conf':
+ ensure => present,
+ require =>
File["/etc/apache2/sites-available/${webserver_hostname}"],
+ mode => '0644',
+ owner => 'root',
+ group => 'root',
+ source =>
'puppet:///files/openstack/controller/ports-wikitech.conf',
}
cron {
--
To view, visit https://gerrit.wikimedia.org/r/153993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I301d1efe6ec2059a91587bd26226c978d8fcb22c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
