|
 |
c58629 |
From a87278422807aa4004b63e8e46ad38dab5a911f3 Mon Sep 17 00:00:00 2001
|
|
|
c58629 |
From: Fraser Tweedale <ftweedal@redhat.com>
|
|
|
c58629 |
Date: Thu, 30 Nov 2017 12:00:53 +1100
|
|
|
c58629 |
Subject: [PATCH] pep8: reduce line lengths in CAInstance.__enable_crl_publish
|
|
|
c58629 |
|
|
|
c58629 |
Part of: https://pagure.io/freeipa/issue/7288
|
|
|
c58629 |
|
|
|
c58629 |
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
|
|
|
c58629 |
---
|
|
|
c58629 |
ipaserver/install/cainstance.py | 71 ++++++++++++++++++++++++-----------------
|
|
|
c58629 |
1 file changed, 41 insertions(+), 30 deletions(-)
|
|
|
c58629 |
|
|
|
c58629 |
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
|
|
|
c58629 |
index f45d2c8b89ba4b81be5acbbe85f256e85ef630fb..dd410d1c97cb4b27d35086bb2f511c42c02d022f 100644
|
|
|
c58629 |
--- a/ipaserver/install/cainstance.py
|
|
|
c58629 |
+++ b/ipaserver/install/cainstance.py
|
|
|
c58629 |
@@ -907,52 +907,63 @@ class CAInstance(DogtagInstance):
|
|
|
c58629 |
|
|
|
c58629 |
https://access.redhat.com/knowledge/docs/en-US/Red_Hat_Certificate_System/8.0/html/Admin_Guide/Setting_up_Publishing.html
|
|
|
c58629 |
"""
|
|
|
c58629 |
- caconfig = paths.CA_CS_CFG_PATH
|
|
|
c58629 |
|
|
|
c58629 |
- publishdir = self.prepare_crl_publish_dir()
|
|
|
c58629 |
+ def put(k, v):
|
|
|
c58629 |
+ installutils.set_directive(
|
|
|
c58629 |
+ paths.CA_CS_CFG_PATH, k, v, quotes=False, separator='=')
|
|
|
c58629 |
|
|
|
c58629 |
# Enable file publishing, disable LDAP
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.enable', 'true', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.ldappublish.enable', 'false', quotes=False, separator='=')
|
|
|
c58629 |
+ put('ca.publish.enable', 'true')
|
|
|
c58629 |
+ put('ca.publish.ldappublish.enable', 'false')
|
|
|
c58629 |
|
|
|
c58629 |
# Create the file publisher, der only, not b64
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.publisher.impl.FileBasedPublisher.class','com.netscape.cms.publish.publishers.FileBasedPublisher', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.publisher.instance.FileBaseCRLPublisher.crlLinkExt', 'bin', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.publisher.instance.FileBaseCRLPublisher.directory', publishdir, quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.publisher.instance.FileBaseCRLPublisher.latestCrlLink', 'true', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.publisher.instance.FileBaseCRLPublisher.pluginName', 'FileBasedPublisher', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.publisher.instance.FileBaseCRLPublisher.timeStamp', 'LocalTime', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.publisher.instance.FileBaseCRLPublisher.zipCRLs', 'false', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.publisher.instance.FileBaseCRLPublisher.zipLevel', '9', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.publisher.instance.FileBaseCRLPublisher.Filename.b64', 'false', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.publisher.instance.FileBaseCRLPublisher.Filename.der', 'true', quotes=False, separator='=')
|
|
|
c58629 |
+ put('ca.publish.publisher.impl.FileBasedPublisher.class',
|
|
|
c58629 |
+ 'com.netscape.cms.publish.publishers.FileBasedPublisher')
|
|
|
c58629 |
+ put('ca.publish.publisher.instance.FileBaseCRLPublisher.crlLinkExt',
|
|
|
c58629 |
+ 'bin')
|
|
|
c58629 |
+ put('ca.publish.publisher.instance.FileBaseCRLPublisher.directory',
|
|
|
c58629 |
+ self.prepare_crl_publish_dir())
|
|
|
c58629 |
+ put('ca.publish.publisher.instance.FileBaseCRLPublisher.latestCrlLink',
|
|
|
c58629 |
+ 'true')
|
|
|
c58629 |
+ put('ca.publish.publisher.instance.FileBaseCRLPublisher.pluginName',
|
|
|
c58629 |
+ 'FileBasedPublisher')
|
|
|
c58629 |
+ put('ca.publish.publisher.instance.FileBaseCRLPublisher.timeStamp',
|
|
|
c58629 |
+ 'LocalTime')
|
|
|
c58629 |
+ put('ca.publish.publisher.instance.FileBaseCRLPublisher.zipCRLs',
|
|
|
c58629 |
+ 'false')
|
|
|
c58629 |
+ put('ca.publish.publisher.instance.FileBaseCRLPublisher.zipLevel', '9')
|
|
|
c58629 |
+ put('ca.publish.publisher.instance.FileBaseCRLPublisher.Filename.b64',
|
|
|
c58629 |
+ 'false')
|
|
|
c58629 |
+ put('ca.publish.publisher.instance.FileBaseCRLPublisher.Filename.der',
|
|
|
c58629 |
+ 'true')
|
|
|
c58629 |
|
|
|
c58629 |
# The publishing rule
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.enable', 'true', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.mapper', 'NoMap', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.pluginName', 'Rule', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.predicate', '', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.publisher', 'FileBaseCRLPublisher', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.rule.instance.FileCrlRule.type', 'crl', quotes=False, separator='=')
|
|
|
c58629 |
+ put('ca.publish.rule.instance.FileCrlRule.enable', 'true')
|
|
|
c58629 |
+ put('ca.publish.rule.instance.FileCrlRule.mapper', 'NoMap')
|
|
|
c58629 |
+ put('ca.publish.rule.instance.FileCrlRule.pluginName', 'Rule')
|
|
|
c58629 |
+ put('ca.publish.rule.instance.FileCrlRule.predicate', '')
|
|
|
c58629 |
+ put('ca.publish.rule.instance.FileCrlRule.publisher',
|
|
|
c58629 |
+ 'FileBaseCRLPublisher')
|
|
|
c58629 |
+ put('ca.publish.rule.instance.FileCrlRule.type', 'crl')
|
|
|
c58629 |
|
|
|
c58629 |
# Now disable LDAP publishing
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.rule.instance.LdapCaCertRule.enable', 'false', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.rule.instance.LdapCrlRule.enable', 'false', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.rule.instance.LdapUserCertRule.enable', 'false', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.publish.rule.instance.LdapXCertRule.enable', 'false', quotes=False, separator='=')
|
|
|
c58629 |
+ put('ca.publish.rule.instance.LdapCaCertRule.enable', 'false')
|
|
|
c58629 |
+ put('ca.publish.rule.instance.LdapCrlRule.enable', 'false')
|
|
|
c58629 |
+ put('ca.publish.rule.instance.LdapUserCertRule.enable', 'false')
|
|
|
c58629 |
+ put('ca.publish.rule.instance.LdapXCertRule.enable', 'false')
|
|
|
c58629 |
|
|
|
c58629 |
# If we are the initial master then we are the CRL generator, otherwise
|
|
|
c58629 |
# we point to that master for CRLs.
|
|
|
c58629 |
if not self.clone:
|
|
|
c58629 |
# These next two are defaults, but I want to be explicit that the
|
|
|
c58629 |
# initial master is the CRL generator.
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.crl.MasterCRL.enableCRLCache', 'true', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.crl.MasterCRL.enableCRLUpdates', 'true', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.listenToCloneModifications', 'true', quotes=False, separator='=')
|
|
|
c58629 |
+ put('ca.crl.MasterCRL.enableCRLCache', 'true')
|
|
|
c58629 |
+ put('ca.crl.MasterCRL.enableCRLUpdates', 'true')
|
|
|
c58629 |
+ put('ca.listenToCloneModifications', 'true')
|
|
|
c58629 |
else:
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.crl.MasterCRL.enableCRLCache', 'false', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.crl.MasterCRL.enableCRLUpdates', 'false', quotes=False, separator='=')
|
|
|
c58629 |
- installutils.set_directive(caconfig, 'ca.listenToCloneModifications', 'false', quotes=False, separator='=')
|
|
|
c58629 |
+ put('ca.crl.MasterCRL.enableCRLCache', 'false')
|
|
|
c58629 |
+ put('ca.crl.MasterCRL.enableCRLUpdates', 'false')
|
|
|
c58629 |
+ put('ca.listenToCloneModifications', 'false')
|
|
|
c58629 |
|
|
|
c58629 |
def uninstall(self):
|
|
|
c58629 |
# just eat state
|
|
|
c58629 |
--
|
|
|
c58629 |
2.13.6
|
|
|
c58629 |
|