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) =
(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
();
TextIO.output (file, user);
TextIO.output (file, "/DAVLock");
- if php = Config.Apache.defaultPhpVersion
- then
- ()
- else if php = 6
+ if php = 6
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");
- (* FIXME: only set kerberos wrapper of waklog is on *)
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)))
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 " ";
(* 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 " ";