[omd-commits] OMD Git: omd: Add comment to CORE.hook

git version control git at mathias-kettner.de
Sun Jun 23 10:57:42 CEST 2013


Module:   omd
Branch:   master
Commit:   5af8e66c505d47fce777e9964fa23c076b349fab
URL:      http://omdistro.org/projects/omd/repository/revisions/5af8e66c505d47fce777e9964fa23c076b349fab

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Sun Jun 23 10:57:49 2013 +0200
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Sun Jun 23 10:57:49 2013 +0200

Add comment to CORE.hook

---

 packages/omd/CORE.hook |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/omd/CORE.hook b/packages/omd/CORE.hook
index d991798..178cc53 100755
--- a/packages/omd/CORE.hook
+++ b/packages/omd/CORE.hook
@@ -53,6 +53,8 @@ case "$1" in
             make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf 
             make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf 
             make_link nagios $OMD_ROOT/etc/init.d/core
+            # Beware: do not change the number of spaces before '='. Otherwise we will get severe
+            # merge conflicts at 'omd mv'
             sed -i -e "s|^nagios_binary[[:space:]]*=.*$|nagios_binary               = '$OMD_ROOT/bin/$2'|" $OMD_ROOT/etc/check_mk/defaults
             sed -i -e "s|^nagios_config_file[[:space:]]*=.*$|nagios_config_file          = '$OMD_ROOT/tmp/$2/$2.cfg'|" $OMD_ROOT/etc/check_mk/defaults
             sed -i -e "s|^nagios_url[[:space:]]*=.*$|nagios_url                  = '/$OMD_SITE/$2'|" $OMD_ROOT/etc/check_mk/defaults



More information about the omd-commits mailing list