Awjrichards has uploaded a new change for review.
https://gerrit.wikimedia.org/r/115555
Change subject: Set wgCookieDomain to host name
......................................................................
Set wgCookieDomain to host name
Since by default mw-vagrant runs at 127.0.0.1:8080 with wgCookieDomain
unchaged from DefaultSettings.php, the domain for cookies set will be
127.0.0.1:8080. Having the port number included can cause problems,
including browsers not properly setting a cookie. This change sets
wgCookieDomain to the value set in for host_name, which defaults to
127.0.0.1.
I wasn't 100% positive where this change should occur, but I stuck in
the mediawiki role since that's where the server URL gets defined.
Change-Id: Ie2807982a7b823efa620bbe90cd9b5cba1bbbe6b
---
M puppet/manifests/roles/mediawiki.pp
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/55/115555/1
diff --git a/puppet/manifests/roles/mediawiki.pp
b/puppet/manifests/roles/mediawiki.pp
index a50f205..c6b38b6 100644
--- a/puppet/manifests/roles/mediawiki.pp
+++ b/puppet/manifests/roles/mediawiki.pp
@@ -5,12 +5,13 @@
include role::mysql
$wiki_name = 'devwiki'
+ $host_name = '127.0.0.1'
# 'forwarded_port' defaults to 8080, but may be overridden by
# changing the value of 'FORWARDED_PORT' in Vagrantfile.
$server_url = $::forwarded_port ? {
- undef => 'http://127.0.0.1',
- default => "http://127.0.0.1:${::forwarded_port}";,
+ undef => 'http://${host_name}',
+ default => "http://${host_name}:${::forwarded_port}";,
}
$dir = '/vagrant/mediawiki'
@@ -43,4 +44,8 @@
upload_dir => $upload_dir,
server_url => $server_url,
}
+
+ mediawiki::settings { 'Cookie domain':
+ values => { 'wgCookieDomain' => $host_name }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/115555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2807982a7b823efa620bbe90cd9b5cba1bbbe6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awjrichards <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
