Use Utility::GetFQDN for the NodeName variable.

[icinga2] / INSTALL

diff --git a/INSTALL b/INSTALL
index b3b4fc195777ed99818cd79a69149ee6ec4ec716..603514e304588481910da120f0c3a0e7651a595c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -30,7 +30,6 @@ parentheses):
 * GNU bison (bison)
 * GNU flex (flex) >= 2.5.35
 * recommended: libexecinfo on FreeBSD
-* optional: Doxygen (doxygen)
 * optional: MySQL (mysql-devel on RHEL, libmysqlclient-dev on Debian)
 * optional: Python (python-devel on RHEL, python-dev on Debian)
 
@@ -71,10 +70,18 @@ $ git status
 
 Here's a short check-list for releases:
 
+* Update the .mailmap and AUTHORS files
+    $ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
 * Bump the version in icinga2.spec.
 * Update the ChangeLog and doc/1-about.md files.
 * Commit these changes to the "next" branch and create a signed tag (tags/v<VERSION>).
+    $ git commit -v -a -m "Release version <VERSION>."
+    $ git tag -u EE8E0720 -m "Version <VERSION>" v<VERSION>
+    $ git push --tags
 * Merge the "next" branch into the "master" branch (using --ff-only).
+    $ git checkout master
+    $ git merge --ff-only next
+    $ git push origin master
 * Bump the version to "v<NEXT-VERSION>-dev" and commit this change to the "next" branch.
 
 Note: CMake determines the Icinga 2 version number using "git describe" if the
@@ -113,6 +120,7 @@ variables are supported:
 - ICINGA2_USER: The user Icinga 2 should run as; defaults to "icinga"
 - ICINGA2_GROUP: The group Icinga 2 should run as; defaults to "icinga"
 - ICINGA2_COMMAND_USER: The command user Icinga 2 should use; defaults to "icinga"
+- ICINGA2_GIT_VERSION_INFO: Whether to use Git to determine the version number; defaults to "ON"
 - ICINGA2_COMMAND_GROUP: The command group Icinga 2 should use; default to "icingacmd"
 - CMAKE_INSTALL_SYSCONFDIR: The configuration directory; defaults to CMAKE_INSTALL_PREFIX/etc
 - CMAKE_INSTALL_LOCALSTATEDIR: The state directory; defaults to CMAKE_INSTALL_PREFIX/var