Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Define a TLS section to group TLS, TLSOptions, and TLSStores. #5031

Merged
merged 3 commits into from Jun 27, 2019
Merged

Define a TLS section to group TLS, TLSOptions, and TLSStores. #5031

merged 3 commits into from Jun 27, 2019

Conversation

ldez
Copy link
Member

@ldez ldez commented Jun 26, 2019

What does this PR do?

Defines a TLS section to group TLS, TLSOptions, and TLSStores.

before 
[[TLS]]
  Stores = ["foobar", "foobar"]
  [TLS.Certificate]
    CertFile = "foobar"
    KeyFile = "foobar"

[[TLS]]
  Stores = ["foobar", "foobar"]
  [TLS.Certificate]
    CertFile = "foobar"
    KeyFile = "foobar"

[TLSOptions]

  [TLSOptions.TLS0]
    MinVersion = "foobar"
    CipherSuites = ["foobar", "foobar"]
    SniStrict = true
    [TLSOptions.TLS0.ClientCA]
      Files = ["foobar", "foobar"]
      Optional = true
  [TLSOptions.TLS1]
    MinVersion = "foobar"
    CipherSuites = ["foobar", "foobar"]
    SniStrict = true
    [TLSOptions.TLS1.ClientCA]
      Files = ["foobar", "foobar"]
      Optional = true

[TLSStores]

  [TLSStores.Store0]
    [TLSStores.Store0.DefaultCertificate]
      CertFile = "foobar"
      KeyFile = "foobar"
  [TLSStores.Store1]
    [TLSStores.Store1.DefaultCertificate]
      CertFile = "foobar"
      KeyFile = "foobar"
after 
[TLS]

  [[TLS.Certificates]]
    Stores = ["foobar", "foobar"]
    CertFile = "foobar"
    KeyFile = "foobar"

  [[TLS.Certificates]]
    Stores = ["foobar", "foobar"]
    CertFile = "foobar"
    KeyFile = "foobar"

  [TLS.Options]
    [TLS.Options.TLS0]
      MinVersion = "foobar"
      CipherSuites = ["foobar", "foobar"]
      SniStrict = true
      [TLS.Options.TLS0.ClientCA]
        Files = ["foobar", "foobar"]
        Optional = true
    [TLS.Options.TLS1]
      MinVersion = "foobar"
      CipherSuites = ["foobar", "foobar"]
      SniStrict = true
      [TLS.Options.TLS1.ClientCA]
        Files = ["foobar", "foobar"]
        Optional = true

  [TLS.Stores]
    [TLS.Stores.Store0]
      [TLS.Stores.Store0.DefaultCertificate]
        CertFile = "foobar"
        KeyFile = "foobar"
    [TLS.Stores.Store1]
      [TLS.Stores.Store1.DefaultCertificate]
        CertFile = "foobar"
        KeyFile = "foobar"

Motivation

Enhance configuration readability.

More

  • Added/updated tests
  • Added/updated documentation

Additional Notes

Co-authored-by: Jean-Baptiste Doumenjou jb.doumenjou@gmail.com

@ldez ldez added this to To review in v2 via automation Jun 26, 2019
@traefiker traefiker added this to the 2.0 milestone Jun 26, 2019
jbdoumenjou
jbdoumenjou approved these changes Jun 27, 2019
View reviewed changes
Copy link
Member

@jbdoumenjou jbdoumenjou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

mpl
mpl approved these changes Jun 27, 2019
View reviewed changes
Copy link
Collaborator

@mpl mpl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

dtomcej
dtomcej approved these changes Jun 27, 2019
View reviewed changes
Copy link
Contributor

@dtomcej dtomcej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
:shipit:

@traefiker traefiker merged commit 4245096 into traefik:v2.0 Jun 27, 2019
v2 automation moved this from To review to Done Jun 27, 2019
@ldez ldez deleted the feature/tls-section branch June 28, 2019 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mpl mpl mpl approved these changes

@jbdoumenjou jbdoumenjou jbdoumenjou approved these changes

@dtomcej dtomcej dtomcej approved these changes

Assignees
No one assigned
Labels
area/tls kind/enhancement a new or improved feature. size/L
Projects
No open projects
v2
Done
Milestone
2.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ldez @mpl @jbdoumenjou @dtomcej @traefiker