Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/78832
Change subject: OLD etherpad install to etherpad-old.wikimedia.org
......................................................................
OLD etherpad install to etherpad-old.wikimedia.org
Change-Id: Iad9a57fe0b4b8387a33789392027e3f90382dc9f
---
M files/misc/etherpad/etherpad.proxy.apache.conf
M templates/etherpad/etherpad.local.properties.erb
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/78832/1
diff --git a/files/misc/etherpad/etherpad.proxy.apache.conf
b/files/misc/etherpad/etherpad.proxy.apache.conf
index 15a487a..f60d6bf 100644
--- a/files/misc/etherpad/etherpad.proxy.apache.conf
+++ b/files/misc/etherpad/etherpad.proxy.apache.conf
@@ -1,7 +1,7 @@
<VirtualHost *:80>
- ServerName etherpad.wikimedia.org
- ServerAlias eiximenis.wikimedia.org
+ ServerName etherpad-old.wikimedia.org
+ ServerAlias etherpad.wikimedia.org eiximenis.wikimedia.org
RewriteEngine on
ProxyPass / http://127.0.0.1:9000/
ProxyPassReverse / http://127.0.0.1:9000/
@@ -10,8 +10,8 @@
</VirtualHost>
<VirtualHost *:443>
- ServerName etherpad.wikimedia.org
- ServerAlias eiximenis.wikimedia.org
+ ServerName etherpad-old.wikimedia.org
+ ServerAlias etherpad.wikimedia.org eiximenis.wikimedia.org
SSLEngine on
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
diff --git a/templates/etherpad/etherpad.local.properties.erb
b/templates/etherpad/etherpad.local.properties.erb
index bbb4fed..f528f66 100644
--- a/templates/etherpad/etherpad.local.properties.erb
+++ b/templates/etherpad/etherpad.local.properties.erb
@@ -15,7 +15,7 @@
logDir = /var/log/etherpad
modulePath = ./src
motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0
-topdomains = etherpad.wikimedia.org,eiximenis.wikimedia.org,<%= fqdn
%>,localhost,localhost.localdomain
+topdomains =
etherpad-old.wikimedia.org,etherpad-old.wikimedia.org,eiximenis.wikimedia.org,<%=
fqdn %>,localhost,localhost.localdomain
transportPrefix = /comet
transportUseWildcardSubdomains = true
useHttpsUrls = false
--
To view, visit https://gerrit.wikimedia.org/r/78832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad9a57fe0b4b8387a33789392027e3f90382dc9f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
