diff options
Diffstat (limited to 'rt/t/data')
22 files changed, 104 insertions, 44 deletions
diff --git a/rt/t/data/configs/apache2.2+fastcgi.conf b/rt/t/data/configs/apache2.2+fastcgi.conf index 4033479bb..a4016eb42 100644 --- a/rt/t/data/configs/apache2.2+fastcgi.conf +++ b/rt/t/data/configs/apache2.2+fastcgi.conf @@ -5,12 +5,10 @@ ServerAdmin root@localhost %%LOAD_MODULES%% -FastCgiIpcDir %%TMP_DIR%% - <IfModule !mpm_netware_module> <IfModule !mpm_winnt_module> -User www-data -Group www-data +User freeside +Group freeside </IfModule> </IfModule> @@ -28,16 +26,23 @@ LogLevel debug AddDefaultCharset UTF-8 -FastCgiServer %%RT_BIN_PATH%%/mason_handler.fcgi -processes 1 -idle-timeout 180 -initial-env RT_SITE_CONFIG=%%RT_SITE_CONFIG%% +FastCgiServer %%RT_SBIN_PATH%%/rt-server.fcgi \ + -socket %%TMP_DIR%%/socket \ + -processes 1 \ + -idle-timeout 180 \ + -initial-env RT_SITE_CONFIG=%%RT_SITE_CONFIG%% \ + -initial-env RT_TESTING=1 Alias /NoAuth/images/ %%DOCUMENT_ROOT%%/NoAuth/images/ -ScriptAlias / %%RT_BIN_PATH%%/mason_handler.fcgi/ +ScriptAlias / %%RT_SBIN_PATH%%/rt-server.fcgi/ DocumentRoot "%%DOCUMENT_ROOT%%" <Location /> Order allow,deny Allow from all +%%BASIC_AUTH%% + Options +ExecCGI AddHandler fastcgi-script fcgi </Location> diff --git a/rt/t/data/configs/apache2.2+fastcgi.conf.in b/rt/t/data/configs/apache2.2+fastcgi.conf.in index 75cbadbca..3ec36dd0f 100644 --- a/rt/t/data/configs/apache2.2+fastcgi.conf.in +++ b/rt/t/data/configs/apache2.2+fastcgi.conf.in @@ -5,8 +5,6 @@ ServerAdmin root@localhost %%LOAD_MODULES%% -FastCgiIpcDir %%TMP_DIR%% - <IfModule !mpm_netware_module> <IfModule !mpm_winnt_module> User @WEB_USER@ @@ -28,16 +26,23 @@ LogLevel debug AddDefaultCharset UTF-8 -FastCgiServer %%RT_BIN_PATH%%/mason_handler.fcgi -processes 1 -idle-timeout 180 -initial-env RT_SITE_CONFIG=%%RT_SITE_CONFIG%% +FastCgiServer %%RT_SBIN_PATH%%/rt-server.fcgi \ + -socket %%TMP_DIR%%/socket \ + -processes 1 \ + -idle-timeout 180 \ + -initial-env RT_SITE_CONFIG=%%RT_SITE_CONFIG%% \ + -initial-env RT_TESTING=1 Alias /NoAuth/images/ %%DOCUMENT_ROOT%%/NoAuth/images/ -ScriptAlias / %%RT_BIN_PATH%%/mason_handler.fcgi/ +ScriptAlias / %%RT_SBIN_PATH%%/rt-server.fcgi/ DocumentRoot "%%DOCUMENT_ROOT%%" <Location /> Order allow,deny Allow from all +%%BASIC_AUTH%% + Options +ExecCGI AddHandler fastcgi-script fcgi </Location> diff --git a/rt/t/data/configs/apache2.2+mod_perl.conf b/rt/t/data/configs/apache2.2+mod_perl.conf index d1a6e9f15..a50e5b342 100644 --- a/rt/t/data/configs/apache2.2+mod_perl.conf +++ b/rt/t/data/configs/apache2.2+mod_perl.conf @@ -1,3 +1,21 @@ +<IfModule mpm_prefork_module> + StartServers 1 + MinSpareServers 1 + MaxSpareServers 1 + MaxClients 1 + MaxRequestsPerChild 0 +</IfModule> + +<IfModule mpm_worker_module> + StartServers 1 + MinSpareThreads 1 + MaxSpareThreads 1 + ThreadLimit 1 + ThreadsPerChild 1 + MaxClients 1 + MaxRequestsPerChild 0 +</IfModule> + ServerRoot %%SERVER_ROOT%% PidFile %%PID_FILE%% LockFile %%LOCK_FILE%% @@ -7,8 +25,8 @@ ServerAdmin root@localhost <IfModule !mpm_netware_module> <IfModule !mpm_winnt_module> -User www-data -Group www-data +User freeside +Group freeside </IfModule> </IfModule> @@ -26,16 +44,23 @@ LogLevel debug AddDefaultCharset UTF-8 PerlSetEnv RT_SITE_CONFIG %%RT_SITE_CONFIG%% -PerlRequire %%RT_BIN_PATH%%/webmux.pl - -RedirectMatch permanent (.*)/$ $1/index.html DocumentRoot "%%DOCUMENT_ROOT%%" -<Directory "%%DOCUMENT_ROOT%%"> +<Location /> Order allow,deny Allow from all - SetHandler perl-script - PerlResponseHandler RT::Mason -</Directory> +%%BASIC_AUTH%% + + SetHandler modperl + + PerlResponseHandler Plack::Handler::Apache2 + PerlSetVar psgi_app %%RT_SBIN_PATH%%/rt-server +</Location> + +<Perl> + $ENV{RT_TESTING}=1; + use Plack::Handler::Apache2; + Plack::Handler::Apache2->preload("%%RT_SBIN_PATH%%/rt-server"); +</Perl> diff --git a/rt/t/data/configs/apache2.2+mod_perl.conf.in b/rt/t/data/configs/apache2.2+mod_perl.conf.in index 3d28c2cca..3b1f3f618 100644 --- a/rt/t/data/configs/apache2.2+mod_perl.conf.in +++ b/rt/t/data/configs/apache2.2+mod_perl.conf.in @@ -1,3 +1,21 @@ +<IfModule mpm_prefork_module> + StartServers 1 + MinSpareServers 1 + MaxSpareServers 1 + MaxClients 1 + MaxRequestsPerChild 0 +</IfModule> + +<IfModule mpm_worker_module> + StartServers 1 + MinSpareThreads 1 + MaxSpareThreads 1 + ThreadLimit 1 + ThreadsPerChild 1 + MaxClients 1 + MaxRequestsPerChild 0 +</IfModule> + ServerRoot %%SERVER_ROOT%% PidFile %%PID_FILE%% LockFile %%LOCK_FILE%% @@ -26,16 +44,23 @@ LogLevel debug AddDefaultCharset UTF-8 PerlSetEnv RT_SITE_CONFIG %%RT_SITE_CONFIG%% -PerlRequire %%RT_BIN_PATH%%/webmux.pl - -RedirectMatch permanent (.*)/$ $1/index.html DocumentRoot "%%DOCUMENT_ROOT%%" -<Directory "%%DOCUMENT_ROOT%%"> +<Location /> Order allow,deny Allow from all - SetHandler perl-script - PerlResponseHandler RT::Mason -</Directory> +%%BASIC_AUTH%% + + SetHandler modperl + + PerlResponseHandler Plack::Handler::Apache2 + PerlSetVar psgi_app %%RT_SBIN_PATH%%/rt-server +</Location> + +<Perl> + $ENV{RT_TESTING}=1; + use Plack::Handler::Apache2; + Plack::Handler::Apache2->preload("%%RT_SBIN_PATH%%/rt-server"); +</Perl> diff --git a/rt/t/data/gnupg/emails/10-encrypted-inline-plain.txt b/rt/t/data/gnupg/emails/10-encrypted-inline-plain.txt index 93cc19516..4f3e151c3 100644 --- a/rt/t/data/gnupg/emails/10-encrypted-inline-plain.txt +++ b/rt/t/data/gnupg/emails/10-encrypted-inline-plain.txt @@ -8,7 +8,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; x-action=pgp-encrypted Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com -----BEGIN PGP MESSAGE----- Version: GnuPG v1.4.6 (GNU/Linux) diff --git a/rt/t/data/gnupg/emails/11-encrypted-inline-attachment.txt b/rt/t/data/gnupg/emails/11-encrypted-inline-attachment.txt index e3695f776..892433c41 100644 --- a/rt/t/data/gnupg/emails/11-encrypted-inline-attachment.txt +++ b/rt/t/data/gnupg/emails/11-encrypted-inline-attachment.txt @@ -1,6 +1,6 @@ Message-ID: <46BCDCA0.4000205@mit.edu> Date: Fri, 10 Aug 2007 17:46:08 -0400 -From: Christian Ternus <ternus@mit.edu> +From: rt-test@example.com User-Agent: Thunderbird 1.5.0.12 (X11/20070604) MIME-Version: 1.0 To: rt-recipient@example.com diff --git a/rt/t/data/gnupg/emails/12-encrypted-inline-binary.txt b/rt/t/data/gnupg/emails/12-encrypted-inline-binary.txt index e07163bcc..5c646ec79 100644 --- a/rt/t/data/gnupg/emails/12-encrypted-inline-binary.txt +++ b/rt/t/data/gnupg/emails/12-encrypted-inline-binary.txt @@ -1,6 +1,6 @@ Message-ID: <46BCDCF2.3080704@mit.edu> Date: Fri, 10 Aug 2007 17:47:30 -0400 -From: Christian Ternus <ternus@mit.edu> +From: rt-test@example.com User-Agent: Thunderbird 1.5.0.12 (X11/20070604) MIME-Version: 1.0 To: rt-recipient@example.com diff --git a/rt/t/data/gnupg/emails/13-signed-encrypted-MIME-plain.txt b/rt/t/data/gnupg/emails/13-signed-encrypted-MIME-plain.txt index f0bd624a2..a09ccec4c 100644 --- a/rt/t/data/gnupg/emails/13-signed-encrypted-MIME-plain.txt +++ b/rt/t/data/gnupg/emails/13-signed-encrypted-MIME-plain.txt @@ -9,7 +9,7 @@ Content-Type: multipart/encrypted; protocol="application/pgp-encrypted"; boundary="+nBD6E3TurpgldQp" Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com --+nBD6E3TurpgldQp diff --git a/rt/t/data/gnupg/emails/14-signed-encrypted-MIME-attachment.txt b/rt/t/data/gnupg/emails/14-signed-encrypted-MIME-attachment.txt index 8a70384a2..e6d23ea96 100644 --- a/rt/t/data/gnupg/emails/14-signed-encrypted-MIME-attachment.txt +++ b/rt/t/data/gnupg/emails/14-signed-encrypted-MIME-attachment.txt @@ -9,7 +9,7 @@ Content-Type: multipart/encrypted; protocol="application/pgp-encrypted"; boundary="N1GIdlSm9i+YlY4t" Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com --N1GIdlSm9i+YlY4t diff --git a/rt/t/data/gnupg/emails/15-signed-encrypted-MIME-binary.txt b/rt/t/data/gnupg/emails/15-signed-encrypted-MIME-binary.txt index 55f69a19d..58049e1f2 100644 --- a/rt/t/data/gnupg/emails/15-signed-encrypted-MIME-binary.txt +++ b/rt/t/data/gnupg/emails/15-signed-encrypted-MIME-binary.txt @@ -9,7 +9,7 @@ Content-Type: multipart/encrypted; protocol="application/pgp-encrypted"; boundary="QWpDgw58+k1mSFBj" Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com --QWpDgw58+k1mSFBj diff --git a/rt/t/data/gnupg/emails/16-signed-encrypted-inline-plain.txt b/rt/t/data/gnupg/emails/16-signed-encrypted-inline-plain.txt index 5686a12bf..84e49caf2 100644 --- a/rt/t/data/gnupg/emails/16-signed-encrypted-inline-plain.txt +++ b/rt/t/data/gnupg/emails/16-signed-encrypted-inline-plain.txt @@ -8,7 +8,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; x-action=pgp-encrypted Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com -----BEGIN PGP MESSAGE----- Version: GnuPG v1.4.6 (GNU/Linux) diff --git a/rt/t/data/gnupg/emails/18-signed-encrypted-inline-binary.txt b/rt/t/data/gnupg/emails/18-signed-encrypted-inline-binary.txt index 315ba5898..61e11e22c 100644 --- a/rt/t/data/gnupg/emails/18-signed-encrypted-inline-binary.txt +++ b/rt/t/data/gnupg/emails/18-signed-encrypted-inline-binary.txt @@ -1,6 +1,6 @@ Message-ID: <46BCDC0C.6090400@mit.edu> Date: Fri, 10 Aug 2007 17:43:40 -0400 -From: Christian Ternus <ternus@mit.edu> +From: rt-test@example.com User-Agent: Thunderbird 1.5.0.12 (X11/20070604) MIME-Version: 1.0 To: rt-recipient@example.com diff --git a/rt/t/data/gnupg/emails/19-signed-inline-plain-nested.txt b/rt/t/data/gnupg/emails/19-signed-inline-plain-nested.txt index eb763bdc1..6ed683d07 100644 --- a/rt/t/data/gnupg/emails/19-signed-inline-plain-nested.txt +++ b/rt/t/data/gnupg/emails/19-signed-inline-plain-nested.txt @@ -8,7 +8,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; x-action=pgp-signed Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 diff --git a/rt/t/data/gnupg/emails/2-signed-MIME-plain-with-attachment.txt b/rt/t/data/gnupg/emails/2-signed-MIME-plain-with-attachment.txt index 851549c02..c658e6b69 100755 --- a/rt/t/data/gnupg/emails/2-signed-MIME-plain-with-attachment.txt +++ b/rt/t/data/gnupg/emails/2-signed-MIME-plain-with-attachment.txt @@ -9,7 +9,7 @@ Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="bKyqfOwhbdpXa4YI" Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com --bKyqfOwhbdpXa4YI diff --git a/rt/t/data/gnupg/emails/3-signed-MIME-plain-with-binary.txt b/rt/t/data/gnupg/emails/3-signed-MIME-plain-with-binary.txt index 82ef7e9f3..ed8e392b4 100755 --- a/rt/t/data/gnupg/emails/3-signed-MIME-plain-with-binary.txt +++ b/rt/t/data/gnupg/emails/3-signed-MIME-plain-with-binary.txt @@ -9,7 +9,7 @@ Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="pY3vCvL1qV+PayAL" Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com --pY3vCvL1qV+PayAL diff --git a/rt/t/data/gnupg/emails/4-signed-inline-plain.txt b/rt/t/data/gnupg/emails/4-signed-inline-plain.txt index 1dcecaedb..9240d81b0 100644 --- a/rt/t/data/gnupg/emails/4-signed-inline-plain.txt +++ b/rt/t/data/gnupg/emails/4-signed-inline-plain.txt @@ -8,7 +8,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; x-action=pgp-signed Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 diff --git a/rt/t/data/gnupg/emails/5-signed-inline-with-attachment.txt b/rt/t/data/gnupg/emails/5-signed-inline-with-attachment.txt index 638f0fda5..763f97138 100644 --- a/rt/t/data/gnupg/emails/5-signed-inline-with-attachment.txt +++ b/rt/t/data/gnupg/emails/5-signed-inline-with-attachment.txt @@ -1,6 +1,6 @@ Message-ID: <46BCDA81.3030308@mit.edu> Date: Fri, 10 Aug 2007 17:37:05 -0400 -From: Christian Ternus <ternus@mit.edu> +From: rt-test@example.com User-Agent: Thunderbird 1.5.0.12 (X11/20070604) MIME-Version: 1.0 To: rt-recipient@example.com diff --git a/rt/t/data/gnupg/emails/6-signed-inline-with-binary.txt b/rt/t/data/gnupg/emails/6-signed-inline-with-binary.txt index 2c725aa58..d0251ccc7 100644 --- a/rt/t/data/gnupg/emails/6-signed-inline-with-binary.txt +++ b/rt/t/data/gnupg/emails/6-signed-inline-with-binary.txt @@ -1,6 +1,6 @@ Message-ID: <46BCDAE6.4090803@mit.edu> Date: Fri, 10 Aug 2007 17:38:46 -0400 -From: Christian Ternus <ternus@mit.edu> +From: rt-test@example.com User-Agent: Thunderbird 1.5.0.12 (X11/20070604) MIME-Version: 1.0 To: rt-recipient@example.com diff --git a/rt/t/data/gnupg/emails/7-encrypted-MIME-plain.txt b/rt/t/data/gnupg/emails/7-encrypted-MIME-plain.txt index 11e3b7cda..cabed5314 100644 --- a/rt/t/data/gnupg/emails/7-encrypted-MIME-plain.txt +++ b/rt/t/data/gnupg/emails/7-encrypted-MIME-plain.txt @@ -9,7 +9,7 @@ Content-Type: multipart/encrypted; protocol="application/pgp-encrypted"; boundary="YiEDa0DAkWCtVeE4" Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com --YiEDa0DAkWCtVeE4 diff --git a/rt/t/data/gnupg/emails/8-encrypted-MIME-with-attachment.txt b/rt/t/data/gnupg/emails/8-encrypted-MIME-with-attachment.txt index 3781a62e1..c28eb9843 100644 --- a/rt/t/data/gnupg/emails/8-encrypted-MIME-with-attachment.txt +++ b/rt/t/data/gnupg/emails/8-encrypted-MIME-with-attachment.txt @@ -9,7 +9,7 @@ Content-Type: multipart/encrypted; protocol="application/pgp-encrypted"; boundary="FFoLq8A0u+X9iRU8" Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com --FFoLq8A0u+X9iRU8 diff --git a/rt/t/data/gnupg/emails/9-encrypted-MIME-with-binary.txt b/rt/t/data/gnupg/emails/9-encrypted-MIME-with-binary.txt index cafc88077..1cc8f0696 100644 --- a/rt/t/data/gnupg/emails/9-encrypted-MIME-with-binary.txt +++ b/rt/t/data/gnupg/emails/9-encrypted-MIME-with-binary.txt @@ -9,7 +9,7 @@ Content-Type: multipart/encrypted; protocol="application/pgp-encrypted"; boundary="GID0FwUMdk1T2AWN" Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) -From: ternus@mit.edu (Christian Ternus) +From: rt-test@example.com --GID0FwUMdk1T2AWN diff --git a/rt/t/data/gnupg/emails/special/quoted_inline_signature.txt b/rt/t/data/gnupg/emails/special/quoted_inline_signature.txt index 131d27adc..af67b7e09 100644 --- a/rt/t/data/gnupg/emails/special/quoted_inline_signature.txt +++ b/rt/t/data/gnupg/emails/special/quoted_inline_signature.txt @@ -3,7 +3,7 @@ Subject: Test Email ID:4 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline -From: root@localhost +From: rt-test@example.com Forwarded email with signature quoted. RT shouldn't bother about it. |