From e0d77d647b550bc0e4f881be8dce02b5ee9b8aea Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Tue, 16 Oct 2012 17:54:14 +0200 Subject: [PATCH] fix error in httpd-virtual.conf --- hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java | 2 +- hsarback/src/de/hsadmin/mods/pac/httpd-virtual.jtpl | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java index 436ea4c..b0013fb 100644 --- a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java @@ -68,7 +68,7 @@ public class PacProcessorFactory implements EntityProcessorFactory { "\\ \\ \\ \\ SSLCertificateChainFile \\/etc\\/apache2\\/pems\\/default.chain.pem\" /etc/apache2/virtual.conf.tmp " + "); " + "done"), - new ShellProcessor("for PEM in $( cat /etc/apache2/virtual.conf.tmp | grep SSLCertificateChainFile | cut -c24- ); do " + + new ShellProcessor("for PEM in $( cat /etc/apache2/virtual.conf.tmp | grep SSLCertificateChainFile | cut -c29- ); do " + "ls $PEM >/dev/null 2>&1 || " + " sed -i \"/SSLCertificateChainFile.*${PEM:18:5}.chain.pem/d \" /etc/apache2/virtual.conf.tmp ; " + "done"), diff --git a/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.jtpl b/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.jtpl index 719f1db..81cf943 100644 --- a/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.jtpl +++ b/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.jtpl @@ -16,8 +16,6 @@ NameVirtualHost {PAC_IP}:443 SSLEngine On - SSLCertificateFile /etc/apache2/pems/default.pem - SSLCertificateChainFile /etc/apache2/pems/default.chain.pem SSLCertificateFile /etc/apache2/pems/{PAC}.pem SSLCertificateChainFile /etc/apache2/pems/{PAC}.chain.pem