Module: tools Branch: master Commit: bc4d58b448be3d2fbdb6cd5c180ac74467ae5af0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc4d58b448be3d2fbdb6cd5c1...
Author: Francois Gouget fgouget@codeweavers.com Date: Mon Jun 9 12:48:03 2014 +0200
testbot: Update the SSL Apache configuration section to match the regular one.
---
testbot/doc/vhost_winetestbot.conf | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 5953317..7b84564 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -32,7 +32,7 @@ </Directory> </VirtualHost>
-<VirtualHost 192.168.0.1:443> +<VirtualHost *:443> DocumentRoot /home/winehq/tools/testbot/web/
ServerName winetestbot.example.com @@ -42,8 +42,18 @@ SSLCertificateFile /etc/apache2/ssl.crt/winetestbot.example.com.crt SSLCertificateKeyFile /etc/apache2/ssl.key/winetestbot.example.com.key
- PerlRequire /home/winehq/tools/testbot/lib/startup.pl PerlSwitches -Tw + <Perl> + use strict; + BEGIN + { + $::RootDir = "/home/winehq/tools/testbot"; + unshift @INC, "$::RootDir/lib"; + } + use ObjectModel::CGI::Page; + use WineTestBot::CGI::PageBase; + SetPageBaseCreator(&CreatePageBase); + </Perl>
<Directory /home/winehq/tools/testbot/web> AddHandler perl-script .pl @@ -52,7 +62,10 @@ Options +ExecCGI DirectoryIndex index.pl
+ # Access control the Apache 2.2 way Order allow,deny Allow from all + # And the Apache 2.4 way + Require all granted </Directory> </VirtualHost>