Attachment 293342 Details for Bug 430004 – Put user-modifiable files into /etc/ipa

[patch] Put user-modifiable files into /etc/ipa

freeipa-613-relocate.patch (text/plain), 4.80 KB, created by Rob Crittenden on 2008-01-29 21:06:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Crittenden

Created: 2008-01-29 21:06:24 UTC

Size: 4.80 KB

patch

obsolete

># HG changeset patch
># User Rob Crittenden <rcritten@redhat.com>
># Date 1201641611 18000
># Node ID 1df5523d0e40dba81a261a7563d7eac14f525f14
># Parent  b2ce4c36b5d114c579aee7e8112e282c707bf6e4
>Put user-modifiable files into /etc/ipa so they can be marked as
>config(noreplace).
>Resolves 430004
>
>diff -r b2ce4c36b5d1 -r 1df5523d0e40 ipa-server/ipa-server.spec
>--- a/ipa-server/ipa-server.spec	Tue Jan 29 15:18:41 2008 -0500
>+++ b/ipa-server/ipa-server.spec	Tue Jan 29 16:20:11 2008 -0500
>@@ -1,6 +1,6 @@ Name:           ipa-server
> Name:           ipa-server
> Version:        0.6.0
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Summary:        IPA authentication server
> 
> Group:          System Environment/Base
>@@ -67,6 +67,16 @@ rm %{buildroot}/%{plugin_dir}/libipa-mem
> rm %{buildroot}/%{plugin_dir}/libipa-memberof-plugin.la
> rm %{buildroot}/%{plugin_dir}/libipa-dna-plugin.la
> 
>+# Some user-modifiable HTML files are provided. Move these to /etc
>+# and link back.
>+mkdir -p %{buildroot}/%{_sysconfdir}/ipa
>+mv %{buildroot}/%{_usr}/share/ipa/html/ssbrowser.html %{buildroot}/%{_sysconfdir}/ipa
>+mv %{buildroot}/%{_usr}/share/ipa/html/unauthorized.html %{buildroot}/%{_sysconfdir}/ipa
>+ln -s ../../../..%{_sysconfdir}/ipa/ssbrowser.html \
>+    %{buildroot}%{_usr}/share/ipa/html/ssbrowser.html
>+ln -s ../../../..%{_sysconfdir}/ipa/unauthorized.html \
>+    %{buildroot}%{_usr}/share/ipa/html/unauthorized.html
>+
> %clean
> rm -rf %{buildroot}
> 
>@@ -103,7 +113,22 @@ fi
> %attr(755,root,root) %{_initrddir}/ipa_webgui
> 
> %dir %{_usr}/share/ipa
>-%{_usr}/share/ipa/*
>+%{_usr}/share/ipa/*.ldif
>+%{_usr}/share/ipa/*.template
>+%dir %{_usr}/share/ipa/html
>+%{_usr}/share/ipa/html/ssbrowser.html
>+%{_usr}/share/ipa/html/unauthorized.html
>+%dir %{_sysconfdir}/ipa
>+%config(noreplace) %{_sysconfdir}/ipa/ssbrowser.html
>+%config(noreplace) %{_sysconfdir}/ipa/unauthorized.html
>+%{_usr}/share/ipa/ipa_webgui.cfg
>+%{_usr}/share/ipa/ipa.conf
>+%dir %{_usr}/share/ipa/ipagui
>+%{_usr}/share/ipa/ipagui/*
>+%dir %{_usr}/share/ipa/ipa_gui.egg-info
>+%{_usr}/share/ipa/ipa_gui.egg-info/*
>+%dir %{_usr}/share/ipa/ipaserver
>+%dir %{_usr}/share/ipa/ipaserver/*
> 
> %dir %{python_sitelib}/ipaserver
> %{python_sitelib}/ipaserver/*.py*
>@@ -117,6 +142,10 @@ fi
> %attr(700,apache,apache) %dir %{_localstatedir}/cache/ipa/sessions
> 
> %changelog
>+* Tue Jan 29 2008 Rob Crittenden <rcritten@redhat.com> 0.6.0-5
>+- Put user-modifiable files into /etc/ipa so they can be marked as
>+  config(noreplace).
>+
> * Thu Jan 24 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-4
> - Use new name of pyasn1, python-pyasn1, in Requires
> 
>diff -r b2ce4c36b5d1 -r 1df5523d0e40 ipa-server/ipa-server.spec.in
>--- a/ipa-server/ipa-server.spec.in	Tue Jan 29 15:18:41 2008 -0500
>+++ b/ipa-server/ipa-server.spec.in	Tue Jan 29 16:20:11 2008 -0500
>@@ -1,6 +1,6 @@ Name:           ipa-server
> Name:           ipa-server
> Version:        VERSION
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Summary:        IPA authentication server
> 
> Group:          System Environment/Base
>@@ -67,6 +67,16 @@ rm %{buildroot}/%{plugin_dir}/libipa-mem
> rm %{buildroot}/%{plugin_dir}/libipa-memberof-plugin.la
> rm %{buildroot}/%{plugin_dir}/libipa-dna-plugin.la
> 
>+# Some user-modifiable HTML files are provided. Move these to /etc
>+# and link back.
>+mkdir -p %{buildroot}/%{_sysconfdir}/ipa
>+mv %{buildroot}/%{_usr}/share/ipa/html/ssbrowser.html %{buildroot}/%{_sysconfdir}/ipa
>+mv %{buildroot}/%{_usr}/share/ipa/html/unauthorized.html %{buildroot}/%{_sysconfdir}/ipa
>+ln -s ../../../..%{_sysconfdir}/ipa/ssbrowser.html \
>+    %{buildroot}%{_usr}/share/ipa/html/ssbrowser.html
>+ln -s ../../../..%{_sysconfdir}/ipa/unauthorized.html \
>+    %{buildroot}%{_usr}/share/ipa/html/unauthorized.html
>+
> %clean
> rm -rf %{buildroot}
> 
>@@ -103,7 +113,22 @@ fi
> %attr(755,root,root) %{_initrddir}/ipa_webgui
> 
> %dir %{_usr}/share/ipa
>-%{_usr}/share/ipa/*
>+%{_usr}/share/ipa/*.ldif
>+%{_usr}/share/ipa/*.template
>+%dir %{_usr}/share/ipa/html
>+%{_usr}/share/ipa/html/ssbrowser.html
>+%{_usr}/share/ipa/html/unauthorized.html
>+%dir %{_sysconfdir}/ipa
>+%config(noreplace) %{_sysconfdir}/ipa/ssbrowser.html
>+%config(noreplace) %{_sysconfdir}/ipa/unauthorized.html
>+%{_usr}/share/ipa/ipa_webgui.cfg
>+%{_usr}/share/ipa/ipa.conf
>+%dir %{_usr}/share/ipa/ipagui
>+%{_usr}/share/ipa/ipagui/*
>+%dir %{_usr}/share/ipa/ipa_gui.egg-info
>+%{_usr}/share/ipa/ipa_gui.egg-info/*
>+%dir %{_usr}/share/ipa/ipaserver
>+%dir %{_usr}/share/ipa/ipaserver/*
> 
> %dir %{python_sitelib}/ipaserver
> %{python_sitelib}/ipaserver/*.py*
>@@ -117,6 +142,10 @@ fi
> %attr(700,apache,apache) %dir %{_localstatedir}/cache/ipa/sessions
> 
> %changelog
>+* Tue Jan 29 2008 Rob Crittenden <rcritten@redhat.com> 0.6.0-5
>+- Put user-modifiable files into /etc/ipa so they can be marked as
>+  config(noreplace).
>+
> * Thu Jan 24 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-4
> - Use new name of pyasn1, python-pyasn1, in Requires
>

Actions: View | Diff

Attachments on bug 430004: 293342