testing: Remove Apache config hacks for Debian wheezy

This commit is contained in:
Tobias Brunner
2018-11-21 14:32:24 +01:00
parent af6e26ec08
commit d3a59022dd
6 changed files with 5 additions and 38 deletions
@@ -1 +0,0 @@
../conf-enabled/testresults-as-text.conf
@@ -12,13 +12,7 @@ AddHandler cgi-script .cgi
DirectoryIndex ocsp.cgi DirectoryIndex ocsp.cgi
<Directory "/etc/openssl/ocsp"> <Directory "/etc/openssl/ocsp">
Options +ExecCGI Options +ExecCGI
<IfModule mod_authz_core.c> Require all granted
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Allow from all
</IfModule>
</Directory> </Directory>
ErrorLog /var/log/apache2/ocsp/error_log ErrorLog /var/log/apache2/ocsp/error_log
CustomLog /var/log/apache2/ocsp/access_log combined CustomLog /var/log/apache2/ocsp/access_log combined
@@ -34,13 +28,7 @@ Listen 8881
DirectoryIndex ocsp.cgi DirectoryIndex ocsp.cgi
<Directory "/etc/openssl/research/ocsp"> <Directory "/etc/openssl/research/ocsp">
Options +ExecCGI Options +ExecCGI
<IfModule mod_authz_core.c> Require all granted
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Allow from all
</IfModule>
</Directory> </Directory>
ErrorLog /var/log/apache2/ocsp/error_log ErrorLog /var/log/apache2/ocsp/error_log
CustomLog /var/log/apache2/ocsp/access_log combined CustomLog /var/log/apache2/ocsp/access_log combined
@@ -56,13 +44,7 @@ Listen 8882
DirectoryIndex ocsp.cgi DirectoryIndex ocsp.cgi
<Directory "/etc/openssl/sales/ocsp"> <Directory "/etc/openssl/sales/ocsp">
Options +ExecCGI Options +ExecCGI
<IfModule mod_authz_core.c> Require all granted
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Allow from all
</IfModule>
</Directory> </Directory>
ErrorLog /var/log/apache2/ocsp/error_log ErrorLog /var/log/apache2/ocsp/error_log
CustomLog /var/log/apache2/ocsp/access_log combined CustomLog /var/log/apache2/ocsp/access_log combined
@@ -9,13 +9,7 @@ WSGIPythonPath /var/www/tnc
<Directory /var/www/tnc/config> <Directory /var/www/tnc/config>
<Files wsgi.py> <Files wsgi.py>
<IfModule mod_authz_core.c> Require all granted
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Allow from all
</IfModule>
</Files> </Files>
</Directory> </Directory>
@@ -1 +0,0 @@
Include sites-available/000-default.conf
@@ -9,13 +9,7 @@ WSGIPythonPath /var/www/tnc
<Directory /var/www/tnc/config> <Directory /var/www/tnc/config>
<Files wsgi.py> <Files wsgi.py>
<IfModule mod_authz_core.c> Require all granted
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Allow from all
</IfModule>
</Files> </Files>
</Directory> </Directory>
@@ -1 +0,0 @@
Include sites-available/000-default.conf