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