Merge branch 'update_readme' of gitlab.eox.at:vagrant/builder_rpm

Readme.md

@@ -14,8 +14,9 @@ Currently we _automagically_ install the build dependencies for the following pr
 * Install vagrant, see http://docs.vagrantup.com/v1/docs/getting-started/index.html for more information.
 * Clone this project!
   ```
-  git clone git@gitlab.eox.at:vagrant/builder_rpm.git ./
+  git clone https://gitlab.eox.at/vagrant/builder_rpm.git ./
   ```
+* Edit the _Vagrantfile_ and update the project (see the beginning of [Vagrantfile](/vagrant/builder_rpm/tree/master/Vagrantfile))
 * Copy your source archive into the _build/SOURCES_ folder
 * Copy your spec file into the _build/SPECS_ folder 
 * Start the VM

Vagrantfile

 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+# Change me! (every time you want to build a different RPM) And make sure somebody
+# wrote a identically named puppet module. See puppet/modules for a list of 
+# available modules
+project = 'eox-release'
+
+#
+# You should not need to change anything below this line!
+#
+
 Vagrant::Config.run do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
@@ -47,7 +56,7 @@ Vagrant::Config.run do |config|
   # are contained in a directory path relative to this Vagrantfile.
   # You will need to create the manifests directory and a manifest in
   # the file rpmbuild.pp in the manifests_path directory.
-  config.vm.provision :puppet, :facter => { "project" => "mapserver" } do |puppet|
+  config.vm.provision :puppet, :facter => { "project" => project } do |puppet|
     puppet.manifests_path = "puppet/manifests"
     puppet.manifest_file  = "rpmbuild.pp"
     puppet.module_path = "puppet/modules"

puppet/manifests/rpmbuild.pp

@@ -4,8 +4,4 @@
 include buildtools
 
 notify { "Installing build dependencies for <$project>!": }
-case $project {
-	'eox-release': { include eox-release }
-	'rasdaman': { include rasdaman }
-	'mapserver': { include mapserver }
-}
\ No newline at end of file
+include $project
\ No newline at end of file