Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382893 )
Change subject: wikiba.se: Remove colon from VirtualHost
......................................................................
wikiba.se: Remove colon from VirtualHost
it's invalid syntax.
Also correct the path by changing /srv/es/wikiba to /srv/se/wikiba.
Change-Id: I0c2b9dbc9b6fc3b7f710b772aa3cad7318e4b589
---
M modules/profile/manifests/microsites/wikibase.pp
M modules/profile/templates/wikibase/apache-wikibase.erb
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/microsites/wikibase.pp
b/modules/profile/manifests/microsites/wikibase.pp
index d6c3c04..380aa6e 100644
--- a/modules/profile/manifests/microsites/wikibase.pp
+++ b/modules/profile/manifests/microsites/wikibase.pp
@@ -18,12 +18,12 @@
content => template('profile/wikibase/apache-wikibase.erb'),
}
- ensure_resource('file', '/srv/es', {'ensure' => 'directory' })
- ensure_resource('file', '/srv/es/wikiba', {'ensure' => 'directory' })
+ ensure_resource('file', '/srv/se', {'ensure' => 'directory' })
+ ensure_resource('file', '/srv/se/wikiba', {'ensure' => 'directory' })
git::clone { 'wikibase/wikiba.se-deploy':
ensure => 'latest',
- directory => '/srv/es/wikiba',
+ directory => '/srv/se/wikiba',
branch => 'master',
}
diff --git a/modules/profile/templates/wikibase/apache-wikibase.erb
b/modules/profile/templates/wikibase/apache-wikibase.erb
index 293df40..5b92fc8 100644
--- a/modules/profile/templates/wikibase/apache-wikibase.erb
+++ b/modules/profile/templates/wikibase/apache-wikibase.erb
@@ -1,4 +1,4 @@
-<VirtualHost: *:80>
+<VirtualHost *:80>
ServerName <%= @server_name %>
ServerAdmin <%= @server_admin %>
DocumentRoot /srv/se/wikiba/
--
To view, visit https://gerrit.wikimedia.org/r/382893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c2b9dbc9b6fc3b7f710b772aa3cad7318e4b589
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
