Attachment 297153 Details for Bug 435593 – set server or local in the .cfg file, use rpm macros for cron script

[patch] set server or local in the .cfg file, use rpm macros for cron script

ocsinventory-agent.spec.diff (text/plain), 1.96 KB, created by Patrice Dumas on 2008-03-07 09:15:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-03-07 09:15:07 UTC

Size: 1.96 KB

patch

obsolete

>--- ocsinventory-agent.spec-orig	2008-03-07 09:49:48.000000000 +0100
>+++ ocsinventory-agent.spec	2008-03-07 10:03:41.000000000 +0100
>@@ -80,18 +80,18 @@
> # Mode, change to "none" to disable
> OCSMODE[0]=cron
> 
>-# Server URL (ex : http://servername/ocsinventory)
>-# Local inventory if empty
>-OCSSERVER[0]=http://%{ocsserver}/ocsinventory
> %else
> # Mode, change to "cron" to activate
> OCSMODE[0]=none
> 
>-# Server URL (ex : http://servername/ocsinventory)
>-# Local inventory if empty
>-OCSSERVER[0]=
> %endif
> 
>+# can be used to override the %{name}.cfg setup.
>+# OCSSERVER[0]=http://your.ocsserver.name/ocsinventory
>+# 
>+# corresponds with --local=%{_localstatedir}/lib/%{name}
>+# OCSSERVER[0]=local
>+
> # Wait before inventory 
> OCSPAUSE[0]=100
> 
>@@ -106,9 +106,14 @@
> # options used by cron job overides this (see /etc/sysconfig/%{name})
> #
> 
>+%if 0%{?ocsserver:1}
>+server = http://%{ocsserver}/ocsinventory
>+
>+%else
> # Server URL, unconmment if needed
> # server = http://your.ocsserver.name/ocsinventory
>-local=%{_localstatedir}/lib/%{name}
>+local = %{_localstatedir}/lib/%{name}
>+%endif
> 
> # Administrative TAG (optional, must be filed before first inventory)
> # tag = your_tag
>@@ -142,11 +147,13 @@
> %{__mkdir_p} %{buildroot}%{_localstatedir}/{log,lib}/%{name}
> 
> %{__mkdir_p} %{buildroot}%{_sysconfdir}/{logrotate.d,sysconfig}
>-%{__install} -m 644 %{SOURCE1}   %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
>+%{__install} -pm 644 %{SOURCE1}   %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
> %{__install} -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name}
> 
> %{__mkdir_p} %{buildroot}%{_sysconfdir}/cron.hourly
>-%{__install} -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
>+sed -e 's;/etc/;%{_sysconfdir}/;' -e 's;/var/;%{_localstatedir}/;' \
>+ -e 's;/usr/sbin/;%{_sbindir}/;' \
>+ %{SOURCE2} > %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
> 
> %{__mkdir_p} %{buildroot}%{_sysconfdir}/ocsinventory
> %{__install} -m 644 %{name}.cfg %{buildroot}%{_sysconfdir}/ocsinventory/%{name}.cfg

Actions: View | Diff

Attachments on bug 435593: 297152 | 297153