apache: remove php5-cgi support, always generate php config

[hcoop/domtool2.git] / src / plugins / apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index c97b9a3..fa5cc3a 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -466,8 +466,7 @@ fun vhostPost () = (!post ();
                    write "</VirtualHost>\n";
                    app (TextIO.closeOut o #2) (!vhostFiles))
 
                    write "</VirtualHost>\n";
                    app (TextIO.closeOut o #2) (!vhostFiles))
 

-val php_version = fn (EVar "php5", _) => SOME 5
-                   | (EVar "fast_php", _) => SOME 6
+val php_version = fn (EVar "fast_php", _) => SOME 6

                    | _ => NONE
 
 fun vhostBody (env, makeFullHost) =
                    | _ => NONE
 
 fun vhostBody (env, makeFullHost) =


@@ -532,15 +531,7 @@ fun vhostBody (env, makeFullHost) =
                                          (TextIO.output (file, "\n\tSuexecUserGroup ");
                                           TextIO.output (file, user);
                                           TextIO.output (file, " ");
                                          (TextIO.output (file, "\n\tSuexecUserGroup ");
                                           TextIO.output (file, user);
                                           TextIO.output (file, " ");

-                                          TextIO.output (file, group);
-                                          (* suPHP is no longer used for fastcgi php and php 7.x *)
-                                          (if php < 6 then
-                                              (TextIO.output (file, "\n\tsuPHP_UserGroup ");
-                                               TextIO.output (file, user);
-                                               TextIO.output (file, " ");
-                                               TextIO.output (file, group))
-                                           else
-                                               ()))
+                                          TextIO.output (file, group))

                                  else
                                      ();
 
                                  else
                                      ();
 


@@ -556,17 +547,17 @@ fun vhostBody (env, makeFullHost) =
                                  TextIO.output (file, user);
                                  TextIO.output (file, "/DAVLock");
 
                                  TextIO.output (file, user);
                                  TextIO.output (file, "/DAVLock");
 

-                                 if php = Config.Apache.defaultPhpVersion
-                                 then
-                                     ()
-                                 else if php = 6
+                                 if php = 6

                                  then
                                  then

-                                     (* fastcgi php 5.6 since 6 doesn't exist *)
+                                     (* fastcgi php 5.6, using version 6 since php6 doesn't exist *)

                                      (TextIO.output (file, "\n\tAddHandler fcgid-script .php .phtml");
                                      (TextIO.output (file, "\n\tAddHandler fcgid-script .php .phtml");

-                                      (* FIXME: only set kerberos wrapper of waklog is on *)

                                       map (fn ext => (TextIO.output (file, "\n\tFcgidWrapper \"");
                                       map (fn ext => (TextIO.output (file, "\n\tFcgidWrapper \"");

-                                                      TextIO.output (file, Config.Apache.fastCgiWrapperOf user);
-                                                      TextIO.output (file, " ");
+                                                      (* kerberos wrapper, simulates waklog+mod_cgi *)
+                                                      if isWaklog node then
+                                                          (TextIO.output (file, Config.Apache.fastCgiWrapperOf user);
+                                                           TextIO.output (file, " "))
+                                                      else
+                                                          ();

                                                       TextIO.output (file, Config.Apache.phpFastCgiWrapper);
                                                       TextIO.output (file, "\" ");
                                                       TextIO.output (file, ext)))
                                                       TextIO.output (file, Config.Apache.phpFastCgiWrapper);
                                                       TextIO.output (file, "\" ");
                                                       TextIO.output (file, ext)))


@@ -817,6 +808,7 @@ val () = Env.action_two "fastScriptAlias"
                 write "\tSetHandler fcgid-script\n";
 
                 (* FIXME: only set kerberos wrapper of waklog is on *)
                 write "\tSetHandler fcgid-script\n";
 
                 (* FIXME: only set kerberos wrapper of waklog is on *)

+                (* won't be trivial, since we don't have access to node here *)

                 write "\tFcgidWrapper \"";
                 write (Config.Apache.fastCgiWrapperOf (Domain.getUser ()));
                 write " ";
                 write "\tFcgidWrapper \"";
                 write (Config.Apache.fastCgiWrapperOf (Domain.getUser ()));
                 write " ";


@@ -1160,6 +1152,7 @@ val () = Env.action_one "phpVersion"
                             (* fastcgi php 5.6 since 6 doesn't exist *)
                             (write "\tAddHandler fcgid-script .php .phtml\n";
                              (* FIXME: only set kerberos wrapper of waklog is on *)
                             (* fastcgi php 5.6 since 6 doesn't exist *)
                             (write "\tAddHandler fcgid-script .php .phtml\n";
                              (* FIXME: only set kerberos wrapper of waklog is on *)

+                             (* won't be trivial, since we don't have access to node here *)

                              write "\n\tFcgidWrapper \"";
                              write (Config.Apache.fastCgiWrapperOf (Domain.getUser ()));
                              write " ";
                              write "\n\tFcgidWrapper \"";
                              write (Config.Apache.fastCgiWrapperOf (Domain.getUser ()));
                              write " ";