From d4707f8c3328273e4dc14c76d08f8d862514c2b2 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Tue, 13 Sep 2016 18:37:34 -0300 Subject: [PATCH] Deleted ssl.conf and 00-shib.conf because those file are in shib-sp Removed ssl.conf default file in dockerfile --- Dockerfile | 6 ------ container_files/etc/httpd/conf.d/ssl.conf | 6 ------ container_files/etc/httpd/conf.modules.d/00-shib.conf | 1 - 3 files changed, 13 deletions(-) delete mode 100644 container_files/etc/httpd/conf.d/ssl.conf delete mode 100644 container_files/etc/httpd/conf.modules.d/00-shib.conf diff --git a/Dockerfile b/Dockerfile index cd55b79..abdae5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,12 +94,6 @@ VOLUME /opt/shibboleth/ssl/ # Required volumes for mounting Apache SSL files into container VOLUME /opt/httpd/ssl/ -#Added ssl default conf -RUN ln -s /opt/etc/httpd/conf.d/ssl.conf /etc/httpd/conf.d/ssl.conf - -#Added shib module apache -RUN ln -s /opt/etc/httpd/conf.modules.d/00-shib.conf /etc/httpd/conf.modules.d/00-shib.conf -RUN ln -s /usr/lib64/shibboleth/mod_shib_24.so /etc/httpd/modules/mod_shib_24.so #Add httpd configuration RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf diff --git a/container_files/etc/httpd/conf.d/ssl.conf b/container_files/etc/httpd/conf.d/ssl.conf deleted file mode 100644 index ccc067c..0000000 --- a/container_files/etc/httpd/conf.d/ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog -SSLSessionCache shmcb:/run/httpd/sslcache(512000) -SSLSessionCacheTimeout 300 -SSLRandomSeed startup file:/dev/urandom 256 -SSLRandomSeed connect builtin -SSLCryptoDevice builtin diff --git a/container_files/etc/httpd/conf.modules.d/00-shib.conf b/container_files/etc/httpd/conf.modules.d/00-shib.conf deleted file mode 100644 index 0e5c7b2..0000000 --- a/container_files/etc/httpd/conf.modules.d/00-shib.conf +++ /dev/null @@ -1 +0,0 @@ -LoadModule mod_shib /usr/lib64/shibboleth/mod_shib_24.so