Merge pull request #361 from mkuron/gitignore

Properly gitignore the SSL certificate
2017-06-15 14:39:09 +02:00 · 2017-06-15 14:39:09 +02:00 · 22df70fdbf
commit 22df70fdbf
parent 83cb686e33 5e56edb08c
7 changed files with 3 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,7 +9,5 @@ data/conf/postfix/sql
 data/conf/dovecot/sql
 data/web/inc/vars.local.inc.php
 data/assets/ssl/*
-data/assets/ssl/key.pem
-data/assets/ssl/cert.pem
 .vscode/*
 data/web/.well-known/acme-challenge
--- a/data/assets/ssl-example/ca-key.pem
+++ b/data/assets/ssl-example/ca-key.pem
--- a/data/assets/ssl-example/ca.pem
+++ b/data/assets/ssl-example/ca.pem
--- a/data/assets/ssl-example/cert.pem
+++ b/data/assets/ssl-example/cert.pem
--- a/data/assets/ssl-example/dhparams.pem
+++ b/data/assets/ssl-example/dhparams.pem
--- a/data/assets/ssl-example/key.pem
+++ b/data/assets/ssl-example/key.pem
--- a/generate_config.sh
+++ b/generate_config.sh
@ -79,3 +79,6 @@ COMPOSE_PROJECT_NAME=mailcow-dockerized
 ADDITIONAL_SAN=

 EOF
+
+# copy but don't overwrite existing certificate
+cp -n data/assets/ssl-example/*.pem data/assets/ssl/