From c50879667d60f680e68e0575877b54db549cdaac Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Wed, 10 Jun 2015 20:40:23 +0000
Subject: [PATCH] Adapt apache conf files to Plack

---
 _example/etc/manager-apache2.4.conf | 31 ++++++++++++------------
 _example/etc/manager-apache2.X.conf | 37 +++++++++++++++++------------
 _example/etc/manager-apache2.conf   | 32 +++++++++++++------------
 3 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/_example/etc/manager-apache2.4.conf b/_example/etc/manager-apache2.4.conf
index 5e7ca7ab6..ed380e9a4 100644
--- a/_example/etc/manager-apache2.4.conf
+++ b/_example/etc/manager-apache2.4.conf
@@ -11,9 +11,13 @@
 
     # DocumentRoot
     DocumentRoot __MANAGERDIR__
-    <Directory __MANAGERDIR__>
+    <Directory __MANAGERSTATICDIR__>
         Require all granted
-        Options +ExecCGI +FollowSymLinks
+        Options +FollowSymLinks
+    </Directory>
+    <Directory __MANAGERPSGIDIR__>
+        Require all granted
+        Options +FollowSymLinks
     </Directory>
 
     # On-line documentation
@@ -34,18 +38,15 @@
     </Directory>
 
     # Perl script
-    # Note: to avoid manager stay in memory, we don't use ModPerl::Registry
-    #       by default. Change this to increase manager performances
-    <Files *.pl>
-        SetHandler cgi-script
-        #SetHandler perl-script
-        #PerlResponseHandler ModPerl::Registry
-    </Files>
-
-    # Directory index
-    <IfModule mod_dir.c>
-        DirectoryIndex index.pl index.html
-    </IfModule>
+    # Note: to increase performance, you can avoid manager stay in memory
+    #       by using "SetHandler cgi-script" instead of Plack framework
+    <FilesMatch \.psgi$>
+        #SetHandler cgi-script
+	Options +ExecCGI
+	SetHandler perl-script
+	PerlResponseHandler Plack::Handler::Apache2
+	PerlSetVar psgi_app __MANAGERPSGIDIR__/manager-server.psgi
+    </FilesMatch>
 
     <Location />
         <IfModule mod_deflate.c>
@@ -66,7 +67,7 @@
                 ExpiresDefault "access plus 1 month"
         </IfModule>
     </Location>
-    <Location /skins/>
+    <Location /static/>
         <IfModule mod_expires.c>
                 ExpiresActive On
                 ExpiresDefault "access plus 1 month"
diff --git a/_example/etc/manager-apache2.X.conf b/_example/etc/manager-apache2.X.conf
index ac368af13..5b585695f 100644
--- a/_example/etc/manager-apache2.X.conf
+++ b/_example/etc/manager-apache2.X.conf
@@ -11,7 +11,7 @@
 
     # DocumentRoot
     DocumentRoot __MANAGERDIR__
-    <Directory __MANAGERDIR__>
+    <Directory __MANAGERSTATICDIR__>
         <IfVersion >= 2.3>
             Require all granted
         </IfVersion>
@@ -19,7 +19,17 @@
             Order Deny,Allow
             Allow from all
         </IfVersion>
-        Options +ExecCGI +FollowSymLinks
+        Options +FollowSymLinks
+    </Directory>
+    <Directory __MANAGERPSGIDIR__>
+        <IfVersion >= 2.3>
+            Require all granted
+        </IfVersion>
+        <IfVersion < 2.3>
+            Order Deny,Allow
+            Allow from all
+        </IfVersion>
+        Options +FollowSymLinks
     </Directory>
 
     # On-line documentation
@@ -52,18 +62,15 @@
     </Directory>
 
     # Perl script
-    # Note: to avoid manager stay in memory, we don't use ModPerl::Registry
-    #       by default. Change this to increase manager performances
-    <Files *.pl>
-        SetHandler cgi-script
-        #SetHandler perl-script
-        #PerlResponseHandler ModPerl::Registry
-    </Files>
-
-    # Directory index
-    <IfModule mod_dir.c>
-        DirectoryIndex index.pl index.html
-    </IfModule>
+    # Note: to increase performance, you can avoid manager stay in memory
+    #       by using "SetHandler cgi-script" instead of Plack framework
+    <FilesMatch \.psgi$>
+        #SetHandler cgi-script
+	Options +ExecCGI
+	SetHandler perl-script
+	PerlResponseHandler Plack::Handler::Apache2
+	PerlSetVar psgi_app __MANAGERPSGIDIR__/manager-server.psgi
+    </FilesMatch>
 
     <Location />
         <IfModule mod_deflate.c>
@@ -84,7 +91,7 @@
                 ExpiresDefault "access plus 1 month"
         </IfModule>
     </Location>
-    <Location /skins/>
+    <Location /static/>
         <IfModule mod_expires.c>
                 ExpiresActive On
                 ExpiresDefault "access plus 1 month"
diff --git a/_example/etc/manager-apache2.conf b/_example/etc/manager-apache2.conf
index a5bc7ad16..f9565ef62 100644
--- a/_example/etc/manager-apache2.conf
+++ b/_example/etc/manager-apache2.conf
@@ -11,10 +11,15 @@
 
     # DocumentRoot
     DocumentRoot __MANAGERDIR__
-    <Directory __MANAGERDIR__>
+    <Directory __MANAGERSTATICDIR__>
         Order deny,allow
         Allow from all
-        Options +ExecCGI +FollowSymLinks
+        Options +FollowSymLinks
+    </Directory>
+    <Directory __MANAGERPSGIDIR__>
+        Order deny,allow
+        Allow from all
+        Options +FollowSymLinks
     </Directory>
 
     # On-line documentation
@@ -37,18 +42,15 @@
     </Directory>
 
     # Perl script
-    # Note: to avoid manager stay in memory, we don't use ModPerl::Registry
-    #       by default. Change this to increase manager performances
-    <Files *.pl>
-        SetHandler cgi-script
-        #SetHandler perl-script
-        #PerlResponseHandler ModPerl::Registry
-    </Files>
-
-    # Directory index
-    <IfModule mod_dir.c>
-        DirectoryIndex index.pl index.html
-    </IfModule>
+    # Note: to increase performance, you can avoid manager stay in memory
+    #       by using "SetHandler cgi-script" instead of Plack framework
+    <FilesMatch \.psgi$>
+        #SetHandler cgi-script
+	Options +ExecCGI
+	SetHandler perl-script
+	PerlResponseHandler Plack::Handler::Apache2
+	PerlSetVar psgi_app __MANAGERPSGIDIR__/manager-server.psgi
+    </FilesMatch>
 
     <Location />
         <IfModule mod_deflate.c>
@@ -69,7 +71,7 @@
                 ExpiresDefault "access plus 1 month"
         </IfModule>
     </Location>
-    <Location /skins/>
+    <Location /static/>
         <IfModule mod_expires.c>
                 ExpiresActive On
                 ExpiresDefault "access plus 1 month"