better HTTPS configuration

docker · May 1, 2017 · 51e4af3 · 51e4af3
1 parent f2eeca5
commit 51e4af3
Showing 8 changed files with 8 additions and 16 deletions.
diff --git a/comanage-registry-basic-auth/000-comanage.conf b/comanage-registry-basic-auth/000-comanage.conf
@@ -43,7 +43,6 @@
 
   SSLCertificateFile /etc/apache2/cert.pem
   SSLCertificateKeyFile /etc/apache2/privkey.pem
-  SSLCertificateChainFile /etc/apache2/chain.pem
 
   <Directory /var/www/html/registry>
     Options Indexes FollowSymLinks

diff --git a/comanage-registry-basic-auth/README.md b/comanage-registry-basic-auth/README.md
@@ -149,11 +149,10 @@ stderr of the container.
 
 ### HTTPS Configuration
 
-Mount or COPY in an X.509 certificate file, associated private key file,
-and certificate signing chain file.
+Mount or COPY in an X.509 certificate file (containing the CA signing certificate(s), if any)
+and associated private key file.
 
 ```
 COPY cert.pem /etc/apache2/cert.pem
 COPY privkey.pem /etc/apache2/privkey.pem
-COPY chain.pem /etc/apache2/chain.pem
 ```
diff --git a/comanage-registry-mod-auth-openidc/000-comanage.conf b/comanage-registry-mod-auth-openidc/000-comanage.conf
@@ -43,7 +43,6 @@
 
   SSLCertificateFile /etc/apache2/cert.pem
   SSLCertificateKeyFile /etc/apache2/privkey.pem
-  SSLCertificateChainFile /etc/apache2/chain.pem
 
   IncludeOptional /etc/apache2/conf-enabled/mod-auth-openidc.conf
 

diff --git a/comanage-registry-mod-auth-openidc/README.md b/comanage-registry-mod-auth-openidc/README.md
@@ -165,11 +165,10 @@ stderr of the container.
 
 ### HTTPS Configuration
 
-Mount or COPY in an X.509 certificate file, associated private key file,
-and certificate signing chain file.
+Mount or COPY in an X.509 certificate file (containing the CA signing certificate(s), if any)
+and associated private key file.
 
 ```
 COPY cert.pem /etc/apache2/cert.pem
 COPY privkey.pem /etc/apache2/privkey.pem
-COPY chain.pem /etc/apache2/chain.pem
 ```
diff --git a/comanage-registry-shibboleth-sp/000-comanage.conf b/comanage-registry-shibboleth-sp/000-comanage.conf
@@ -43,7 +43,6 @@
 
   SSLCertificateFile /etc/apache2/cert.pem
   SSLCertificateKeyFile /etc/apache2/privkey.pem
-  SSLCertificateChainFile /etc/apache2/chain.pem
 
   <Directory /var/www/html/registry>
     Options Indexes FollowSymLinks

diff --git a/comanage-registry-shibboleth-sp/README.md b/comanage-registry-shibboleth-sp/README.md
@@ -158,11 +158,10 @@ by setting the `logger` configuration option in `shibboleth2.xml`.
 
 ### HTTPS Configuration
 
-Mount or COPY in an X.509 certificate file, associated private key file,
-and certificate signing chain file.
+Mount or COPY in an X.509 certificate file (containing the CA signing certificate(s), if any)
+and associated private key file.
 
 ```
 COPY cert.pem /etc/apache2/cert.pem
 COPY privkey.pem /etc/apache2/privkey.pem
-COPY chain.pem /etc/apache2/chain.pem
 ```
diff --git a/comanage-registry/000-comanage.conf b/comanage-registry/000-comanage.conf
@@ -43,7 +43,6 @@
 
   SSLCertificateFile /etc/apache2/cert.pem
   SSLCertificateKeyFile /etc/apache2/privkey.pem
-  SSLCertificateChainFile /etc/apache2/chain.pem
 
   <Directory /var/www/html/registry>
     Options Indexes FollowSymLinks

diff --git a/comanage-registry/README.md b/comanage-registry/README.md
@@ -137,11 +137,10 @@ stderr of the container.
 
 ### HTTPS Configuration
 
-Mount or COPY in an X.509 certificate file, associated private key file,
-and certificate signing chain file.
+Mount or COPY in an X.509 certificate file (containing the CA signing certificate(s), if any)
+and associated private key file.
 
 ```
 COPY cert.pem /etc/apache2/cert.pem
 COPY privkey.pem /etc/apache2/privkey.pem
-COPY chain.pem /etc/apache2/chain.pem
 ```