From 7e475506c3a636508b4f559a91d60344f55c5c3a Mon Sep 17 00:00:00 2001 From: Kenneth Johnson Date: Mar 17 2021 19:03:23 +0000 Subject: Fix typo in docs/changelog to match the code --- diff --git a/ChangeLog b/ChangeLog index f3f5d81..ddf52bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -772,8 +772,8 @@ * src/double_tls.py (DoubleTLSClient.outer_shutdown) (OuterBuffer.set_full_duplex): New methods. * src/bridge.py (BridgeConfiguration._add_defaults): New option - max-rpms-payload-size. - (BridgeConfiguration._read_configuration): Handle max-rpms-payload-size. + max-rpms-payloads-size. + (BridgeConfiguration._read_configuration): Handle max-rpms-payloads-size. (RequestType.__init__): Add support for subheaders. (RequestType.post_request_phase): New method. (SubrequestMap, SignRPMsReadRequestThread, SignRPMsKojiThread) @@ -799,8 +799,8 @@ (main): Allow using ClientError to exit without printing an additional message. * src/server.py (ServerConfiguration._add_defaults): New option - max-rpms-payload-size. - (ServerConfiguration._read_configuration): Handle max-rpms-payload-size. + max-rpms-payloads-size. + (ServerConfiguration._read_configuration): Handle max-rpms-payloads-size. (ServersConnection.__send_payload_size) (ServersConnection.__send_payload_from_file): Document that these methods are suitable both for the primary payload and subpayloads. @@ -813,8 +813,8 @@ (SignRPMsReplyThread): New classes. (cmd_sign_rpms): New function. * doc/protocol-design.txt: Document op="sign-rpms". - * config/bridge.conf (max-rpms-payload-size) - * config/server.conf (max-rpms-payload-size): Document new option. + * config/bridge.conf (max-rpms-payloads-size) + * config/server.conf (max-rpms-payloads-size): Document new option. * src/client.py (SignRPMArgumentExaminer): Split from cmd_sign_rpm. diff --git a/NEWS b/NEWS index 0a22372..b5be772 100644 --- a/NEWS +++ b/NEWS @@ -100,7 +100,7 @@ Changes in version 0.99: Changes in version 0.98: - Now uses sqlalchemy 0.5 (e.g. RHEL6) - New operation 'sign-rpms', up to 50% faster. - New bridge and server options max-rpms-payload-size. + New bridge and server options max-rpms-payloads-size. - Server option gnupg-key-usage has changed default to "sign" (removing "encrypt"), to work with DSA keys. sigul does not provide decryption, so signing is all that is necessary anyway. diff --git a/config/bridge.conf b/config/bridge.conf index 0e96df0..928c75c 100644 --- a/config/bridge.conf +++ b/config/bridge.conf @@ -15,7 +15,7 @@ ; fas-user-name: ; fas-password: # Maximum accepted total size of all RPM payloads stored on disk for one request -; max-rpms-payload-size: 10737418240 +; max-rpms-payloads-size: 10737418240 [koji] # Config file used to connect to the Koji hub diff --git a/config/server.conf b/config/server.conf index ab9cf74..227c5e9 100644 --- a/config/server.conf +++ b/config/server.conf @@ -12,7 +12,7 @@ bridge-hostname: localhost # Maximum accepted size of payload stored in server's memory ; max-memory-payload-size: 1048576 # Maximum accepted total size of all RPM payloads stored on disk for one request -; max-rpms-payload-size: 10737418240 +; max-rpms-payloads-size: 10737418240 # Nickname of the server's certificate in the NSS database specified below ; server-cert-nickname: sigul-server-cert # Maximum number of seconds to wait for signing one package