summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-11-03 07:47:08 (EDT)
committerSteffen Pingel2012-11-03 07:47:08 (EDT)
commit762a77eab68b798924cb86750d222894d27aaf57 (patch)
tree492dbe45c44b5ef0605522724edbbd10f6b2fb70
parent15c001ab887c84ab4b0b85503056fe75fe38e927 (diff)
downloadorg.eclipse.mylyn.tasks-762a77eab68b798924cb86750d222894d27aaf57.zip
org.eclipse.mylyn.tasks-762a77eab68b798924cb86750d222894d27aaf57.tar.gz
org.eclipse.mylyn.tasks-762a77eab68b798924cb86750d222894d27aaf57.tar.bz2
386344: simplify Vagrant configuration for Tracrefs/changes/05/8505/1
Change-Id: I4d2da7cbc8f508d27541488ef4a2751165b6b97e Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=386344
-rw-r--r--org.eclipse.mylyn.trac.releng/.gitignore1
-rw-r--r--org.eclipse.mylyn.trac.releng/Vagrantfile19
-rw-r--r--org.eclipse.mylyn.trac.releng/manifests/default.pp (renamed from org.eclipse.mylyn.trac.releng/modules/trac/manifests/trac.pp)0
3 files changed, 8 insertions, 12 deletions
diff --git a/org.eclipse.mylyn.trac.releng/.gitignore b/org.eclipse.mylyn.trac.releng/.gitignore
new file mode 100644
index 0000000..8000dd9
--- /dev/null
+++ b/org.eclipse.mylyn.trac.releng/.gitignore
@@ -0,0 +1 @@
+.vagrant
diff --git a/org.eclipse.mylyn.trac.releng/Vagrantfile b/org.eclipse.mylyn.trac.releng/Vagrantfile
index adc58ac..532bb61 100644
--- a/org.eclipse.mylyn.trac.releng/Vagrantfile
+++ b/org.eclipse.mylyn.trac.releng/Vagrantfile
@@ -1,14 +1,9 @@
Vagrant::Config.run do |config|
- config.vm.define :trac do |trac_config|
- trac_config.vm.box = "lucid32"
- trac_config.vm.box_url = "http://files.vagrantup.com/lucid32.box"
+ config.vm.box = "lucid32"
+ config.vm.box_url = "http://files.vagrantup.com/lucid32.box"
- trac_config.vm.provision :puppet do |puppet|
- puppet.module_path = "modules"
- puppet.manifests_path = "modules/trac/manifests"
- puppet.manifest_file = "trac.pp"
- end
- trac_config.vm.forward_port 80, 3080
- trac_config.vm.forward_port 443, 3443
- end
-end \ No newline at end of file
+ config.vm.forward_port 80, 2080
+ config.vm.forward_port 443, 2443
+
+ config.vm.provision :puppet, :module_path => "modules"
+end
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/trac.pp b/org.eclipse.mylyn.trac.releng/manifests/default.pp
index 61a203a..61a203a 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/trac.pp
+++ b/org.eclipse.mylyn.trac.releng/manifests/default.pp