diff --git a/INSTALL.md b/INSTALL.md index 845c04ee5..fd68a736d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -96,11 +96,11 @@ Push the tag. $ git push --tags -Merge the "master" branch into the "support/2.1" branch (using --ff-only). +Merge the "master" branch into the "support/2.2" branch (using --ff-only). - $ git checkout support/2.1 + $ git checkout support/2.2 $ git merge --ff-only master - $ git push origin support/2.1 + $ git push origin support/2.2 Note: CMake determines the Icinga 2 version number using `git describe` if the source directory is contained in a Git repository. Otherwise the version number @@ -113,12 +113,12 @@ disable the usage of `git describe`. Use `git archive` to build the release tarball: - $ VERSION=2.2.1 + $ VERSION=2.2.2 $ git archive --format=tar --prefix=icinga2-$VERSION/ tags/v$VERSION | gzip >icinga2-$VERSION.tar.gz Finally you should verify that the tarball only contains the files it should contain: - $ VERSION=2.2.1 + $ VERSION=2.2.2 $ tar ztf icinga2-$VERSION.tar.gz | less @@ -178,12 +178,13 @@ the git repository checkout: Icinga 2 comes with a single binary that takes care of loading all the relevant components (e.g. for check execution, notifications, etc.): - # /usr/sbin/icinga2 - [2014-06-13 15:29:16 +0200] information/icinga-app: Icinga application loader (version: v2.0.0-beta2-17-gd9289ad) - [2014-06-13 15:29:16 +0200] information/icinga-app: Loading application type: icinga/IcingaApplication - [2014-06-13 15:29:16 +0200] information/Utility: Loading library 'libicinga.so' - [2014-06-13 15:29:16 +0200] information/ConfigCompiler: Adding include search dir: /usr/share/icinga2/include - [2014-06-13 15:29:16 +0200] critical/icinga-app: You need to specify at least one config file (using the --config option). + # /usr/sbin/icinga2 daemon + [2014-12-18 10:20:49 +0100] information/cli: Icinga application loader (version: v2.2.2) + [2014-12-18 10:20:49 +0100] information/cli: Loading application type: icinga/IcingaApplication + [2014-12-18 10:20:49 +0100] information/Utility: Loading library 'libicinga.so' + [2014-12-18 10:20:49 +0100] information/ConfigCompiler: Compiling config file: /home/gbeutner/i2/etc/icinga2/icinga2.conf + [2014-12-18 10:20:49 +0100] information/ConfigCompiler: Compiling config file: /home/gbeutner/i2/etc/icinga2/constants.conf + ... Icinga 2 can be started as daemon using the provided init script: