Skip to content

Commit fdba441

Browse files
authored
fix: 修复https证书配置 (#252)
1 parent cab413f commit fdba441

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

deployment/helm/datamate/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ frontend:
159159
- *logVolume
160160
- name: cert-volume
161161
configMap:
162-
name: cube-security-cert-cert
162+
name: cube-security-nginx-cert
163163
optional: true
164164
volumeMounts:
165165
- name: log-volume

scripts/images/frontend/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ COPY scripts/images/frontend/start.sh /opt/frontend/start.sh
2323

2424
RUN dos2unix /opt/frontend/start.sh \
2525
&& chmod +x /opt/frontend/start.sh \
26+
&& mkdir -p /etc/nginx/cert \
2627
&& ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
2728
&& rm -f /etc/nginx/conf.d/default.conf
2829

scripts/images/frontend/start.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ if [ -f "/cert/server.pem" ]; then
66
fi
77

88
if [ -f "/cert/server.key" ]; then
9-
if openssl rsa -in /cert/server.key -passin pass:test_check -noout 2>/dev/null; then
10-
cp /cert/server.key /etc/nginx/cert/server.key
11-
else
12-
echo "$CERT_PASS" | openssl rsa -in /cert/server.key -out /etc/nginx/cert/server.key -passin stdin
13-
fi
14-
chown nginx:nginx /etc/nginx/cert/server.key
9+
if openssl rsa -in /cert/server.key -passin pass:test_check -noout 2>/dev/null; then
10+
cp /cert/server.key /etc/nginx/cert/server.key
11+
else
12+
echo "$CERT_PASS" | openssl rsa -in /cert/server.key -out /etc/nginx/cert/server.key -passin stdin
13+
fi
14+
chown nginx:nginx /etc/nginx/cert/server.key
1515
fi
1616

1717
if [ -f "/etc/nginx/cert/server.pem" ]; then

0 commit comments

Comments
 (0)