HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apache: use HTTP for mod_auth_kerb service principal
[hcoop/domtool2.git]
/
src
/
plugins
/
apache.sml
diff --git
a/src/plugins/apache.sml
b/src/plugins/apache.sml
index
6174110
..
6a9fa39
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) =
@@
-530,10
+529,6
@@
fun vhostBody (env, makeFullHost) =
TextIO.output (file, group))
else
(TextIO.output (file, "\n\tSuexecUserGroup ");
TextIO.output (file, group))
else
(TextIO.output (file, "\n\tSuexecUserGroup ");
- TextIO.output (file, user);
- TextIO.output (file, " ");
- TextIO.output (file, group);
- TextIO.output (file, "\n\tsuPHP_UserGroup ");
TextIO.output (file, user);
TextIO.output (file, " ");
TextIO.output (file, group))
TextIO.output (file, user);
TextIO.output (file, " ");
TextIO.output (file, group))
@@
-552,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 php
6 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)))
@@
-813,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 " ";
@@
-933,7
+929,7
@@
val () = Env.action_one "authType"
write "\n";
case ty of
"kerberos" =>
write "\n";
case ty of
"kerberos" =>
- write "\tKrbServiceName
apache2
\n\tKrb5Keytab /etc/keytabs/service/apache\n\tKrbMethodNegotiate on\n\tKrbMethodK5Passwd on\n\tKrbVerifyKDC on\n\tKrbAuthRealms HCOOP.NET\n\tKrbSaveCredentials on\n"
+ write "\tKrbServiceName
HTTP
\n\tKrb5Keytab /etc/keytabs/service/apache\n\tKrbMethodNegotiate on\n\tKrbMethodK5Passwd on\n\tKrbVerifyKDC on\n\tKrbAuthRealms HCOOP.NET\n\tKrbSaveCredentials on\n"
| _ => ())
else
print "WARNING: Skipped Kerberos authType because this isn't an SSL vhost.\n")
| _ => ())
else
print "WARNING: Skipped Kerberos authType because this isn't an SSL vhost.\n")
@@
-1156,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 " ";