|
[-]
[+]
|
Changed |
icinga-web.changes
|
|
|
|
[-]
[+]
|
Changed |
icinga-web.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
icinga-web-1.5.1-accessxml.patch
^
|
| @@ -1,35 +0,0 @@
---- app/modules/Api/config/access.xml.in.orig 2011-09-11 14:29:57.885530821 +0200
-+++ app/modules/Api/config/access.xml.in 2011-09-11 14:31:50.405132524 +0200
-@@ -24,7 +24,7 @@
- <!-- allowed to read to and from -->
- <readwrite>
- <folders>
-- <resource name="icinga_objects">/usr/local/icinga/etc/objects</resource>
-+ <resource name="icinga_objects">/etc/icinga/objects</resource>
- </folders>
- <files>
- <!-- <resource name="icinga_cfg">/usr/local/icinga/etc/icinga.cfg</resource>-->
-@@ -36,7 +36,7 @@
- <!-- allowed to be written to -->
- <write>
- <files>
-- <resource name="icinga_pipe">/usr/local/icinga/var/rw/icinga.cmd</resource>
-+ <resource name="icinga_pipe">@api_cmd_file@</resource>
- </files>
- </write>
- <!-- allowed to be executed -->
-@@ -44,12 +44,12 @@
- <files>
- <resource name="icinga_service">/etc/init.d/icinga</resource>
-
-- <resource name="icinga_bin">/usr/local/icinga/bin/icinga</resource>
-+ <resource name="icinga_bin">/usr/sbin/icinga</resource>
- <resource name="echo">/bin/echo</resource>
- <resource name="printf">printf</resource>
- <resource name="cp">/bin/cp</resource>
- <resource name="ls">/bin/ls</resource>
-- <resource name="grep">/bin/grep</resource>
-+ <resource name="grep">/usr/bin/grep</resource>
- </files>
- </execute>
- </access>
|
|
[-]
[+]
|
Deleted |
icinga-web-1.5.1-apacheconfig.patch
^
|
| @@ -1,11 +0,0 @@
---- Makefile.in.orig 2011-09-10 13:25:44.957310010 +0200
-+++ Makefile.in 2011-09-10 13:26:04.783533098 +0200
-@@ -181,7 +181,7 @@
- ln -sf $(DESTDIR)$(prefix)/lib/ext3 $(DESTDIR)$(prefix)/pub/js/ext3
-
- install-apache-config:
-- ${INSTALL} -b -m 664 $(INSTALL_OPTS) etc/apache2/icinga-web.conf $(DESTDIR)$(WEB_APACHE_PATH)/icinga-web.conf
-+ ${INSTALL} -b -m 664 etc/apache2/icinga-web.conf $(DESTDIR)$(WEB_APACHE_PATH)/icinga-web.conf
- @printf "\nInstalled configuration in '%s'.\n" "$(WEB_APACHE_PATH)"
- @printf "Please make sure that the directory is included or \n"
- @printf "include %s/icinga-web.conf manually.\n" "$(WEB_APACHE_PATH)"
|
|
[-]
[+]
|
Deleted |
icinga-web-1.5.1-logdir.patch
^
|
| @@ -1,21 +0,0 @@
---- Makefile.in.orig 2011-08-15 23:54:07.759181030 +0200
-+++ Makefile.in 2011-08-15 23:54:33.256620771 +0200
-@@ -202,7 +202,7 @@
- cd $(SRC_SITE) && $(MAKE)
-
- install-log:
-- $(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(LOGDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(LOGDIR)
-
- install-all: install-lib install-pub install-etc install-bin install-doc install-app install-log
-
---- app/Makefile.in.orig 2011-09-09 23:02:22.053238842 +0200
-+++ app/Makefile.in 2011-09-09 23:02:36.930269635 +0200
-@@ -32,6 +32,6 @@
- $(INSTALL) -m 755 $(INSTALL_OPTS_CACHE) -d $(DESTDIR)$(prefix)/app/cache
- $(INSTALL) -m 755 $(INSTALL_OPTS_CACHE) -d $(DESTDIR)$(prefix)/app/cache/config
-
-- $(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(LOGFOLDER)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(LOGFOLDER)
- $(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/app/data/tmp
- $(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/app/modules/Reporting/data
|
|
[-]
[+]
|
Deleted |
icinga-web-1.5.1-webcfgdir.patch
^
|
| @@ -1,20 +0,0 @@
---- etc/sitecfg/Makefile.in.orig 2011-09-10 12:17:09.576801810 +0200
-+++ etc/sitecfg/Makefile.in 2011-09-10 12:17:31.474570009 +0200
-@@ -15,10 +15,10 @@
- $(INSTALL) -m 755 $(INSTALL_OPTS) settings.site.xml $(DESTDIR)$(prefix)/app/config/settings.site.xml
- $(INSTALL) -m 755 $(INSTALL_OPTS) factories.site.xml $(DESTDIR)$(prefix)/app/config/factories.site.xml
-
-- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)$(WEB_CFG_DIR)
-- $(INSTALL) -m 755 $(INSTALL_OPTS) access.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/access.xml
-- $(INSTALL) -m 755 $(INSTALL_OPTS) auth.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/auth.xml
-- $(INSTALL) -m 755 $(INSTALL_OPTS) databases.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/databases.xml
-- $(INSTALL) -m 755 $(INSTALL_OPTS) cronks.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/cronks.xml
-- $(INSTALL) -m 755 $(INSTALL_OPTS) translation.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/translation.xml
-- $(INSTALL) -m 755 $(INSTALL_OPTS) reporting.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/reporting.xml
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(WEB_CFG_DIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) access.xml $(DESTDIR)$(WEB_CFG_DIR)/access.xml
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) auth.xml $(DESTDIR)$(WEB_CFG_DIR)/auth.xml
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) databases.xml $(DESTDIR)$(WEB_CFG_DIR)/databases.xml
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) cronks.xml $(DESTDIR)$(WEB_CFG_DIR)/cronks.xml
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) translation.xml $(DESTDIR)$(WEB_CFG_DIR)/translation.xml
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) reporting.xml $(DESTDIR)$(WEB_CFG_DIR)/reporting.xml
|
|
|
Changed |
icinga-web-1.5.2.tar.bz2
^
|
