Attachment 951765 Details for Bug 1121290 – Patch for movement /etc/amanda/.. to /var/lib/amanda

[patch] Patch for movement /etc/amanda/.. to /var/lib/amanda

amanda.spec.patch (text/plain), 4.09 KB, created by Petr Hracek on 2014-10-29 12:41:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Hracek

Created: 2014-10-29 12:41:19 UTC

Size: 4.09 KB

patch

obsolete

>diff --git a/amanda.spec b/amanda.spec
>index 3efc74f..fc02c90 100644
>--- a/amanda.spec
>+++ b/amanda.spec
>@@ -10,7 +10,7 @@
> Summary: A network-capable tape backup solution
> Name: amanda
> Version: 3.3.6
>-Release: 6%{?dist}
>+Release: 7%{?dist}
> Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
> Source1: amanda.crontab
> Source4: disklist
>@@ -122,6 +122,7 @@ export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie
>            --with-index-server=%{indexserver} \
>            --with-tape-server=%{tapeserver} \
>            --with-config=%{defconfig} \
>+           --with-configdir=%{_localstatedir}/lib/amanda \
>            --with-gnutar-listdir=%{_localstatedir}/lib/amanda/gnutar-lists \
>            --with-smbclient=%{_bindir}/smbclient \
>            --with-amandates=%{_localstatedir}/lib/amanda/amandates \
>@@ -163,12 +164,12 @@ ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad
> ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8
> 
> pushd ${RPM_BUILD_ROOT}
>-  mv .%{_localstatedir}/lib/amanda/example .%{_sysconfdir}/amanda/%defconfig
>+  mv .%{_localstatedir}/lib/amanda/example .%{_localstatedir}/lib/amanda/%defconfig
>   cp ${RPM_SOURCE_DIR}/amanda.crontab .%{_sysconfdir}/amanda/crontab.sample
>-  cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
>-  cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
>-  rm -f .%{_sysconfdir}/amanda/%defconfig/xinetd*
>-  rm -f .%{_sysconfdir}/amanda/%defconfig/inetd*
>+  cp ${RPM_SOURCE_DIR}/disklist .%{_localstatedir}/lib/amanda/%defconfig
>+  cp ${RPM_SOURCE_DIR}/disklist .%{_localstatedir}/lib/amanda/%defconfig
>+  rm -f .%{_localstatedir}/lib/amanda/%defconfig/xinetd*
>+  rm -f .%{_localstatedir}/lib/amanda/%defconfig/inetd*
> 
>   mkdir -p .%{_localstatedir}/lib/amanda/gnutar-lists
>   mkdir -p .%{_localstatedir}/lib/amanda/%defconfig/index
>@@ -192,6 +193,11 @@ rm -rf ${RPM_BUILD_ROOT}
> /sbin/ldconfig
> %systemd_post amanda.socket
> %systemd_post amanda-udp.socket
>+if [ ! -d %{_localstatedir}/lib/amanda/%defconfig ]; then
>+    if [ -d %{_sysconfdir}/amanda/%defconfig ]; then
>+        mv -f %{_sysconfdir}/amanda/%defconfig/* %{_localstatedir}/lib/amanda/%defconfig/
>+    fi
>+fi
> 
> %preun
> %systemd_preun amanda.socket
>@@ -278,7 +284,6 @@ rm -rf ${RPM_BUILD_ROOT}
> %{_mandir}/man8/amcleanupdisk.8*
> 
> %dir %{_sysconfdir}/amanda/
>-%dir %{_sysconfdir}/amanda/%defconfig
> 
> %attr(-,%amanda_user,%amanda_group)     %dir %{_localstatedir}/lib/amanda/
> %attr(600,%amanda_user,%amanda_group)   %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts
>@@ -410,9 +415,9 @@ rm -rf ${RPM_BUILD_ROOT}
> %{perl_vendorarch}/Amanda/XferServer.pm
> 
> %config(noreplace) %{_sysconfdir}/amanda/crontab.sample
>-%config(noreplace) %{_sysconfdir}/amanda/%defconfig/*
>-%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
>-%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf
>+%config(noreplace) %{_localstatedir}/lib/amanda/%defconfig/*
>+%exclude %{_localstatedir}/lib/amanda/%defconfig/amanda-client.conf
>+%exclude %{_localstatedir}/lib/amanda/%defconfig/amanda-client-postgresql.conf
> 
> %attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/
> %attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/index
>@@ -466,14 +471,18 @@ rm -rf ${RPM_BUILD_ROOT}
> %{perl_vendorarch}/Amanda/Application.pm
> %{perl_vendorarch}/Amanda/Application/
> 
>-%config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
>-%config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf
>+%config(noreplace) %{_localstatedir}/lib/amanda/%defconfig/amanda-client.conf
>+%config(noreplace) %{_localstatedir}/lib/amanda/%defconfig/amanda-client-postgresql.conf
> 
> %attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/amandates
> %attr(-,%amanda_user,%amanda_group) %{_localstatedir}/lib/amanda/gnutar-lists/
> 
> 
> %changelog
>+* Wed Oct 29 2014 Petr Hracek <phracek@redhat.com> - 3.3.6-7
>+- Moved configuration files to /var/lib/amanda
>+Resolves #1121290
>+
> * Wed Sep 03 2014 Jitka Plesnikova <jplesnik@redhat.com> - 3.3.6-6
> - Perl 5.20 rebuild
>

Actions: View | Diff

Attachments on bug 1121290: 951765