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

MX + Domain expiration tasks fixes

Browse source
This commit is contained in:
vfedosevich 2014-12-11 05:58:59 -08:00
parent 9ddd934ff5
commit f3ceabf4cc
13 changed files with 617 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

76
WebsitePanel/Sources/WebsitePanel.Providers.OS.Windows2012/Windows2012.cs
View file

@ -301,54 +301,54 @@ namespace WebsitePanel.Providers.OS
#region Domain LookUp
public override DnsRecordInfo[] GetDomainDnsRecords(string domain, string dnsServer, DnsRecordType recordType)
{
List<DnsRecordInfo> records = new List<DnsRecordInfo>();
//public override DnsRecordInfo[] GetDomainDnsRecords(string domain, string dnsServer, DnsRecordType recordType)
//{
// List<DnsRecordInfo> records = new List<DnsRecordInfo>();
Runspace runSpace = null;
// Runspace runSpace = null;
try
{
runSpace = OpenRunspace();
// try
// {
// runSpace = OpenRunspace();
Command cmd = new Command("Resolve-DnsName");
cmd.Parameters.Add("Name", domain);
cmd.Parameters.Add("Server", dnsServer);
cmd.Parameters.Add("Type", recordType.ToString());
// Command cmd = new Command("Resolve-DnsName");
// cmd.Parameters.Add("Name", domain);
// cmd.Parameters.Add("Server", dnsServer);
// cmd.Parameters.Add("Type", recordType.ToString());
var dnsRecordsPs = ExecuteShellCommand(runSpace, cmd, false);
// var dnsRecordsPs = ExecuteShellCommand(runSpace, cmd, false);
if (dnsRecordsPs != null)
{
foreach (var dnsRecordPs in dnsRecordsPs)
{
DnsRecordInfo newRecord = null;
// if (dnsRecordsPs != null)
// {
// foreach (var dnsRecordPs in dnsRecordsPs)
// {
// DnsRecordInfo newRecord = null;
switch (recordType)
{
case DnsRecordType.MX: { newRecord = CreateDnsRecordFromPsObject(dnsRecordPs, "NameExchange"); break; }
case DnsRecordType.NS: { newRecord = CreateDnsRecordFromPsObject(dnsRecordPs, "NameHost"); break; }
default: continue;
}
// switch (recordType)
// {
// case DnsRecordType.MX: { newRecord = CreateDnsRecordFromPsObject(dnsRecordPs, "NameExchange"); break; }
// case DnsRecordType.NS: { newRecord = CreateDnsRecordFromPsObject(dnsRecordPs, "NameHost"); break; }
// default: continue;
// }
if (newRecord != null)
{
newRecord.DnsServer = dnsServer;
newRecord.RecordType = recordType;
// if (newRecord != null)
// {
// newRecord.DnsServer = dnsServer;
// newRecord.RecordType = recordType;
records.Add(newRecord);
}
}
// records.Add(newRecord);
// }
// }
}
}
finally
{
CloseRunspace(runSpace);
}
// }
// }
// finally
// {
// CloseRunspace(runSpace);
// }
return records.ToArray();
}
// return records.ToArray();
//}
private DnsRecordInfo CreateDnsRecordFromPsObject(PSObject psObject, string valueName)
{