X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fdocs%2Fweb_deployment.pod;h=a6cba442b4163b00018729332af2f306dbbd15fb;hp=5a9bd93a8ada4df6ad039740143782a5fba883cf;hb=681a340f6be4184b1472a8e1fa9cd5d074f6f325;hpb=7588a4ac90a9b07c08a3107cd1107d773be1c991

diff --git a/rt/docs/web_deployment.pod b/rt/docs/web_deployment.pod
index 5a9bd93a8..a6cba442b 100644
--- a/rt/docs/web_deployment.pod
+++ b/rt/docs/web_deployment.pod
@@ -22,12 +22,6 @@ to use L<Starman>, a high performance preforking server:
 
     /opt/rt4/sbin/rt-server --server Starman --port 8080
 
-B<NOTICE>: After you run the standalone server as root, you will need to
-remove your C<var/mason_data> directory, or the non-standalone servers
-(Apache, etc), which run as a non-privileged user, will not be able to
-write to it and will not work.
-
-
 =head2 Apache
 
 B<WARNING>: Both C<mod_speling> and C<mod_cache> are known to break RT.
@@ -35,6 +29,9 @@ C<mod_speling> will cause RT's CSS and JS to not be loaded, making RT
 appear unstyled. C<mod_cache> will cache cookies, making users be
 spontaneously logged in as other users in the system.
 
+See also L<authentication/Apache configuration>, in case you intend to
+use Apache to provide authentication.
+
 =head3 mod_fastcgi
 
     # Tell FastCGI to put its temporary files somewhere sane; this may
@@ -52,13 +49,17 @@ spontaneously logged in as other users in the system.
 
         AddDefaultCharset UTF-8
 
-        Alias /NoAuth/images/ /opt/rt4/share/html/NoAuth/images/
         ScriptAlias / /opt/rt4/sbin/rt-server.fcgi/
 
         DocumentRoot "/opt/rt4/share/html"
         <Location />
-            Order allow,deny
-            Allow from all
+            <IfVersion >= 2.4> # For Apache 2.4
+                Require all granted
+            </IfVersion>
+            <IfVersion < 2.4>  # For Apache 2.2
+                Order allow,deny
+                Allow from all
+            </IfVersion>
 
             Options +ExecCGI
             AddHandler fastcgi-script fcgi
@@ -89,13 +90,17 @@ to return to the old default.
 
         AddDefaultCharset UTF-8
 
-        Alias /NoAuth/images/ /opt/rt4/share/html/NoAuth/images/
         ScriptAlias / /opt/rt4/sbin/rt-server.fcgi/
 
         DocumentRoot "/opt/rt4/share/html"
         <Location />
-            Order allow,deny
-            Allow from all
+            <IfVersion >= 2.4> # For Apache 2.4
+                Require all granted
+            </IfVersion>
+            <IfVersion < 2.4>  # For Apache 2.2
+                Order allow,deny
+                Allow from all
+            </IfVersion>
 
             Options +ExecCGI
             AddHandler fcgid-script fcgi
@@ -128,8 +133,13 @@ C<SetHandler modperl>, as the example below uses.
 
         DocumentRoot "/opt/rt4/share/html"
         <Location />
-            Order allow,deny
-            Allow from all
+            <IfVersion >= 2.4> # For Apache 2.4
+                Require all granted
+            </IfVersion>
+            <IfVersion < 2.4>  # For Apache 2.2
+                Order allow,deny
+                Allow from all
+            </IfVersion>
 
             SetHandler modperl
             PerlResponseHandler Plack::Handler::Apache2
@@ -187,10 +197,6 @@ With the nginx configuration:
             fastcgi_param  SERVER_NAME        $server_name;
             fastcgi_pass 127.0.0.1:9000;
         }
-
-        location /NoAuth/images {
-            root /opt/rt4/share/html;
-        }
     }
 
 
@@ -198,21 +204,16 @@ With the nginx configuration:
 
     server.modules += ( "mod_fastcgi" )
     $HTTP["host"] =~ "^rt.example.com" {
-        alias.url = (
-            "/NoAuth/images/" => "/opt/rt4/share/html/NoAuth/images/",
-        )
-        $HTTP["url"] !~ "^/NoAuth/images/" {
-            fastcgi.server = (
-                "/" => (
-                    "rt" => (
-                        "port"        => "9000",
-                        "bin-path"    => "/opt/rt4/sbin/rt-server.fcgi",
-                        "check-local" => "disable",
-                        "fix-root-scriptname" => "enable",
-                    )
+        fastcgi.server = (
+            "/" => (
+                "rt" => (
+                    "socket"      => "/opt/rt4/var/socket",
+                    "bin-path"    => "/opt/rt4/sbin/rt-server.fcgi",
+                    "check-local" => "disable",
+                    "fix-root-scriptname" => "enable",
                 )
             )
-        }
+        )
     }
 
 
@@ -226,14 +227,13 @@ F<RT_SiteConfig.pm>:
     Set($WebPath, "/rt");
 
 Then you need to update your Apache configuration to match.  Prefix any RT
-related C<Alias>, C<ScriptAlias> and C<Location> directives with C</rt>.  You
+related C<ScriptAlias> and C<Location> directives with C</rt>.  You
 should also make sure C<DocumentRoot> is B<not> set to
 C</opt/rt4/share/html/>, otherwise RT's source will be served from C</>.
 
 For example: if you're using the sample FastCGI config above, you might change
 the relevant directives to:
 
-    Alias /rt/NoAuth/images/ /opt/rt4/share/html/NoAuth/images/
     ScriptAlias /rt /opt/rt4/sbin/rt-server.fcgi/
 
     # Set DocumentRoot as appropriate for the other content you want to serve
@@ -248,4 +248,3 @@ C<Location> directive.
 
 If you're not using Apache, please see L<Plack::Handler::FCGI> or the web
 server's own documentation for configuration examples.
-