[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: mediawiki: Expose /w/docs for multiwiki

2016-09-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: mediawiki: Expose /w/docs for multiwiki
..


mediawiki: Expose /w/docs for multiwiki

When using JSDuck (`npm run doc`) or Doxygen (mwdocgen.php),
one needs to access /w/docs/js/ or /w/docs/html/ to view it.

Right now it's required for the developer to have another web server
running outside of Vagrant with access to the mediawiki directory.

Test plan:
* Run `vagrant provision` in the vagrant directory on the host.
* Run `npm run doc` from the mediawiki directory.
* View http://localhost:8080/w/docs/js/

Change-Id: I552d72c25ac2257d9e48803d270dd814daa84f8e
---
M puppet/modules/mediawiki/manifests/multiwiki.pp
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Gilles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp 
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index a48ee1f..22a4208 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -172,9 +172,9 @@
 content => template('mediawiki/docroot/w/RunJobs.php.erb'),
 }
 
-file { "${script_dir}/assets":
+file { "${script_dir}/docs":
 ensure => link,
-target => "${::mediawiki::dir}/assets",
+target => "${::mediawiki::dir}/docs",
 }
 
 file { "${script_dir}/extensions":

-- 
To view, visit https://gerrit.wikimedia.org/r/311031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I552d72c25ac2257d9e48803d270dd814daa84f8e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: mediawiki: Expose /w/docs for multiwiki

2016-09-15 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311031

Change subject: mediawiki: Expose /w/docs for multiwiki
..

mediawiki: Expose /w/docs for multiwiki

When using JSDuck (`npm run doc`) or Doxygen (mwdocgen.php),
one needs to access /w/docs/js/ or /w/docs/html/ to view it.

Right now it's required for the developer to have another web server
running outside of Vagrant with access to the mediawiki directory.

Test plan:
* Run `vagrant provision` in the vagrant directory on the host.
* Run `npm run doc` from the mediawiki directory.
* View http://localhost:8080/w/docs/js/

Change-Id: I552d72c25ac2257d9e48803d270dd814daa84f8e
---
M puppet/modules/mediawiki/manifests/multiwiki.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/31/311031/1

diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp 
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index a48ee1f..22a4208 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -172,9 +172,9 @@
 content => template('mediawiki/docroot/w/RunJobs.php.erb'),
 }
 
-file { "${script_dir}/assets":
+file { "${script_dir}/docs":
 ensure => link,
-target => "${::mediawiki::dir}/assets",
+target => "${::mediawiki::dir}/docs",
 }
 
 file { "${script_dir}/extensions":

-- 
To view, visit https://gerrit.wikimedia.org/r/311031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I552d72c25ac2257d9e48803d270dd814daa84f8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits