summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorTomas Babej <tbabej@redhat.com>2013-07-16 12:10:54 +0200
committerMartin Kosek <mkosek@redhat.com>2013-07-16 12:17:40 +0200
commit7a105604e265222cf6f96b0ac060d4f1b2504b6c (patch)
tree22a9b92905f5f36259dc29b00f21a3931334eaae /install
parent0fa42af840579d641ceb76974fb4c0277c9c6d6b (diff)
downloadfreeipa.git-7a105604e265222cf6f96b0ac060d4f1b2504b6c.tar.gz
freeipa.git-7a105604e265222cf6f96b0ac060d4f1b2504b6c.tar.xz
freeipa.git-7a105604e265222cf6f96b0ac060d4f1b2504b6c.zip
Change group ownership of CRL publish directory
Spec file modified so that /var/lib/ipa/pki-ca/publish/ is no longer owned by created with package installation. The directory is rather created/removed with the CA instance itself. This ensures proper creation/removeal, group ownership and SELinux context. https://fedorahosted.org/freeipa/ticket/3727
Diffstat (limited to 'install')
-rw-r--r--install/Makefile.am3
-rw-r--r--install/tools/ipa-upgradeconfig7
2 files changed, 5 insertions, 5 deletions
diff --git a/install/Makefile.am b/install/Makefile.am
index b2e6e9a6..c07f5715 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -24,9 +24,8 @@ install-exec-local:
chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade
- mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca/publish
+ mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
chmod 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca
- chmod 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca/publish
uninstall-local:
-rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index 4e921696..4fbcdb6b 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -690,15 +690,16 @@ def migrate_crl_publish_dir(ca):
caconfig.CS_CFG_PATH, e)
return False
+ # Prepare target publish dir (creation, permissions, SELinux context)
+ # Run this every update to ensure proper values
+ publishdir = ca.prepare_crl_publish_dir()
+
if old_publish_dir == caconfig.CRL_PUBLISH_PATH:
# publish dir is already updated
root_logger.info('Publish directory already set to new location')
sysupgrade.set_upgrade_state('dogtag', 'moved_crl_publish_dir', True)
return False
- # Prepare target publish dir (permissions, SELinux context)
- publishdir = ca.prepare_crl_publish_dir()
-
# Copy all CRLs to new directory
root_logger.info('Copy all CRLs to new publish directory')
try: