[icinga-checkins] icinga.org: icinga-vagrant/master: Update requirements and make autoclrf= false on Windows a hard clone requirement

git at icinga.org git at icinga.org
Thu May 5 15:09:37 CEST 2016


Module: icinga-vagrant
Branch: master
Commit: 1b93c1940845e4ab816a16c86fce2c76b6b3a0f9
URL:    https://git.icinga.org/?p=icinga-vagrant.git;a=commit;h=1b93c1940845e4ab816a16c86fce2c76b6b3a0f9

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Thu May  5 15:08:59 2016 +0200

Update requirements and make autoclrf=false on Windows a hard clone requirement

refs #11727

---

 README.md |  181 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 98 insertions(+), 83 deletions(-)

diff --git a/README.md b/README.md
index 8ae2c54..e15d241 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,101 @@
 
 Icinga Vagrant boxes used for development, tests and demo cases.
 
-## Icinga 2 Standalone
+* [Icinga 2 Standalone](README.md#icinga2x)
+* [Icinga 2 Cluster](README.md#icinga2x-cluster)
+* [Icinga 2 and Graylog](README.md#icinga2x-graylog)
+* [Icinga 1.x](README.md#icinga1x)
+
+## Requirements
+
+Each Vagrant box setup requires at least 2 Cores and 1 GB RAM.
+The required resources are automatically configured during the
+`vagrant up` run.
+
+* Vagrant >= 1.6.5 from http://www.vagrantup.com
+
+One of these virtualization providers:
+
+* Virtualbox >= 4.2.16 from http://www.virtualbox.org
+* Parallels Desktop Pro/Business >= 11 from http://www.parallels.com/products/desktop/
+
+### Windows
+
+In addition the listed requirements you'll need:
+
+* SSH provided by the Git package from http://msysgit.github.io
+* Ruby for Windows from http://rubyinstaller.org (add Ruby executables to PATH)
+
+Install the Git package and set `autocrlf` to `false` (either in the setup
+dialog or using the cmd shell):
+
+    git config core.autocrlf false
+
+Then clone this repository:
+
+    git clone https://github.com/Icinga/icinga-vagrant
+
+### Virtualbox Provider
+
+If Virtualbox is installed, this will be enabled by default.
+
+### Parallels Provider
+
+You'll need to install the [vagrant-parallels](http://parallels.github.io/vagrant-parallels/docs/)
+plugin first:
+
+    $ vagrant plugin install vagrant-parallels
+
+## Support
+
+Please note that these boxes are built for development and tests only. Productive
+setups are not supported.
+
+In case you've found a problem or want to submit a patch, please open an issue
+at [dev.icinga.org](https://dev.icinga.org/projects/icinga-tools/issues).
+
+## Before you start
+
+Change the directory to the box you want to start.
+
+Example icinga2x:
+
+    $ cd icinga2x
+
+You can only do `vagrant up` in a box directory. Verify that
+by checking for the existance of the `Vagrantfile` file in the current
+directory.
+
+    $ pwd
+    /home/michi/coding/icinga/icinga-vagrant/icinga2x
+    $ ls -la Vagrantfile
+    -rw-------. 1 michi michi 1,4K 28. Aug 12:11 Vagrantfile
+
+### Vagrant Commands
+
+* `vagrant up` starts all vms for this box setup
+* `vagrant halt` stops all vms for this box setup
+* `vagrant provision` updates packages/resets configuration for all vms
+* `vagrant ssh` puts you into an ssh shell with login `vagrant` (**Tip**: Use `sudo -i` to become `root`)
+
+> **Note**
+>
+> Multi-VM boxes require the hostname for `vagrant ssh` like so: `vagrant ssh icinga2b`.
+> That works in a similar fashion for other sub commands.
+
+If your box is broken, you can destroy it using `vagrant destroy`. Next `vagrant up`
+run will use the already imported base box, re-running the provisioner to install
+the packages and configuration.
+
+### More Usability Hints
+
+Follow the instructions described in the `README.md` file
+for each box.
+
+Choose one of the available boxes below.
+
+
+## <a id="icinga2x"></a>Icinga 2 Standalone
 
 * 1 VM
 * Icinga 2 Core
@@ -43,7 +137,7 @@ Note: In case Dashing is not running, restart it manually:
 Access [https://192.168.33.5:5665/v1/objects/hosts](https://192.168.33.5:5665/v1/objects/hosts)
 using the credentials `root/icinga`. More details in the [documentation](http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/icinga2-api#icinga2-api).
 
-## Icinga 2 Cluster
+## <a id="icinga2x-cluster"></a>Icinga 2 Cluster
 
 * 2 VMs as Icinga 2 Master/Checker Cluster
 * Icinga 2 Core, DB IDO MySQL, Icinga Web 2
@@ -67,7 +161,7 @@ and [https://192.168.33.20:5665/v1/objects/hosts](https://192.168.33.20:5665/v1/
 using the credentials `root/icinga`.
 
 
-## Icinga 2 and Graylog
+## <a id="icinga2x-graylog"></a>Icinga 2 and Graylog
 
 * 1 VM
 * Icinga 2 Core
@@ -84,7 +178,7 @@ Run Vagrant:
   Icinga Web 2     | http://192.168.33.6/icingaweb2  | icingaadmin/icinga
   Graylog          | http://192.168.33.6:9000        | admin/admin
 
-## Icinga 1.x
+## <a id="icinga1x"></a>Icinga 1.x
 
 * 1 VM
 * Icinga 1.x Core, IDOUtils MySQL, Classic UI, Web
@@ -104,85 +198,6 @@ credentials.
   Icinga Web 1.x    | :8081/icinga-web	    | root/password
   Jasperserver	    | :8082/jasperserver    | jasperadmin/jasperadmin
 
-## Requirements
-
-Each Vagrant box setup requires at least 2 Cores and 1 GB RAM.
-The required resources are automatically configured during the
-`vagrant up` run.
-
-* Vagrant >= 1.6.5 from http://www.vagrantup.com
-
-One of these virtualization providers:
-
-* Virtualbox >= 4.2.16 from http://www.virtualbox.org
-* Parallels Desktop Pro/Business >= 11 from http://www.parallels.com/products/desktop/
-
-Windows users require additionally
-
-* SSH provided by the Git package from http://msysgit.github.io
-* Ruby for Windows from http://rubyinstaller.org (add Ruby executables to PATH)
-
-You can use `init.sh` (Linux) and `init.bat` (Windows) to check the pre-requisites.
-
-### Virtualbox Provider
-
-If Virtualbox is installed, this will be enabled by default.
-
-### Parallels Provider
-
-You'll need to install the [vagrant-parallels](http://parallels.github.io/vagrant-parallels/docs/)
-plugin first:
-
-    $ vagrant plugin install vagrant-parallels
-
-## Support
-
-Please note that these boxes are built for development and tests only. Productive
-setups are not supported.
-
-In case you've found a problem or want to submit a patch, please open an issue
-at [dev.icinga.org](https://dev.icinga.org/projects/icinga-tools/issues).
-
-## Before you start
-
-Change the directory to the box you want to start.
-
-Example icinga2x:
-
-    $ cd icinga2x
-
-You can only do `vagrant up` in a box directory. Verify that
-by checking for the existance of the `Vagrantfile` file in the current
-directory.
-
-    $ pwd
-    /home/michi/coding/icinga/icinga-vagrant/icinga2x
-    $ ls -la Vagrantfile
-    -rw-------. 1 michi michi 1,4K 28. Aug 12:11 Vagrantfile
-
-### Vagrant Commands
-
-* `vagrant up` starts all vms for this box setup
-* `vagrant halt` stops all vms for this box setup
-* `vagrant provision` updates packages/resets configuration for all vms
-* `vagrant ssh` puts you into an ssh shell with login `vagrant` (**Tip**: Use `sudo -i` to become `root`)
-
-> **Note**
->
-> Multi-VM boxes require the hostname for `vagrant ssh` like so: `vagrant ssh icinga2b`.
-> That works in a similar fashion for other sub commands.
-
-If your box is broken, you can destroy it using `vagrant destroy`. Next `vagrant up`
-run will use the already imported base box, re-running the provisioner to install
-the packages and configuration.
-
-### More Usability Hints
-
-Follow the instructions described in the `README.md` file
-for each box.
-
-Choose one of the available boxes below.
-
 ## Misc
 
 ### Port Forwarding Overview



More information about the icinga-checkins mailing list