[icinga-checkins] icinga.org: icinga-core/test/cgis: install: fix make install-idoutils overwrites sample - adding idoutils. cfg-sample instead #1625

git at icinga.org git at icinga.org
Tue Jul 5 21:38:13 CEST 2011


Module: icinga-core
Branch: test/cgis
Commit: 6e9e78f686c0aa0de436e66b840984a6a122ab66
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=6e9e78f686c0aa0de436e66b840984a6a122ab66

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Jun 16 18:14:23 2011 +0200

install: fix make install-idoutils overwrites sample - adding idoutils.cfg-sample instead #1625

fixes #1625

---

 Changelog                                          |    1 +
 configure                                          |    2 +-
 configure.in                                       |    2 +-
 icinga.spec                                        |    3 ++-
 module/idoutils/Makefile.in                        |    2 +-
 .../{idoutils.cfg.in => idoutils.cfg-sample.in}    |    0 
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 4c9c5f7..9d98de5 100644
--- a/Changelog
+++ b/Changelog
@@ -28,6 +28,7 @@ FIXES
 * classic ui: remove sidebar.html inclusion in index.html causing troubles on reload #1632
 
 * install: fix event handlers cmd file location in contrib #1501
+* install: fix make install-idoutils overwrites sample - adding idoutils.cfg-sample instead #1625
 
 * config: deprecate log_external_commands_user #1619
 * config: tune icinga.cfg for performance, enable_environment_macros=0, enable_embedded_perl=0 by default #1635
diff --git a/configure b/configure
index 15492b3..a49bad2 100755
--- a/configure
+++ b/configure
@@ -8326,7 +8326,7 @@ echo ""
 echo "Creating sample config files in module/idoutils/config/ ..."
 
 perl subst $srcdir/module/idoutils/config/icinga.cfg
-perl subst $srcdir/module/idoutils/config/idoutils.cfg
+perl subst $srcdir/module/idoutils/config/idoutils.cfg-sample
 perl subst $srcdir/module/idoutils/config/ido2db.cfg-sample
 perl subst $srcdir/module/idoutils/config/idomod.cfg-sample
 
diff --git a/configure.in b/configure.in
index 3a0aef6..73abb86 100644
--- a/configure.in
+++ b/configure.in
@@ -1214,7 +1214,7 @@ echo ""
 echo "Creating sample config files in module/idoutils/config/ ..."
 
 perl subst $srcdir/module/idoutils/config/icinga.cfg
-perl subst $srcdir/module/idoutils/config/idoutils.cfg
+perl subst $srcdir/module/idoutils/config/idoutils.cfg-sample
 perl subst $srcdir/module/idoutils/config/ido2db.cfg-sample
 perl subst $srcdir/module/idoutils/config/idomod.cfg-sample
 
diff --git a/icinga.spec b/icinga.spec
index 2add166..8d5fd42 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -140,6 +140,7 @@ Documentation for %{name}
 ### move idoutils sample configs to final name
 mv %{buildroot}%{_sysconfdir}/icinga/ido2db.cfg-sample %{buildroot}%{_sysconfdir}/icinga/ido2db.cfg
 mv %{buildroot}%{_sysconfdir}/icinga/idomod.cfg-sample %{buildroot}%{_sysconfdir}/icinga/idomod.cfg
+mv %{buildroot}%{_sysconfdir}/icinga/modules/idoutils.cfg-sample %{buildroot}%{_sysconfdir}/icinga/modules/idoutils.cfg
 
 ### copy idoutils db-script
 cp -r module/idoutils/db %{buildroot}%{_sysconfdir}/icinga/idoutils
@@ -243,7 +244,7 @@ fi
 
 %changelog
 * Wed May 18 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.5.0-1
-- set to 1.5.0 target, remove provides nagios version
+- set to 1.5.0 target, remove provides nagios version, set idoutils.cfg-sample
 
 * Wed May 11 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.4.0-2
 - undo changes on icinga-cmd group, use icingacmd like before
diff --git a/module/idoutils/Makefile.in b/module/idoutils/Makefile.in
index c8d0ed2..dfaad3e 100644
--- a/module/idoutils/Makefile.in
+++ b/module/idoutils/Makefile.in
@@ -47,5 +47,5 @@ install:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
 	$(INSTALL) -m 664 $(INSTALL_OPTS) config/ido2db.cfg-sample $(DESTDIR)$(CFGDIR)
 	$(INSTALL) -m 664 $(INSTALL_OPTS) config/idomod.cfg-sample $(DESTDIR)$(CFGDIR)
-	$(INSTALL) -m 664 $(INSTALL_OPTS) config/idoutils.cfg $(DESTDIR)$(CFGDIR)/modules
+	$(INSTALL) -m 664 $(INSTALL_OPTS) config/idoutils.cfg-sample $(DESTDIR)$(CFGDIR)/modules
 
diff --git a/module/idoutils/config/idoutils.cfg.in b/module/idoutils/config/idoutils.cfg-sample.in
similarity index 100%
rename from module/idoutils/config/idoutils.cfg.in
rename to module/idoutils/config/idoutils.cfg-sample.in





More information about the icinga-checkins mailing list