denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Update Apache config for newer Debian releases

Browse Source 
It is still compatible with the current release as the config in
sites-available will be ignored, while conf-enabled does not exist and
is not included in the main config.
This commit is contained in:
Tobias Brunner
2016-06-15 16:24:44 +02:00
parent 2b0a6811ab
commit 1c616eccae
9 changed files with 103 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/hosts/winnetou/etc/apache2/conf-enabled/testresults-as-text.conf
+1
View File
@@ -0,0 +1 @@
AddType text/plain .iptables .log .sql
testing/hosts/winnetou/etc/apache2/conf.d/testresults-as-text
-1
View File
@@ -1 +0,0 @@
AddType text/plain .iptables .log .sql
testing/hosts/winnetou/etc/apache2/conf.d/testresults-as-text
Symlink
+1
View File
@@ -0,0 +1 @@
../conf-enabled/testresults-as-text.conf
testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf
+12
View File
@@ -0,0 +1,12 @@
<VirtualHost *:80>
ServerAdmin webmaster@localhost
DocumentRoot /var/www
<Directory /var/www/>
Options Indexes FollowSymLinks MultiViews
</Directory>
LogLevel warn
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
</VirtualHost>
testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost → testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost.conf
+24 -9
View File
@@ -11,9 +11,14 @@ AddHandler cgi-script .cgi
ServerAlias 192.168.0.150
DirectoryIndex ocsp.cgi
<Directory "/etc/openssl/ocsp">
Options +ExecCGI
Order allow,deny
Allow from all
Options +ExecCGI
<IfModule mod_authz_core.c>
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Allow from all
</IfModule>
</Directory>
ErrorLog /var/log/apache2/ocsp/error_log
CustomLog /var/log/apache2/ocsp/access_log combined
@@ -28,9 +33,14 @@ Listen 8881
ServerAlias ocsp.strongswan.org 192.168.0.150
DirectoryIndex ocsp.cgi
<Directory "/etc/openssl/research/ocsp">
Options +ExecCGI
Order allow,deny
Allow from all
Options +ExecCGI
<IfModule mod_authz_core.c>
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Allow from all
</IfModule>
</Directory>
ErrorLog /var/log/apache2/ocsp/error_log
CustomLog /var/log/apache2/ocsp/access_log combined
@@ -45,9 +55,14 @@ Listen 8882
ServerAlias ocsp.strongswan.org 192.168.0.150
DirectoryIndex ocsp.cgi
<Directory "/etc/openssl/sales/ocsp">
Options +ExecCGI
Order allow,deny
Allow from all
Options +ExecCGI
<IfModule mod_authz_core.c>
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
Order deny,allow
Allow from all
</IfModule>
</Directory>
ErrorLog /var/log/apache2/ocsp/error_log
CustomLog /var/log/apache2/ocsp/access_log combined