scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-06 19:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1844 from molecula/fix-tls-check

Browse source 
correct TLS enabled check
This commit is contained in:
Kasey C. Rodgers 2022-01-06 10:55:17 -08:00 • committed by GitHub
commit 801d1e3e73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab/.gitlab-ci.yml
View file

@ -262,6 +262,7 @@ smoke test:
- ./qa/scripts/teardownSmokeTest.sh
needs:
- job: build for linux arm64
allow_failure: true
artifacts:
when: always
paths:
@ -314,4 +315,4 @@ gauntlet:
- ./qa/scripts/setupSamsungGauntlet.sh
- ./qa/scripts/testSamsungGauntlet.sh
after_script:
- ./qa/scripts/teardownSamsungGauntlet.sh
- ./qa/scripts/teardownSamsungGauntlet.sh

2
server/server.go
View file

@ -557,7 +557,7 @@ func (m *Command) SetupServer() error {
m.Config.Postgres.Bind = ""
// TLS must be enabled if auth is
if m.Config.TLS.CertificatePath == "" || m.Config.TLS.CertificateKeyPath == "" || m.Config.TLS.CACertPath == "" {
if m.Config.TLS.CertificatePath == "" || m.Config.TLS.CertificateKeyPath == "" {
return fmt.Errorf("transport layer security (TLS) is not configured properly. TLS is required when AuthN/Z is enabled, current configuration: %v", m.Config.TLS)
}