diff options
Diffstat (limited to 'apache2')
| -rw-r--r-- | apache2/conf.d/local-git.conf | 27 | ||||
| -rw-r--r-- | apache2/conf.d/local-ikiwiki-multilang.conf | 7 | ||||
| -rw-r--r-- | apache2/conf.d/local-ikiwiki.conf | 8 | ||||
| -rw-r--r-- | apache2/conf.d/local-ssl.conf | 16 |
4 files changed, 44 insertions, 14 deletions
diff --git a/apache2/conf.d/local-git.conf b/apache2/conf.d/local-git.conf index 04d79bb..2140bc2 100644 --- a/apache2/conf.d/local-git.conf +++ b/apache2/conf.d/local-git.conf @@ -1,8 +1,29 @@ AddDefaultCharset UTF-8 -Alias /gitweb.css /var/www/gitweb.css -Alias /git-favicon.png /var/www/git-favicon.png -Alias /git-logo.png /var/www/git-logo.png +<Directory /srv/git> + Options FollowSymLinks + AllowOverride None + Order allow,deny + allow from all +</Directory> + +<Directory /usr/lib/cgi-bin> + Options ExecCgi + AllowOverride None + Order allow,deny + allow from all +</Directory> + +Alias /gitweb.css /usr/share/gitweb/gitweb.css +Alias /git-favicon.png /usr/share/gitweb/git-favicon.png +Alias /git-logo.png /usr/share/gitweb/git-logo.png + +<Directory /usr/share/gitweb> + Options None + AllowOverride None + Order allow,deny + allow from all +</Directory> RewriteEngine on RewriteRule ^/(\?.*)?$ /usr/lib/cgi-bin/gitweb.cgi%{REQUEST_URI} [T=application/x-httpd-cgi,L,NS] diff --git a/apache2/conf.d/local-ikiwiki-multilang.conf b/apache2/conf.d/local-ikiwiki-multilang.conf new file mode 100644 index 0000000..086d653 --- /dev/null +++ b/apache2/conf.d/local-ikiwiki-multilang.conf @@ -0,0 +1,7 @@ +<Location /> + Options -Indexes +MultiViews + DirectoryIndex index +</Location> +AddLanguage da .da + +AddDefaultCharset UTF-8 diff --git a/apache2/conf.d/local-ikiwiki.conf b/apache2/conf.d/local-ikiwiki.conf index 6c7b73e..987e434 100644 --- a/apache2/conf.d/local-ikiwiki.conf +++ b/apache2/conf.d/local-ikiwiki.conf @@ -1,10 +1,6 @@ <Location /> - Options -Indexes +MultiViews - DirectoryIndex index + Options None + DirectoryIndex index.html </Location> -AddLanguage da .da AddDefaultCharset UTF-8 - -RewriteEngine On -RewriteRule ^((.*/)?[^\.]+)(\.html|/)$ $1.da.html [R] 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" |