thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove tls_ from option names

Browse Source
This commit is contained in:
Vitaliy Filippov
2026-04-27 15:41:00 +03:00
parent 24c27386b6
commit 9372df4beb
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/messenger.cpp
+7 -7
View File
@@ -353,16 +353,16 @@ void osd_messenger_t::parse_config(const json11::Json & config)
this->use_proto_checksums = 0; this->use_proto_checksums = 0;
if (!osd_num) if (!osd_num)
{ {
tls_cert = config["tls_cert"].string_value(); tls_cert = config["cert"].string_value();
tls_key = config["tls_key"].string_value(); tls_key = config["pkey"].string_value();
osd_tls_ca = config["osd_tls_ca"].string_value(); osd_tls_ca = config["osd_ca"].string_value();
} }
else else
{ {
tls_cert = config["osd_tls_cert"].string_value(); tls_cert = config["osd_cert"].string_value();
tls_key = config["osd_tls_key"].string_value(); tls_key = config["osd_pkey"].string_value();
osd_tls_ca = config["osd_tls_ca"].string_value(); osd_tls_ca = config["osd_ca"].string_value();
client_tls_ca = config["client_tls_ca"].string_value(); client_tls_ca = config["client_ca"].string_value();
} }
if (!osd_num) if (!osd_num)
this->iothread_count = (uint32_t)config["client_iothread_count"].uint64_value(); this->iothread_count = (uint32_t)config["client_iothread_count"].uint64_value();
src/client/msgr_encrypt.cpp
+2 -2
View File
@@ -530,9 +530,9 @@ void osd_messenger_t::init_tls()
if (tls_cert.empty() || tls_key.empty() || osd_tls_ca.empty() || osd_num && client_tls_ca.empty()) if (tls_cert.empty() || tls_key.empty() || osd_tls_ca.empty() || osd_num && client_tls_ca.empty())
{ {
if (osd_num) if (osd_num)
fprintf(stderr, "Vitastor OSD TLS requires osd_tls_cert, osd_tls_key, osd_tls_ca, client_tls_ca\n"); fprintf(stderr, "Vitastor transport encryption requires osd_cert, osd_pkey, osd_ca, client_ca options for OSDs\n");
else else
fprintf(stderr, "Vitastor client TLS requires tls_cert, tls_key and osd_tls_ca\n"); fprintf(stderr, "Vitastor transport encryption requires cert, pkey and osd_ca options\n");
exit(1); exit(1);
} }
else else
tests/common.sh
+6 -6
View File
@@ -135,12 +135,12 @@ if [[ "$OSD_TLS" = "1" ]]; then
openssl x509 -req -days 3650 -CA client_ca.crt -CAkey client_ca.key -CAcreateserial -in cli.csr -out cli.crt openssl x509 -req -days 3650 -CA client_ca.crt -CAkey client_ca.key -CAcreateserial -in cli.csr -out cli.crt
rm cli.csr rm cli.csr
cd $(dirname $0)/.. cd $(dirname $0)/..
VITASTOR_CFG="$VITASTOR_CFG"',"osd_tls_cert":"'$(pwd)'/testdata/osd.crt"' VITASTOR_CFG="$VITASTOR_CFG"',"osd_cert":"'$(pwd)'/testdata/osd.crt"'
VITASTOR_CFG="$VITASTOR_CFG"',"osd_tls_key":"'$(pwd)'/testdata/osd.key"' VITASTOR_CFG="$VITASTOR_CFG"',"osd_pkey":"'$(pwd)'/testdata/osd.key"'
VITASTOR_CFG="$VITASTOR_CFG"',"osd_tls_ca":"'$(pwd)'/testdata/osd.crt"' VITASTOR_CFG="$VITASTOR_CFG"',"osd_ca":"'$(pwd)'/testdata/osd.crt"'
VITASTOR_CFG="$VITASTOR_CFG"',"client_tls_ca":"'$(pwd)'/testdata/client_ca.crt"' VITASTOR_CFG="$VITASTOR_CFG"',"client_ca":"'$(pwd)'/testdata/client_ca.crt"'
VITASTOR_CFG="$VITASTOR_CFG"',"tls_cert":"'$(pwd)'/testdata/cli.crt"' VITASTOR_CFG="$VITASTOR_CFG"',"cert":"'$(pwd)'/testdata/cli.crt"'
VITASTOR_CFG="$VITASTOR_CFG"',"tls_key":"'$(pwd)'/testdata/cli.key"' VITASTOR_CFG="$VITASTOR_CFG"',"pkey":"'$(pwd)'/testdata/cli.key"'
fi fi
echo "{$VITASTOR_CFG}" > ./testdata/vitastor.conf echo "{$VITASTOR_CFG}" > ./testdata/vitastor.conf
VITASTOR_CFG=./testdata/vitastor.conf VITASTOR_CFG=./testdata/vitastor.conf