jenkins-bot has submitted this change and it was merged.
Change subject: Allow unversioned local overrides of Vagrant configs
......................................................................
Allow unversioned local overrides of Vagrant configs
Bug: 46909
Change-Id: I5d03a020f22dcacc32529c1750ecc8726bcb3e7c
---
M .gitignore
M Vagrantfile
A extra-vagrant-settings.rb
3 files changed, 16 insertions(+), 1 deletion(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index aca2ce6..ae0013f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
.vagrant
-LocalSettings.php
+/extra-vagrant-settings.rb
+/LocalSettings.php
tags
/mediawiki/
diff --git a/Vagrantfile b/Vagrantfile
index eb2ee80..a6fff0c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -84,3 +84,9 @@
end
end
+
+begin
+ require_relative 'extra-vagrant-settings.rb'
+rescue LoadError
+ # No local Vagrantfile overrides.
+end
diff --git a/extra-vagrant-settings.rb b/extra-vagrant-settings.rb
new file mode 100644
index 0000000..7e61e78
--- /dev/null
+++ b/extra-vagrant-settings.rb
@@ -0,0 +1,8 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure('2') do |config|
+
+ # You can override any configurations set by 'Vagrantfile' here.
+
+end
--
To view, visit https://gerrit.wikimedia.org/r/58249
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d03a020f22dcacc32529c1750ecc8726bcb3e7c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
