MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64609
Change subject: Move site.pp to e default, ignore site.pp
......................................................................
Move site.pp to e default, ignore site.pp
site.pp should be the per-user configuration, so the default file
shouldn't get touched and we should .gitignore the site.pp file.
The docs should now say "copy site.default.pp to site.pp and begin
changing things to fit your desired configuration" instead of just
suggesting that you start editing.
Change-Id: Id20b0d0eadfd15dff1f69f45a41cacb283bb3b4a
---
M .gitignore
M Vagrantfile
R puppet/manifests/site.default.pp
3 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/09/64609/1
diff --git a/.gitignore b/.gitignore
index ef4f9e6..3c34a91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/LocalSettings.php
tags
/mediawiki/
+/puppet/manifests/site.pp
diff --git a/Vagrantfile b/Vagrantfile
index b0a7c0b..13c799c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -85,7 +85,11 @@
config.vm.provision :puppet do |puppet|
puppet.module_path = 'puppet/modules'
puppet.manifests_path = 'puppet/manifests'
- puppet.manifest_file = 'site.pp'
+ puppet.manifest_file = 'site.default.pp'
+
+ if File.exist?(File.join(puppet.manifests_path, 'site.pp'))
+ puppet.manifest_file = 'site.pp'
+ end
puppet.options = [
'--verbose',
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.default.pp
similarity index 100%
rename from puppet/manifests/site.pp
rename to puppet/manifests/site.default.pp
--
To view, visit https://gerrit.wikimedia.org/r/64609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id20b0d0eadfd15dff1f69f45a41cacb283bb3b4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
