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

git at icinga.org git at icinga.org
Mon Jun 20 19:22:24 CEST 2011


Module: icinga-core
Branch: r1.4
Commit: d29f92aef068398b61665521724751348e0ea6c3
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=d29f92aef068398b61665521724751348e0ea6c3

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                                        |    5 +++++
 module/idoutils/Makefile.in                        |    2 +-
 .../{idoutils.cfg.in => idoutils.cfg-sample.in}    |    0 
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index f824387..4403dad 100644
--- a/Changelog
+++ b/Changelog
@@ -15,6 +15,7 @@ FIXES
 * idoutils: do not update start_time of already started downtimes #1658
 * idoutils: fix started downtime update for table scheduleddowntime in oracle #1658
 
+* install: fix make install-idoutils overwrites sample - adding idoutils.cfg-sample instead #1625
 
 
 1.4.1 - 08/06/2011
diff --git a/configure b/configure
index aa0720b..09bc3ca 100755
--- a/configure
+++ b/configure
@@ -8307,7 +8307,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 0e66961..752d3aa 100644
--- a/configure.in
+++ b/configure.in
@@ -1205,7 +1205,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 c88b1cf..ca0e360 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
@@ -242,6 +243,10 @@ fi
 
 
 %changelog
+<<<<<<< HEAD
+* Mon Jun 20 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.4.2-1
+- update to 1.4.2, mv idoutils.cfg-sample
+
 * Sun Jun 05 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.4.1-1
 - update to 1.4.1
 
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