From bf372706c469764d59e9f29c39e3ecbebd72b8d2 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Sat, 16 Jul 2016 15:19:53 +0200 Subject: Imported Upstream version 5.5.0 --- .../apache2/conf-enabled/testresults-as-text.conf | 1 + .../etc/apache2/sites-available/000-default.conf | 12 ++++ .../etc/apache2/sites-enabled/001-ocsp_vhost | 54 ----------------- .../etc/apache2/sites-enabled/001-ocsp_vhost.conf | 69 ++++++++++++++++++++++ 4 files changed, 82 insertions(+), 54 deletions(-) create mode 100644 testing/hosts/winnetou/etc/apache2/conf-enabled/testresults-as-text.conf create mode 100644 testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf delete mode 100644 testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost create mode 100644 testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost.conf (limited to 'testing/hosts/winnetou/etc/apache2') 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 @@ + + ServerAdmin webmaster@localhost + + DocumentRoot /var/www + + Options Indexes FollowSymLinks MultiViews + + + LogLevel warn + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + diff --git a/testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost b/testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost deleted file mode 100644 index b76080e37..000000000 --- a/testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost +++ /dev/null @@ -1,54 +0,0 @@ -# OCSP Server - -Listen 8880 - -AddHandler cgi-script .cgi - - - ServerAdmin root@strongswan.org - DocumentRoot /etc/openssl/ocsp - ServerName ocsp.strongswan.org - ServerAlias 192.168.0.150 - DirectoryIndex ocsp.cgi - - Options +ExecCGI - Order allow,deny - Allow from all - - ErrorLog /var/log/apache2/ocsp/error_log - CustomLog /var/log/apache2/ocsp/access_log combined - - -Listen 8881 - - - ServerAdmin root@research.strongswan.org - DocumentRoot /etc/openssl/research/ocsp - ServerName ocsp.research.strongswan.org - ServerAlias ocsp.strongswan.org 192.168.0.150 - DirectoryIndex ocsp.cgi - - Options +ExecCGI - Order allow,deny - Allow from all - - ErrorLog /var/log/apache2/ocsp/error_log - CustomLog /var/log/apache2/ocsp/access_log combined - - -Listen 8882 - - - ServerAdmin root@sales.strongswan.org - DocumentRoot /etc/openssl/sales/ocsp - ServerName ocsp.sales.strongswan.org - ServerAlias ocsp.strongswan.org 192.168.0.150 - DirectoryIndex ocsp.cgi - - Options +ExecCGI - Order allow,deny - Allow from all - - ErrorLog /var/log/apache2/ocsp/error_log - CustomLog /var/log/apache2/ocsp/access_log combined - diff --git a/testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost.conf b/testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost.conf new file mode 100644 index 000000000..0772c34ea --- /dev/null +++ b/testing/hosts/winnetou/etc/apache2/sites-enabled/001-ocsp_vhost.conf @@ -0,0 +1,69 @@ +# OCSP Server + +Listen 8880 + +AddHandler cgi-script .cgi + + + ServerAdmin root@strongswan.org + DocumentRoot /etc/openssl/ocsp + ServerName ocsp.strongswan.org + ServerAlias 192.168.0.150 + DirectoryIndex ocsp.cgi + + Options +ExecCGI + + Require all granted + + + Order deny,allow + Allow from all + + + ErrorLog /var/log/apache2/ocsp/error_log + CustomLog /var/log/apache2/ocsp/access_log combined + + +Listen 8881 + + + ServerAdmin root@research.strongswan.org + DocumentRoot /etc/openssl/research/ocsp + ServerName ocsp.research.strongswan.org + ServerAlias ocsp.strongswan.org 192.168.0.150 + DirectoryIndex ocsp.cgi + + Options +ExecCGI + + Require all granted + + + Order deny,allow + Allow from all + + + ErrorLog /var/log/apache2/ocsp/error_log + CustomLog /var/log/apache2/ocsp/access_log combined + + +Listen 8882 + + + ServerAdmin root@sales.strongswan.org + DocumentRoot /etc/openssl/sales/ocsp + ServerName ocsp.sales.strongswan.org + ServerAlias ocsp.strongswan.org 192.168.0.150 + DirectoryIndex ocsp.cgi + + Options +ExecCGI + + Require all granted + + + Order deny,allow + Allow from all + + + ErrorLog /var/log/apache2/ocsp/error_log + CustomLog /var/log/apache2/ocsp/access_log combined + -- cgit v1.2.3