jenkins-bot has submitted this change and it was merged.
Change subject: New fact "port_fragment"
......................................................................
New fact "port_fragment"
The new port_fragment fact combines the existing forwarded_port fact
with a leading colon (:). This can be used in constructing
self-referential URLs. In labs-vagrant or if the settings[:http_port] is
80 (http default), the port_fragment fact will be undefined.
Change-Id: Ia438cc209a30bb132479fce2202e2c9f9dbd2c43
---
M Vagrantfile
M puppet/hieradata/common.yaml
M puppet/modules/mediawiki/manifests/wiki.pp
M puppet/modules/role/manifests/centralauth.pp
M puppet/modules/role/templates/commons_foreign_repo.php.erb
M puppet/modules/role/templates/gadget_foreign_repo.php.erb
6 files changed, 13 insertions(+), 9 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Vagrantfile b/Vagrantfile
index aa41c91..3c6f9bd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -155,6 +155,10 @@
'environment' => 'vagrant',
}
+ if settings[:http_port] != 80
+ $FACTER['port_fragment'] = ":#{settings[:http_port]}"
+ end
+
if settings[:nfs_shares]
$FACTER['share_owner'] = Process.uid
$FACTER['share_group'] = Process.gid
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 197123f..75d9c6c 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -24,7 +24,7 @@
mediawiki::db_pass: "%{::mysql::root_password}"
mediawiki::admin_user: admin
mediawiki::admin_pass: vagrant
-mediawiki::server_url:
"http://%{::role::mediawiki::hostname}:%{::forwarded_port}";
+mediawiki::server_url:
"http://%{::role::mediawiki::hostname}%{::port_fragment}";
mediawiki::apache::docroot: /var/www
diff --git a/puppet/modules/mediawiki/manifests/wiki.pp
b/puppet/modules/mediawiki/manifests/wiki.pp
index 2c9f15d..6948175 100644
--- a/puppet/modules/mediawiki/manifests/wiki.pp
+++ b/puppet/modules/mediawiki/manifests/wiki.pp
@@ -49,7 +49,7 @@
$src_dir = $::mediawiki::dir,
$cache_dir = $::mediawiki::cache_dir,
$upload_dir = "/srv/${title}images",
- $server_url =
"http://${title}${::mediawiki::multiwiki::base_domain}:${::forwarded_port}";,
+ $server_url =
"http://${title}${::mediawiki::multiwiki::base_domain}${::port_fragment}";,
$primary_wiki = false,
) {
require ::mediawiki::multiwiki
diff --git a/puppet/modules/role/manifests/centralauth.pp
b/puppet/modules/role/manifests/centralauth.pp
index 7e1d728..0e8f9e1 100644
--- a/puppet/modules/role/manifests/centralauth.pp
+++ b/puppet/modules/role/manifests/centralauth.pp
@@ -69,10 +69,10 @@
# Environment variables used by browser tests
env::var { 'MEDIAWIKI_CENTRALAUTH_LOGINWIKI_URL':
- value =>
"http://${loginwiki}${::mediawiki::multiwiki::base_domain}:${::forwarded_port}";,
+ value =>
"http://${loginwiki}${::mediawiki::multiwiki::base_domain}${::port_fragment}";,
}
env::var { 'MEDIAWIKI_CENTRALAUTH_ALTWIKI_URL':
- value =>
"http://${alt_testwiki}${::mediawiki::multiwiki::base_domain}:${::forwarded_port}";,
+ value =>
"http://${alt_testwiki}${::mediawiki::multiwiki::base_domain}${::port_fragment}";,
}
}
diff --git a/puppet/modules/role/templates/commons_foreign_repo.php.erb
b/puppet/modules/role/templates/commons_foreign_repo.php.erb
index e7c130d..d90a003 100644
--- a/puppet/modules/role/templates/commons_foreign_repo.php.erb
+++ b/puppet/modules/role/templates/commons_foreign_repo.php.erb
@@ -4,13 +4,13 @@
'class' => 'ForeignDBViaLBRepo',
'name' => 'shared',
'directory' => '/srv/commonsimages',
- 'url' => '//commons<%=
scope['::mediawiki::multiwiki::base_domain'] %>:<%= scope["::forwarded_port"]
%>/commonsimages',
+ 'url' => '//commons<%=
scope['::mediawiki::multiwiki::base_domain'] %><%= scope['::port_fragment']
%>/commonsimages',
'hashLevels' => 2,
'thumbScriptUrl' => false,
'transformVia404' => true,
'hasSharedCache' => true,
- 'descBaseUrl' => '//commons<%=
scope['::mediawiki::multiwiki::base_domain'] %>:<%= scope["::forwarded_port"]
%>/wiki/File:',
- 'scriptDirUrl' => '//commons<%=
scope['::mediawiki::multiwiki::base_domain'] %>:<%= scope["::forwarded_port"]
%>/w',
+ 'descBaseUrl' => '//commons<%=
scope['::mediawiki::multiwiki::base_domain'] %><%= scope['::port_fragment']
%>/wiki/File:',
+ 'scriptDirUrl' => '//commons<%=
scope['::mediawiki::multiwiki::base_domain'] %><%= scope['::port_fragment']
%>/w',
'fetchDescription' => true,
'wiki' => 'commonswiki',
'initialCapital' => true,
diff --git a/puppet/modules/role/templates/gadget_foreign_repo.php.erb
b/puppet/modules/role/templates/gadget_foreign_repo.php.erb
index 4dfb7d0..2272aae 100644
--- a/puppet/modules/role/templates/gadget_foreign_repo.php.erb
+++ b/puppet/modules/role/templates/gadget_foreign_repo.php.erb
@@ -1,8 +1,8 @@
// For the Gadgets 2.0 role
$wgResourceLoaderSources['gadgetswiki'] = array(
- 'loadScript' => '//gadgets<%=
scope['::mediawiki::multiwiki::base_domain'] %>:<%= scope["::forwarded_port"]
%>/w/load.php',
- 'apiScript' => '//gadgets<%=
scope['::mediawiki::multiwiki::base_domain'] %>:<%= scope["::forwarded_port"]
%>/w/api.php',
+ 'loadScript' => '//gadgets<%=
scope['::mediawiki::multiwiki::base_domain'] %><%= scope["::port_fragment"]
%>/w/load.php',
+ 'apiScript' => '//gadgets<%=
scope['::mediawiki::multiwiki::base_domain'] %><%= scope["::port_fragment"]
%>/w/api.php',
);
$wgGadgetRepositories[] = array(
--
To view, visit https://gerrit.wikimedia.org/r/155462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia438cc209a30bb132479fce2202e2c9f9dbd2c43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
