ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mjevange-dev-patch-00697' into 'dev' 

Repair cert file copy: SSL_CONFIG points to ./ssl, not ./ssl/ssl

See merge request Shinobi-Systems/Shinobi!299
auto-build-api-doc-with-code
Moe 2021-04-08 02:24:27 +00:00
parent 2efad2faac a127df5f5a
commit 774ccdc773
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docker/init.sh
View File

@ -8,7 +8,7 @@ sed -i "s/$OLD_SQL_USER_TAG/$NEW_SQL_USER_TAG/g" sql/framework1.sql
if [ "$SSL_ENABLED" = "true" ]; then if [ "$SSL_ENABLED" = "true" ]; then
if [ -d /config/ssl ]; then if [ -d /config/ssl ]; then
echo "Using provided SSL Key" echo "Using provided SSL Key"
cp -R /config/ssl ssl cp -R /config/ssl ./
SSL_CONFIG='{"key":"./ssl/server.key","cert":"./ssl/server.cert"}' SSL_CONFIG='{"key":"./ssl/server.key","cert":"./ssl/server.cert"}'
else else
echo "Making new SSL Key" echo "Making new SSL Key"