testing: Remove Apache config hacks for Debian wheezy
authorTobias Brunner <tobias@strongswan.org>
Mon, 1 Oct 2018 15:50:40 +0000 (17:50 +0200)
committerTobias Brunner <tobias@strongswan.org>
Wed, 21 Nov 2018 13:32:24 +0000 (14:32 +0100)
testing/hosts/winnetou/etc/apache2/conf.d/testresults-as-text [deleted symlink]
testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost.conf
testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/000-default.conf
testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/default [deleted file]
testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/000-default.conf
testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/default [deleted file]

diff --git a/testing/hosts/winnetou/etc/apache2/conf.d/testresults-as-text b/testing/hosts/winnetou/etc/apache2/conf.d/testresults-as-text
deleted file mode 120000 (symlink)
index 776e9e9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../conf-enabled/testresults-as-text.conf
\ No newline at end of file
index 0772c34..fb9e984 100644 (file)
@@ -12,13 +12,7 @@ AddHandler cgi-script .cgi
     DirectoryIndex ocsp.cgi
     <Directory "/etc/openssl/ocsp">
         Options  +ExecCGI
-        <IfModule mod_authz_core.c>
-            Require all granted
-        </IfModule>
-        <IfModule !mod_authz_core.c>
-            Order deny,allow
-            Allow from all
-        </IfModule>
+        Require all granted
    </Directory>
    ErrorLog     /var/log/apache2/ocsp/error_log
    CustomLog    /var/log/apache2/ocsp/access_log combined
@@ -34,13 +28,7 @@ Listen 8881
     DirectoryIndex ocsp.cgi
     <Directory "/etc/openssl/research/ocsp">
         Options +ExecCGI
-        <IfModule mod_authz_core.c>
-            Require all granted
-        </IfModule>
-        <IfModule !mod_authz_core.c>
-            Order deny,allow
-            Allow from all
-        </IfModule>
+        Require all granted
    </Directory>
    ErrorLog     /var/log/apache2/ocsp/error_log
    CustomLog    /var/log/apache2/ocsp/access_log combined
@@ -56,13 +44,7 @@ Listen 8882
     DirectoryIndex ocsp.cgi
     <Directory "/etc/openssl/sales/ocsp">
         Options +ExecCGI
-        <IfModule mod_authz_core.c>
-            Require all granted
-        </IfModule>
-        <IfModule !mod_authz_core.c>
-            Order deny,allow
-            Allow from all
-        </IfModule>
+        Require all granted
    </Directory>
    ErrorLog     /var/log/apache2/ocsp/error_log
    CustomLog    /var/log/apache2/ocsp/access_log combined
index 4075f75..cd5056e 100644 (file)
@@ -9,13 +9,7 @@ WSGIPythonPath /var/www/tnc
 
     <Directory /var/www/tnc/config>
         <Files wsgi.py>
-            <IfModule mod_authz_core.c>
-               Require all granted
-            </IfModule>
-            <IfModule !mod_authz_core.c>
-                Order deny,allow
-                Allow from all
-            </IfModule>
+            Require all granted
         </Files>
     </Directory>
 
diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/default b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/default
deleted file mode 100644 (file)
index 1dc8b56..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Include sites-available/000-default.conf
\ No newline at end of file
index 4075f75..cd5056e 100644 (file)
@@ -9,13 +9,7 @@ WSGIPythonPath /var/www/tnc
 
     <Directory /var/www/tnc/config>
         <Files wsgi.py>
-            <IfModule mod_authz_core.c>
-               Require all granted
-            </IfModule>
-            <IfModule !mod_authz_core.c>
-                Order deny,allow
-                Allow from all
-            </IfModule>
+            Require all granted
         </Files>
     </Directory>
 
diff --git a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/default b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/default
deleted file mode 100644 (file)
index 1dc8b56..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Include sites-available/000-default.conf
\ No newline at end of file