Skip to content

Commit 877e5da

Browse files
committed
[misc] add ssl
1 parent 98c9116 commit 877e5da

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ jobs:
7676
registry: ${{ matrix.db-type == 'enterprise' && 'docker.mariadb.com/enterprise-server' || (matrix.db-type == 'dev' && 'quay.io/mariadb-foundation/mariadb-devel' || '') }}
7777
registry-user: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_USER || '' }}
7878
registry-password: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_TOKEN || '' }}
79-
additional-conf: ${{ matrix.additional-conf || '' }}
80-
conf-script-folder: ${{ github.workspace }}/.github/workflows/certs
79+
additional-conf: ${{ format('{0}{1}', matrix.additional-conf || '', 'ssl-ca=/etc/mysql/conf.d/ca.crt\nssl-cert=/etc/mysql/conf.d/server.crt\nssl-key=/etc/mysql/conf.d/server.key') }}
80+
port: ${{ env.TEST_DB_PORT }}
8181

8282
- name: Setup MySQL
8383
if: matrix.db-type == 'mysql'

.github/workflows/generate-certs.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,4 @@ ls -la .github/workflows/certs/
7474
echo "Certificate details:"
7575
openssl x509 -in .github/workflows/certs/server.crt -text -noout | grep -E "(Subject|CN)"
7676

77-
echo "Certificate generation completed successfully!"
78-
79-
echo "[mariadbd]" > .github/workflows/certs/1-server-ssl.cnf
80-
echo "ssl-ca = /etc/mysql/conf.d/ca.crt" >> .github/workflows/certs/1-server-ssl.cnf
81-
echo "ssl-cert = /etc/mysql/conf.d/server.crt" >> .github/workflows/certs/1-server-ssl.cnf
82-
echo "ssl-key = /etc/mysql/conf.d/server.key" >> .github/workflows/certs/1-server-ssl.cnf
77+
echo "Certificate generation completed successfully!"

0 commit comments

Comments
 (0)