hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

fix error in httpd-virtual.conf

Browse Source
This commit is contained in:
Peter Hormanns 2012-10-16 17:54:14 +02:00
parent fc0573874b
commit e0d77d647b
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
View File

@ -68,7 +68,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
"\\ \\ \\ \\ SSLCertificateChainFile \\/etc\\/apache2\\/pems\\/default.chain.pem\" /etc/apache2/virtual.conf.tmp " + "\\ \\ \\ \\ SSLCertificateChainFile \\/etc\\/apache2\\/pems\\/default.chain.pem\" /etc/apache2/virtual.conf.tmp " +
"); " + "); " +
"done"), "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 || " + "ls $PEM >/dev/null 2>&1 || " +
" sed -i \"/SSLCertificateChainFile.*${PEM:18:5}.chain.pem/d \" /etc/apache2/virtual.conf.tmp ; " + " sed -i \"/SSLCertificateChainFile.*${PEM:18:5}.chain.pem/d \" /etc/apache2/virtual.conf.tmp ; " +
"done"), "done"),

2
hsarback/src/de/hsadmin/mods/pac/httpd-virtual.jtpl
View File

@ -16,8 +16,6 @@ NameVirtualHost {PAC_IP}:443
<VirtualHost {PAC_IP}:443> <VirtualHost {PAC_IP}:443>
SSLEngine On SSLEngine On
SSLCertificateFile /etc/apache2/pems/default.pem
SSLCertificateChainFile /etc/apache2/pems/default.chain.pem
SSLCertificateFile /etc/apache2/pems/{PAC}.pem SSLCertificateFile /etc/apache2/pems/{PAC}.pem
SSLCertificateChainFile /etc/apache2/pems/{PAC}.chain.pem SSLCertificateChainFile /etc/apache2/pems/{PAC}.chain.pem