zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Virtuworks 2013-09-30 16:40:19 -04:00
commit 91a0c420bf
1 changed files with 42 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

53
WebsitePanel/Sources/WebsitePanel.Providers.DNS.Bind/IscBind.cs
View file

@ -30,10 +30,12 @@ using System;
using System.IO; using System.IO;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Diagnostics;
using System.ServiceProcess; using System.ServiceProcess;
using WebsitePanel.Server.Utils; using WebsitePanel.Server.Utils;
using WebsitePanel.Providers.Utils; using WebsitePanel.Providers.Utils;
namespace WebsitePanel.Providers.DNS namespace WebsitePanel.Providers.DNS
{ {
public class IscBind : HostingServiceProviderBase, IDnsServer public class IscBind : HostingServiceProviderBase, IDnsServer
@ -149,12 +151,9 @@ namespace WebsitePanel.Providers.DNS
soa.PrimaryNsServer = System.Net.Dns.GetHostEntry("LocalHost").HostName; soa.PrimaryNsServer = System.Net.Dns.GetHostEntry("LocalHost").HostName;
soa.PrimaryPerson = "hostmaster";//"hostmaster." + zoneName; soa.PrimaryPerson = "hostmaster";//"hostmaster." + zoneName;
records.Add(soa); records.Add(soa);
ReloadBIND("reconfig", "");
// add DNS zone // add DNS zone
UpdateZone(zoneName, records); UpdateZone(zoneName, records);
// reload config
ReloadBIND();
} }
public virtual void AddSecondaryZone(string zoneName, string[] masterServers) public virtual void AddSecondaryZone(string zoneName, string[] masterServers)
@ -185,7 +184,7 @@ namespace WebsitePanel.Providers.DNS
File.Create(GetZoneFilePath(zoneName)).Close(); File.Create(GetZoneFilePath(zoneName)).Close();
// reload config // reload config
ReloadBIND(); ReloadBIND("reconfig", "");
} }
public virtual DnsRecord[] GetZoneRecords(string zoneName) public virtual DnsRecord[] GetZoneRecords(string zoneName)
@ -255,9 +254,9 @@ namespace WebsitePanel.Providers.DNS
if (File.Exists(zonePath)) if (File.Exists(zonePath))
File.Delete(zonePath); File.Delete(zonePath);
// reload config // reload named.conf
ReloadBIND(); ReloadBIND("reconfig", "");
} }
#endregion #endregion
#region Resource records #region Resource records
@ -819,6 +818,7 @@ namespace WebsitePanel.Providers.DNS
// update zone file // update zone file
UpdateZoneFile(zoneName, sb.ToString()); UpdateZoneFile(zoneName, sb.ToString());
ReloadBIND("reload", zoneName);
} }
private string CorrectRecordName(string zoneName, string host) private string CorrectRecordName(string zoneName, string host)
@ -912,7 +912,7 @@ namespace WebsitePanel.Providers.DNS
{ {
string path = GetZoneFilePath(zoneName); string path = GetZoneFilePath(zoneName);
File.WriteAllText(path, zoneContent); File.WriteAllText(path, zoneContent);
} }
private string GetZoneFilePath(string zoneName) private string GetZoneFilePath(string zoneName)
{ {
@ -924,10 +924,41 @@ namespace WebsitePanel.Providers.DNS
return StringUtils.ReplaceStringVariable(ZoneFileNameTemplate, "domain_name", zoneName); return StringUtils.ReplaceStringVariable(ZoneFileNameTemplate, "domain_name", zoneName);
} }
private void ReloadBIND() private void ReloadBIND(string Args, string zoneName)
{ {
FileUtils.ExecuteSystemCommand(BindReloadBatch, "");
// Do we have a rndc.exe? if so use it - improves handling
if (BindReloadBatch.IndexOf("rndc.exe") > 0)
{
Process rndc = new Process();
rndc.StartInfo.FileName = BindReloadBatch;
string rndcArguments = Args;
if (zoneName.Length > 0)
{
rndcArguments += " " + zoneName;
}
rndc.StartInfo.Arguments = rndcArguments;
rndc.StartInfo.CreateNoWindow = true;
rndc.Start();
/*
* Can't figure out how to log the output of the process to auditlog. If someone could be of assistans and fix this.
* it's rndcOutput var that should be written to audit log.s
*
string rndcOutput = "";
while (!rndc.StandardOutput.EndOfStream)
{
rndcOutput += rndc.StandardOutput.ReadLine();
}
*/
}
else
{
FileUtils.ExecuteSystemCommand(BindReloadBatch, "");
}
} }
#endregion #endregion
public override bool IsInstalled() public override bool IsInstalled()