diff options
| -rw-r--r-- | apache2/conf.d/local-ssl.conf | 16 | ||||
| -rwxr-xr-x | postfix/postfix.sh | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/apache2/conf.d/local-ssl.conf b/apache2/conf.d/local-ssl.conf index 4665362..4e1de50 100644 --- a/apache2/conf.d/local-ssl.conf +++ b/apache2/conf.d/local-ssl.conf @@ -1,17 +1,23 @@ SSLEngine on SSLCertificateFile /etc/ssl/certs/apache2.pem SSLCertificateKeyFile /etc/ssl/private/apache2.pem -SSLCACertificatePath /etc/ssl/certs -#SSLCARevocationPath /etc/apache2/ssl.crl +SSLCACertificatePath /etc/ssl/certs/ +#SSLCARevocationPath /etc/apache2/ssl.crl/ #SSLCARevocationFile /etc/apache2/ssl.crl/ca-bundle.crl + #SSLVerifyClient require #SSLVerifyDepth 10 -<Files ~ "\.(cgi|shtml|phtml|php3?)$"> +#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire +<FilesMatch "\.(cgi|shtml|phtml|php)$"> SSLOptions +StdEnvVars -</Files> -<Directory "/usr/lib/cgi-bin"> +</FilesMatch> +<Directory /usr/lib/cgi-bin> SSLOptions +StdEnvVars </Directory> +BrowserMatch ".*MSIE.*" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + #CustomLog /var/log/apache2/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" diff --git a/postfix/postfix.sh b/postfix/postfix.sh index e02b89e..4cd9fe7 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -66,10 +66,10 @@ else fi dkimproxy= -if [ "1" = "$amavis" ] && [ -x /usr/bin/dkimsign ] && grep -q :10024 /etc/init.d/dkimproxy; then +if [ "1" = "$amavis" ] && [ -x /usr/bin/dkimsign ]; then dkimproxy=1 else - echo >&2 "WARNING: Avoiding/disabling DKIMproxy setup: not installed or fully configured." + echo >&2 "WARNING: Avoiding/disabling DKIMproxy setup: not installed." fi catfilefromownrealm() { |