diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-09-13 05:48:46 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-09-13 05:48:46 +0000 |
| commit | 3ae3ff74051159e8ee2e2708b83741f7342e08c2 (patch) | |
| tree | 24e56b1cd08e70108c8bd17471abc02f887876aa /pki/specs/pki-core.spec | |
| parent | 9eccf374c78ce34fd488792b3a1a82a2032bb162 (diff) | |
| download | pki-3ae3ff74051159e8ee2e2708b83741f7342e08c2.tar.gz pki-3ae3ff74051159e8ee2e2708b83741f7342e08c2.tar.xz pki-3ae3ff74051159e8ee2e2708b83741f7342e08c2.zip | |
Bugzilla Bug #699809 - Convert certificate system to use systemd (migration scripts)
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2198 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/specs/pki-core.spec')
| -rw-r--r-- | pki/specs/pki-core.spec | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec index a0422bd1f..4ec05d963 100644 --- a/pki/specs/pki-core.spec +++ b/pki/specs/pki-core.spec @@ -425,6 +425,10 @@ cd build cd build %{__make} install DESTDIR=%{buildroot} INSTALL="install -p" +%if 0%{?rhel} || 0%{?fedora} < 16 +%{__rm} %{buildroot}%{_bindir}/pkicontrol +%endif + cd %{buildroot}%{_libdir}/symkey %{__rm} symkey.jar %if 0%{?fedora} >= 16 @@ -483,7 +487,7 @@ if [ $1 = 0 ]; then %relabel targeted fi -%if 0%{?fedora} < 16 +%if 0%{?rhel} || 0%{?fedora} < 16 %post -n pki-ca # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add pki-cad || : @@ -503,7 +507,20 @@ fi %else %post -n pki-ca +# Attempt to update ALL old "CA" instances to "systemd" +#for inst in `ls /etc/sysconfig/pki/ca`; do +# if [ ! -e "/etc/systemd/system/pki-cad.target.wants/pki-cad@${inst}.service" ]; then +# ln -s "/lib/systemd/system/pki-cad@.service" "/etc/systemd/system/pki-cad.target.wants/pki-cad@${inst}.service" +# [ -e /var/lib/${inst}/${inst} ] && unlink /var/lib/${inst}/${inst} +# ln -s /usr/sbin/tomcat6-sysd /var/lib/${inst}/${inst} +# echo "pkicreate.systemd.servicename=pki-cad@${inst}.service" >> /var/lib/${inst}/conf/CS.cfg +# fi +#done /bin/systemctl daemon-reload >/dev/null 2>&1 || : +# Attempt to restart ALL updated "CA" instances +#if [ $1 = 2 ] ; then +# /bin/systemctl try-restart pki-cad.target >/dev/null 2>&1 || : +#fi %preun -n pki-ca if [ $1 = 0 ] ; then @@ -681,6 +698,7 @@ fi - 'pki-selinux' - 'pki-ca' - Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- Bugzilla Bug #699809 - Convert CS to use systemd (alee) - 'pki-silent' - Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . |