[freeside-commits] branch master updated. 31104e36b65911d1a8b93644853af0838600f771

[Mark Wells]

The branch, master has been updated
       via  31104e36b65911d1a8b93644853af0838600f771 (commit)
      from  704bb43d5343eeb523a13be55506b804d8c67bd0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31104e36b65911d1a8b93644853af0838600f771
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Sep 27 09:45:54 2016 -0700

    restore missing files from rt 4.2.13, #13852

diff --git a/rt/t/data/configs/apache2.4+fastcgi.conf.in b/rt/t/data/configs/apache2.4+fastcgi.conf.in
new file mode 100644
index 0000000..665ddc4
--- /dev/null
+++ b/rt/t/data/configs/apache2.4+fastcgi.conf.in
@@ -0,0 +1,48 @@
+ServerRoot %%SERVER_ROOT%%
+PidFile %%PID_FILE%%
+ServerAdmin root at localhost
+
+%%LOAD_MODULES%%
+
+<IfModule !mpm_netware_module>
+<IfModule !mpm_winnt_module>
+User @WEB_USER@
+Group @WEB_GROUP@
+</IfModule>
+</IfModule>
+
+ServerName localhost
+Listen %%LISTEN%%
+
+ErrorLog "%%LOG_FILE%%"
+LogLevel debug
+
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Require all denied
+</Directory>
+
+AddDefaultCharset UTF-8
+
+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
+
+ScriptAlias / %%RT_SBIN_PATH%%/rt-server.fcgi/
+
+DocumentRoot "%%DOCUMENT_ROOT%%"
+<Location />
+
+    <RequireAll>
+        Require all granted
+%%BASIC_AUTH%%
+    </RequireAll>
+
+    Options +ExecCGI
+    AddHandler fastcgi-script fcgi
+</Location>
+
diff --git a/rt/t/data/configs/apache2.4+mod_perl.conf.in b/rt/t/data/configs/apache2.4+mod_perl.conf.in
new file mode 100644
index 0000000..eb144cb
--- /dev/null
+++ b/rt/t/data/configs/apache2.4+mod_perl.conf.in
@@ -0,0 +1,66 @@
+<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%%
+ServerAdmin root at localhost
+
+%%LOAD_MODULES%%
+
+<IfModule !mpm_netware_module>
+<IfModule !mpm_winnt_module>
+User @WEB_USER@
+Group @WEB_GROUP@
+</IfModule>
+</IfModule>
+
+ServerName localhost
+Listen %%LISTEN%%
+
+ErrorLog "%%LOG_FILE%%"
+LogLevel debug
+
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Require all denied
+</Directory>
+
+AddDefaultCharset UTF-8
+PerlSetEnv RT_SITE_CONFIG %%RT_SITE_CONFIG%%
+
+DocumentRoot "%%DOCUMENT_ROOT%%"
+<Location />
+
+    <RequireAll>
+        Require all granted
+%%BASIC_AUTH%%
+    </RequireAll>
+
+    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>
+

-----------------------------------------------------------------------

Summary of changes:
 .../{apache2.2+fastcgi.conf.in => apache2.4+fastcgi.conf.in}  |    9 ++++-----
 ...{apache2.2+mod_perl.conf.in => apache2.4+mod_perl.conf.in} |    9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)
 copy rt/t/data/configs/{apache2.2+fastcgi.conf.in => apache2.4+fastcgi.conf.in} (88%)
 copy rt/t/data/configs/{apache2.2+mod_perl.conf.in => apache2.4+mod_perl.conf.in} (92%)