diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2016-07-16 15:19:53 +0200 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2016-07-16 15:19:53 +0200 |
| commit | bf372706c469764d59e9f29c39e3ecbebd72b8d2 (patch) | |
| tree | 0f0e296e2d50e4a7faf99ae6fa428d2681e81ea1 /testing/hosts/winnetou/etc/apache2 | |
| parent | 518dd33c94e041db0444c7d1f33da363bb8e3faf (diff) | |
| download | vyos-strongswan-bf372706c469764d59e9f29c39e3ecbebd72b8d2.tar.gz vyos-strongswan-bf372706c469764d59e9f29c39e3ecbebd72b8d2.zip | |
Imported Upstream version 5.5.0
Diffstat (limited to 'testing/hosts/winnetou/etc/apache2')
| -rw-r--r-- | testing/hosts/winnetou/etc/apache2/conf-enabled/testresults-as-text.conf | 1 | ||||
| -rw-r--r-- | testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf | 12 | ||||
| -rw-r--r-- | testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost.conf (renamed from testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost) | 33 |
3 files changed, 37 insertions, 9 deletions
diff --git a/testing/hosts/winnetou/etc/apache2/conf-enabled/testresults-as-text.conf b/testing/hosts/winnetou/etc/apache2/conf-enabled/testresults-as-text.conf new file mode 100644 index 000000000..6f5f3011c --- /dev/null +++ b/testing/hosts/winnetou/etc/apache2/conf-enabled/testresults-as-text.conf @@ -0,0 +1 @@ +AddType text/plain .iptables .log .sql diff --git a/testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf b/testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf new file mode 100644 index 000000000..933589906 --- /dev/null +++ b/testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf @@ -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> diff --git a/testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost b/testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost.conf index b76080e37..0772c34ea 100644 --- a/testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost +++ b/testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost.conf @@ -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 |