[icinga-checkins] icinga.org: icinga-core/test/cgis: fix icinga.spec, fix install-cgis and cgilogdir #1715

git at icinga.org git at icinga.org
Sat Jul 16 00:20:00 CEST 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Jul 12 18:48:35 2011 +0200

fix icinga.spec, fix install-cgis and cgilogdir #1715

refs #1715

---

 Makefile.in      |    1 -
 cgi/Makefile.in  |    3 +++
 html/Makefile.in |    6 +++---
 icinga.spec      |   36 ++----------------------------------
 4 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7309726..56ff3ac 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -364,7 +364,6 @@ install-base:
 	cd $(SRC_BASE) && $(MAKE) install
 
 install-cgis:
-	$(INSTALL) -m 775 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(CGILOGDIR)
 	cd $(SRC_CGI) && $(MAKE) install
 
 install:
diff --git a/cgi/Makefile.in b/cgi/Makefile.in
index 9133bb7..d26d631 100644
--- a/cgi/Makefile.in
+++ b/cgi/Makefile.in
@@ -15,8 +15,10 @@ CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
 HTMLDIR=@datarootdir@
+CGILOGDIR=@CGILOGDIR@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
+INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
 COMMAND_OPTS=@COMMAND_OPTS@
 STRIP=@STRIP@
 
@@ -196,6 +198,7 @@ install-unstripped:
 	$(MAKE) install-basic
 
 install-basic:
+	$(INSTALL) -m 775 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(CGILOGDIR)
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
 	for file in *.cgi; do \
 		$(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
diff --git a/html/Makefile.in b/html/Makefile.in
index cb79b11..5b2ecc3 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -9,6 +9,7 @@ CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
 HTMLDIR=@datarootdir@
+CGILOGDIR=@CGILOGDIR@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@
@@ -48,10 +49,9 @@ install:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/interface
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
-	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(HTMLDIR)/log
-	$(INSTALL) -m 444 $(INSTALL_OPTS) log/.htaccess $(DESTDIR)$(HTMLDIR)/log
-	$(INSTALL) -m 644 $(INSTALL_OPTS) log/index.htm $(DESTDIR)$(HTMLDIR)/log
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
+	$(INSTALL) -m 444 $(INSTALL_OPTS) log/.htaccess $(DESTDIR)$(CGILOGDIR)
+	$(INSTALL) -m 644 $(INSTALL_OPTS) log/index.htm $(DESTDIR)$(CGILOGDIR)
 	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
 	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
 	for file in *.html; \
diff --git a/icinga.spec b/icinga.spec
index 32ed424..e74350e 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -129,38 +129,6 @@ Documentation for %{name}
 %{__strip} %{buildroot}%{_bindir}/{icinga,icingastats,log2ido,ido2db}
 %{__strip} %{buildroot}%{_libdir}/icinga/cgi/*.cgi
 
-### FIX log-paths
-#%{__perl} -pi -e '
-#        s|log_file.*|log_file=%{logdir}/icinga.log|;
-#        s|log_archive_path=.*|log_archive_path=%{logdir}/archives|;
-#        s|debug_file=.*|debug_file=%{logdir}/icinga.debug|;
-#   ' %{buildroot}%{_sysconfdir}/icinga/icinga.cfg
-
-### make logdirs
-#%{__mkdir} -p %{buildroot}%{logdir}/
-#%{__mkdir} -p %{buildroot}%{logdir}/api/
-#%{__mkdir} -p %{buildroot}%{logdir}/gui/
-#%{__mkdir} -p %{buildroot}%{logdir}/archives/
-
-### remove PLACEHOLDER
-#rm %{buildroot}%{_datadir}/icinga/icinga-api/log/PLACEHOLDER
-### Move all logging to logdir
-#rmdir %{buildroot}%{_datadir}/icinga/icinga-api/log
-#%{__perl} -pi -e '
-#        s|define\("DEFAULT_API_LOG_FILE",.*|define\("DEFAULT_API_LOG_FILE","%{logdir}/api/icinga-api.log"\);|;
-#   ' %{buildroot}%{_datadir}/icinga/icinga-api/objects/debug/debugTargets/icingaApiFileDebugger.php
-#mv %{buildroot}%{_datadir}/icinga/log/{.htaccess,index.htm} %{buildroot}%{logdir}/gui
-#rmdir %{buildroot}%{_datadir}/icinga/log/
-
-#%{__perl} -pi -e '
-#        s|cgi_log_file.*|cgi_log_file=%{logdir}/gui/icinga-cgi.log|;
-#        s|cgi_log_archive_path=.*|cgi_log_archive_path=%{logdir}/archives|;
-#   ' %{buildroot}%{_sysconfdir}/icinga/cgi.cfg
-#%{__perl} -pi -e "
-#        s|^use constant\tDEBUG_LOG_PATH.*|use constant\tDEBUG_LOG_PATH\t=> '/var/log/icinga/' ;|
-#   " %{buildroot}%{_bindir}/p1.pl
-
-
 ### 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
@@ -241,7 +209,6 @@ fi
 %config(noreplace) %{_sysconfdir}/icinga/cgiauth.cfg
 %{_libdir}/icinga
 %{_libdir}/icinga/cgi
-%{_libdir}/icinga/cgi/*.cgi
 %dir %{_datadir}/icinga
 %{_datadir}/icinga/contexthelp
 %{_datadir}/icinga/images
@@ -280,10 +247,11 @@ fi
 
 
 %changelog
-* Wed June 29 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.5.0-1
+* Wed Jun 29 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.5.0-1
 - set to 1.5.0 target, remove provides nagios version, set idoutils.cfg-sample
 - move all logging to one location https://bugzilla.redhat.com/show_bug.cgi?id=693608
 - add log-dir, cgi-log-dir, phpapi-log-dir to configure, remove the manual creation
+- remove manual logdir creation and movings, as no longer needed
 - add objects/notifications.cfg for further examples
 - fix file perms and locations of cfgs
 - fix group for doc





More information about the icinga-checkins mailing list