New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not generate self-signed TLS certificates by default. #4509

Merged
merged 4 commits into from Jan 29, 2019

Conversation

Projects
None yet
3 participants
@hawkowl
Copy link
Contributor

hawkowl commented Jan 29, 2019

Fixes #4490

hawkowl added some commits Jan 29, 2019

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jan 29, 2019

Codecov Report

Merging #4509 into develop will decrease coverage by <.01%.
The diff coverage is 80%.

@@             Coverage Diff             @@
##           develop    #4509      +/-   ##
===========================================
- Coverage    74.76%   74.75%   -0.01%     
===========================================
  Files          336      336              
  Lines        34180    34158      -22     
  Branches      5559     5558       -1     
===========================================
- Hits         25553    25536      -17     
+ Misses        7051     7046       -5     
  Partials      1576     1576
@hawkowl

This comment has been minimized.

Copy link
Contributor Author

hawkowl commented Jan 29, 2019

@hawkowl hawkowl requested a review from matrix-org/synapse-core Jan 29, 2019

@richvdh
Copy link
Member

richvdh left a comment

lgtm

@@ -40,7 +41,9 @@ def read_config(self, config):
self.acme_reprovision_threshold = acme_config.get("reprovision_threshold", 30)

self.tls_certificate_file = os.path.abspath(config.get("tls_certificate_path"))
self.tls_private_key_file = os.path.abspath(config.get("tls_private_key_path"))
self.tls_private_key_file = config.get("tls_private_key_path")
if self.tls_private_key_file:

This comment has been minimized.

@richvdh

richvdh Jan 29, 2019

Member

there's a self.abspath to do this boilerplate for you

This comment has been minimized.

@hawkowl

hawkowl Jan 29, 2019

Author Contributor

done

@hawkowl hawkowl merged commit 6bd4374 into develop Jan 29, 2019

5 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@hawkowl hawkowl deleted the hawkowl/no-generate-self-signed branch Jan 29, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment