Env.string
validLocation
+fun validCert s = Acl.query {user = Domain.getUser (),
+ class = "cert",
+ value = s}
+
+val _ = Env.type_one "ssl_cert_path"
+ Env.string
+ validCert
+
+fun ssl e = case e of
+ (EVar "no_ssl", _) => SOME NONE
+ | (EApp ((EVar "use_cert", _), s), _) => Option.map SOME (Env.string s)
+ | _ => NONE
+
val dl = ErrorMsg.dummyLoc
val _ = Defaults.registerDefault ("WebNodes",
(fn () => (EList (map (fn s => (EString s, dl)) Config.Apache.webNodes_default), dl)))
val _ = Defaults.registerDefault ("SSL",
- (TBase "bool", dl),
- (fn () => (EVar "false", dl)))
+ (TBase "ssl", dl),
+ (fn () => (EVar "no_ssl", dl)))
val _ = Defaults.registerDefault ("User",
(TBase "your_user", dl),
val _ = Defaults.registerDefault ("SuExec",
(TBase "suexec_flag", dl),
- (fn () => (EApp ((EVar "suexec_flag", dl),
- (EVar "true", dl)), dl)))
+ (fn () => (EVar "true", dl)))
val redirect_code = fn (EVar "temp", _) => SOME "temp"
| (EVar "permanent", _) => SOME "permanent"
{dir = realLogDir,
file = Slave.hostname ()}
val {base, ...} = OS.Path.splitBaseExt (#file spl)
+
+ val realLogDir = OS.Path.joinDirFile
+ {dir = realLogDir,
+ file = base}
in
- OS.Path.joinDirFile
- {dir = realLogDir,
- file = base}
+ if String.isSuffix ".vhost_ssl" (#file spl) then
+ realLogDir ^ ".ssl"
+ else
+ realLogDir
end
in
vhostsChanged := true;
aliaser := (fn x => (old x; f x))
end
-fun suexec_flag (EApp ((EVar "suexec_flag", _), e), _) = Env.bool e
- | suexec_flag _ = NONE
-
val () = Env.containerV_one "vhost"
("host", Env.string)
(fn (env, host) =>
let
val nodes = Env.env (Env.list Env.string) (env, "WebNodes")
- val ssl = Env.env Env.bool (env, "SSL")
+ val ssl = Env.env ssl (env, "SSL")
val user = Env.env Env.string (env, "User")
val group = Env.env Env.string (env, "Group")
val docroot = Env.env Env.string (env, "DocumentRoot")
val sadmin = Env.env Env.string (env, "ServerAdmin")
- val suexec = Env.env suexec_flag (env, "SuExec")
+ val suexec = Env.env Env.bool (env, "SuExec")
val fullHost = host ^ "." ^ Domain.currentDomain ()
- val vhostId = fullHost ^ (if ssl then ".ssl" else "")
- val confFile = fullHost ^ (if ssl then ".vhost_ssl" else ".vhost")
+ val vhostId = fullHost ^ (if Option.isSome ssl then ".ssl" else "")
+ val confFile = fullHost ^ (if Option.isSome ssl then ".vhost_ssl" else ".vhost")
in
currentVhost := fullHost;
currentVhostId := vhostId;
TextIO.output (file, "\n<VirtualHost ");
TextIO.output (file, Domain.nodeIp node);
TextIO.output (file, ":");
- TextIO.output (file, if ssl then
- "443"
- else
- "80");
+ TextIO.output (file, case ssl of
+ SOME _ => "443"
+ | NONE => "80");
TextIO.output (file, ">\n");
TextIO.output (file, "\tErrorLog ");
TextIO.output (file, Config.homeBase);
write docroot;
write "\n\tServerAdmin ";
write sadmin;
- if ssl then
- (write "\n\tSSLEngine on")
- else
- ();
+ case ssl of
+ SOME cert =>
+ (write "\n\tSSLEngine on\n\tSSLCertificateFile ";
+ write cert)
+ | NONE => ();
write "\n";
!pre {user = user, nodes = nodes, id = vhostId, hostname = fullHost}
end,