|
From: Adam C. <ad...@us...> - 2008-08-14 13:07:31
|
Update of /cvsroot/hcoop/domtool2/src/plugins In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20513/src/plugins Modified Files: alias.sml bind.sml exim.sml mailman.sml Log Message: Change some node filenames to avoid clashes with subdomains Index: mailman.sml =================================================================== RCS file: /cvsroot/hcoop/domtool2/src/plugins/mailman.sml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mailman.sml 5 Dec 2007 01:58:20 -0000 1.13 --- mailman.sml 14 Aug 2008 13:07:25 -0000 1.14 *************** *** 70,74 **** let val {write, writeDom, close} = Domain.domainsFile {node = Config.Mailman.node, ! name = "mailman"} in write "\t'"; --- 70,74 ---- let val {write, writeDom, close} = Domain.domainsFile {node = Config.Mailman.node, ! name = "mailman.conf"} in write "\t'"; *************** *** 176,180 **** in case #file spl of ! "mailman" => mailmanChanged := true | _ => () end) --- 176,180 ---- in case #file spl of ! "mailman.conf" => mailmanChanged := true | _ => () end) *************** *** 182,188 **** val () = Slave.registerPostHandler (fn () => if !mailmanChanged then ! (Slave.concatTo (fn s => s = "mailman") Config.Mailman.mapFile; ! Slave.enumerateTo (fn s => s = "mailman") ":" Config.Mailman.handleDomains; Slave.shellF ([Config.Mailman.reload], --- 182,188 ---- val () = Slave.registerPostHandler (fn () => if !mailmanChanged then ! (Slave.concatTo (fn s => s = "mailman.conf") Config.Mailman.mapFile; ! Slave.enumerateTo (fn s => s = "mailman.conf") ":" Config.Mailman.handleDomains; Slave.shellF ([Config.Mailman.reload], *************** *** 192,196 **** val () = Domain.registerDescriber (Domain.considerAll ! [Domain.Filename {filename = "mailman", heading = "Mailman web host mapping:", showEmpty = false}]) --- 192,196 ---- val () = Domain.registerDescriber (Domain.considerAll ! [Domain.Filename {filename = "mailman.conf", heading = "Mailman web host mapping:", showEmpty = false}]) Index: bind.sml =================================================================== RCS file: /cvsroot/hcoop/domtool2/src/plugins/bind.sml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** bind.sml 24 Feb 2008 15:50:25 -0000 1.20 --- bind.sml 14 Aug 2008 13:07:25 -0000 1.21 *************** *** 36,40 **** val _ = Domain.registerBefore (fn _ => dns := Option.map (fn node => Domain.domainsFile {node = node, ! name = "dns"}) (Domain.dnsMaster ())) --- 36,40 ---- val _ = Domain.registerBefore (fn _ => dns := Option.map (fn node => Domain.domainsFile {node = node, ! name = "dns.conf"}) (Domain.dnsMaster ())) *************** *** 245,249 **** let val inf = TextIO.openIn (OS.Path.joinDirFile {dir = #dir fs, ! file = "soa"}) val kind = readLine inf val ttl = readILine inf --- 245,249 ---- let val inf = TextIO.openIn (OS.Path.joinDirFile {dir = #dir fs, ! file = "soa.conf"}) val kind = readLine inf val ttl = readILine inf *************** *** 293,297 **** val dns = OS.Path.joinDirFile {dir = #dir fs, ! file = "dns"} val fname = OS.Path.joinBaseExt {base = #domain fs, --- 293,297 ---- val dns = OS.Path.joinDirFile {dir = #dir fs, ! file = "dns.conf"} val fname = OS.Path.joinBaseExt {base = #domain fs, *************** *** 330,335 **** in case file of ! "soa" => dnsChanged () ! | "dns" => dnsChanged () | "named.conf" => namedChanged := true | _ => () --- 330,335 ---- in case file of ! "soa.conf" => dnsChanged () ! | "dns.conf" => dnsChanged () | "named.conf" => namedChanged := true | _ => () *************** *** 355,359 **** heading = "named.conf addition:", showEmpty = false}, ! Domain.Filename {filename = "dns", heading = "DNS zonefile contents:", showEmpty = false}]) --- 355,359 ---- heading = "named.conf addition:", showEmpty = false}, ! Domain.Filename {filename = "dns.conf", heading = "DNS zonefile contents:", showEmpty = false}]) Index: alias.sml =================================================================== RCS file: /cvsroot/hcoop/domtool2/src/plugins/alias.sml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** alias.sml 1 Jan 2008 22:19:27 -0000 1.6 --- alias.sml 14 Aug 2008 13:07:24 -0000 1.7 *************** *** 57,61 **** val _ = Domain.registerBefore ! (fn _ => (aliases := openInAll "aliases"; reopenAliasesD ())) --- 57,61 ---- val _ = Domain.registerBefore ! (fn _ => (aliases := openInAll "aliases.base"; reopenAliasesD ())) Index: exim.sml =================================================================== RCS file: /cvsroot/hcoop/domtool2/src/plugins/exim.sml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** exim.sml 20 Nov 2007 00:25:56 -0000 1.10 --- exim.sml 14 Aug 2008 13:07:25 -0000 1.11 *************** *** 43,51 **** val spl = OS.Path.splitDirFile (#file fs) in ! if #file spl = "aliases" then aliasesChanged := true else if #file spl = "aliases.default" then aliasesDefaultChanged := true ! else if #file spl = "mail" then hostsChanged := true else if #file spl = "mail.relay" then --- 43,51 ---- val spl = OS.Path.splitDirFile (#file fs) in ! if #file spl = "aliases.base" then aliasesChanged := true else if #file spl = "aliases.default" then aliasesDefaultChanged := true ! else if #file spl = "mail.handle" then hostsChanged := true else if #file spl = "mail.relay" then *************** *** 58,62 **** (fn () => (if !aliasesChanged then ! Slave.concatTo (fn s => s = "aliases") Config.Exim.aliases else (); --- 58,62 ---- (fn () => (if !aliasesChanged then ! Slave.concatTo (fn s => s = "aliases.base") Config.Exim.aliases else (); *************** *** 66,70 **** (); if !hostsChanged then ! Slave.enumerateTo (fn s => s = "mail") ":" Config.Exim.handleDomains else (); --- 66,70 ---- (); if !hostsChanged then ! Slave.enumerateTo (fn s => s = "mail.handle") ":" Config.Exim.handleDomains else (); *************** *** 88,92 **** app (fn node => #close (Domain.domainsFile {node = node, ! name = "mail"}) ()) nodes end) --- 88,92 ---- app (fn node => #close (Domain.domainsFile {node = node, ! name = "mail.handle"}) ()) nodes end) *************** *** 102,106 **** val () = Domain.registerDescriber (Domain.considerAll ! [Domain.Filename {filename = "aliases", heading = "E-mail aliases:", showEmpty = false}, --- 102,106 ---- val () = Domain.registerDescriber (Domain.considerAll ! [Domain.Filename {filename = "aliases.base", heading = "E-mail aliases:", showEmpty = false}, *************** *** 108,112 **** heading = "Default e-mail alias:", showEmpty = false}, ! Domain.Filename {filename = "mail", heading = "E-mail handling is on.", showEmpty = true}, --- 108,112 ---- heading = "Default e-mail alias:", showEmpty = false}, ! Domain.Filename {filename = "mail.handle", heading = "E-mail handling is on.", showEmpty = true}, |