jenkins-bot has submitted this change and it was merged. Change subject: Vagrantfile: fix typo; add Xdebug example ......................................................................
Vagrantfile: fix typo; add Xdebug example This change adds a commented-out configuration directive to forward port 9000. This is meant to facilitate the configuration of remote debugging via Xdebug. The change also corrects the Vagrantfile-extra.rb file name in the comment block. Change-Id: I31184864b1ac793f96f15cb1dbdfb39424835e60 --- M Vagrantfile 1 file changed, 9 insertions(+), 7 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/Vagrantfile b/Vagrantfile index ba72218..fe53304 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,9 +10,9 @@ # # If you would like to customize the configuration of your Virtual Machine, # rather than override the values defined in this file, simply create a file -# called 'Vagrantfile-extra' in this folder and it will be automatically +# called 'Vagrantfile-extra.rb' in this folder and it will be automatically # loaded. In case of conflict, values in the 'extra' file will superceded -# any values in this file. 'Vagrantfile-extra' is ignored by git. +# any values in this file. 'Vagrantfile-extra.rb' is ignored by git. # # Please report bugs in this file on Wikimedia's Bugzilla: # https://bugzilla.wikimedia.org/enter_bug.cgi?product=Tools&component=Vagrant @@ -44,7 +44,7 @@ Vagrant.configure('2') do |config| - config.vm.hostname = 'mediawiki-vagrant' + config.vm.hostname = 'mediawiki-vagrant.dev' config.package.name = 'mediawiki.box' # Note: If you rely on Vagrant to retrieve the box, it will not @@ -59,10 +59,12 @@ ip: '10.11.12.13' config.vm.network :forwarded_port, - guest: 80, - host: 8080, - id: 'http', - auto_correct: true + guest: 80, host: 8080, id: 'http' + + # To enable remote debugging via Xdebug, uncomment these two lines and add + # the 'remote_debug' role in puppet/manifests/site.pp: + # config.vm.network :forwarded_port, + # guest: 9000, host: 9000, id: 'xdebug' config.vm.synced_folder '.', '/vagrant', id: 'vagrant-root', -- To view, visit https://gerrit.wikimedia.org/r/66346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31184864b1ac793f96f15cb1dbdfb39424835e60 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Ori.livneh <[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
