Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154484
Change subject: contint: website config on labs
......................................................................
contint: website config on labs
For development purposes, I need the Jenkins/Zuul Apache proxy
configuration to be set on integration.wmflabs.org. That uses to be
some live hacks on the instance, but our apache class now manage the
configuration directory which removes them.
Change-Id: I0e16e5a83dde4e1fffc2b314262268ea15fa5fc6
---
A modules/contint/manifests/website/labs.pp
A modules/contint/templates/apache/integration.wmflabs.org.erb
2 files changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/154484/1
diff --git a/modules/contint/manifests/website/labs.pp
b/modules/contint/manifests/website/labs.pp
new file mode 100644
index 0000000..7131e02
--- /dev/null
+++ b/modules/contint/manifests/website/labs.pp
@@ -0,0 +1,7 @@
+class contint::website::labs {
+
+ apache::site { 'integrationlabs':
+ content => template('contint/apache/integration.wmflabs.org.erb'),
+ }
+
+}
diff --git a/modules/contint/templates/apache/integration.wmflabs.org.erb
b/modules/contint/templates/apache/integration.wmflabs.org.erb
new file mode 100644
index 0000000..427851d
--- /dev/null
+++ b/modules/contint/templates/apache/integration.wmflabs.org.erb
@@ -0,0 +1,15 @@
+#####################################################################
+### THIS FILE IS MANAGED BY PUPPET
+### contint module templates/apache/integration.wmflabs.org.erb
+#####################################################################
+# vim: filetype=apache
+
+<VirtualHost *:80>
+ ServerName integration.wmflabs.org
+
+ LogLevel warn
+ ErrorLog /var/log/apache2/integration_error.log
+ CustomLog /var/log/apache2/integration_access.log vhost_combined
+
+ Include *_proxy
+</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/154484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e16e5a83dde4e1fffc2b314262268ea15fa5fc6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
