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

Allow disabling TLS explicitly #546

Merged
merged 1 commit into from
Jul 18, 2024
Merged

Allow disabling TLS explicitly #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions quesma/clickhouse/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ func initDBConnection(c config.QuesmaConfiguration, tlsConfig *tls.Config) *sql.
Database: c.ClickHouse.Database,
}
}

options.TLS = tlsConfig
if !c.ClickHouse.DisableTLS {
options.TLS = tlsConfig
}

info := struct {
Name string
Expand Down
1 change: 1 addition & 0 deletions quesma/config.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ connectors:
type: "clickhouse-os" # one of [clickhouse, clickhouse-os, hydrolix]
#clickhouse: # this config is going to be removed, but for now let's just comment out
# url: "clickhouse://localhost:9000"
# disableTLS: true # required for plaintext connections
ingestStatistics: true
internalTelemetryUrl: "https://api.quesma.com/phone-home"
logging:
Expand Down
1 change: 1 addition & 0 deletions quesma/quesma/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ type RelationalDbConfiguration struct {
Password string `koanf:"password"`
Database string `koanf:"database"`
AdminUrl *Url `koanf:"adminUrl"`
DisableTLS bool `koanf:"disableTLS"`
}

type OptimizersConfiguration map[string]bool
Expand Down
Loading