Changes - j0ke.net Open Build Service

Changes of Revision 46

[-] [+]	Changed	icinga-web.spec
@@ -31,6 +31,7 @@ Patch0: icinga-web-1.5.1-logdir.patch Patch1: icinga-web-1.5.1-webcfgdir.patch Patch2: icinga-web-1.5.1-apacheconfig.patch +Patch3: icinga-web-1.5.1-accessxml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: php >= 5.2.3 php-pear php-gd php-xml php-ldap php-pdo php-dom php-spl php-xsl php-mysql pcre >= 7.6 icinga-api BuildRequires: mysql-client @@ -65,6 +66,7 @@ %patch0 %patch1 %patch2 +%patch3 ############################## %build ############################## @@ -84,15 +86,9 @@ --with-web-user='%{apacheuser}' \ --with-web-group='%{apacheuser}' \ --with-web-apache-path='%{apacheconfdir}' \ - --with-icinga-api='%{_datadir}/icinga/icinga-api' \ --with-api-cmd-file=/var/log/icinga/rw/icinga.cmd \ --with-log-folder=/var/log/icinga/api \|\| cat config.log -# --with-db-type, --with-db-host, --with-db-port, --with-db-name, --with-db-user, --with-db-pass - -# resolve possible wrong files for makefile -#%{__make} devclean - ############################## %install ##############################
[-] [+]	Added	icinga-web-1.5.1-accessxml.patch ^
@@ -0,0 +1,35 @@ +--- 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>