Fixes to doc tools

hallambaker · Apr 16, 2018 · 3a8efd6 · 3a8efd6
1 parent 8ecbe0b
commit 3a8efd6
Show file tree

Hide file tree

Showing 609 changed files with 63,313 additions and 226 deletions.
diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
@@ -168,6 +168,30 @@
                     <binding protocol="http" bindingInformation="*:50936:localhost" />
                 </bindings>
             </site>
+            <site name="TestWeb" id="3">
+                <application path="/" applicationPool="Clr4IntegratedAppPool">
+                    <virtualDirectory path="/" physicalPath="C:\Users\hallam\Work\buildtools\DocTools\TestWeb" />
+                </application>
+                <bindings>
+                    <binding protocol="http" bindingInformation="*:56731:localhost" />
+                </bindings>
+            </site>
+            <site name="Source" id="4">
+                <application path="/" applicationPool="Clr4IntegratedAppPool">
+                    <virtualDirectory path="/" physicalPath="C:\Users\hallam\Work\buildtools\DocTools\TestWeb\Source" />
+                </application>
+                <bindings>
+                    <binding protocol="http" bindingInformation="*:56758:localhost" />
+                </bindings>
+            </site>
+            <site name="Target" id="5">
+                <application path="/" applicationPool="Clr4IntegratedAppPool">
+                    <virtualDirectory path="/" physicalPath="C:\Users\hallam\Work\buildtools\DocTools\TestWeb\Target" />
+                </application>
+                <bindings>
+                    <binding protocol="http" bindingInformation="*:56759:localhost" />
+                </bindings>
+            </site>
             <siteDefaults>
                 <logFile logFormat="W3C" directory="%IIS_USER_HOME%\Logs" />
                 <traceFailedRequestsLogging directory="%IIS_USER_HOME%\TraceLogFiles" enabled="true" maxLogFileSizeKB="1024" />

diff --git a/BuildTools.sln b/BuildTools.sln
@@ -32,6 +32,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tool VSIXBuild", "Tool VSIXBuild", "{9D6EBBBD-F3E1-432A-BD9D-56BDEE86C029}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tool Document", "Tool Document", "{9E6E38F6-13C4-49A0-A278-018742486965}"
+	ProjectSection(SolutionItems) = preProject
+		DocTools\TestWeb\TagDefinitions.mdsd = DocTools\TestWeb\TagDefinitions.mdsd
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommandEcho", "Command\CommandEcho\CommandEcho.csproj", "{85063EFC-7090-42AD-B562-006087DE9AA6}"
 EndProject
@@ -169,6 +172,48 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "srvconf", "DNSConfig\srvcon
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Goedel.Discovery-Shared", "..\mmm\Libraries\Goedel.Discovery\Goedel.Discovery-Shared.shproj", "{E0560A9E-5A6C-464D-8114-10E9889882B3}"
 EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Source", "DocTools\TestWeb\Source\", "{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+		Debug.AspNetCompiler.VirtualPath = "/localhost_56758"
+		Debug.AspNetCompiler.PhysicalPath = "DocTools\TestWeb\Source\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_56758\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/localhost_56758"
+		Release.AspNetCompiler.PhysicalPath = "DocTools\TestWeb\Source\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_56758\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "56758"
+		SlnRelativePath = "DocTools\TestWeb\Source\"
+	EndProjectSection
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Target", "DocTools\TestWeb\Target\", "{90889A06-1694-4B38-9592-49CF069E4E20}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+		Debug.AspNetCompiler.VirtualPath = "/localhost_56759"
+		Debug.AspNetCompiler.PhysicalPath = "DocTools\TestWeb\Target\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_56759\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/localhost_56759"
+		Release.AspNetCompiler.PhysicalPath = "DocTools\TestWeb\Target\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_56759\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "56759"
+		SlnRelativePath = "DocTools\TestWeb\Target\"
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		DocTools\Goedel.Document.RFCConvert\Goedel.Document.RFCConvert.projitems*{03c081d6-fe5a-4a20-b387-8a960a45e77f}*SharedItemsImports = 13
@@ -785,6 +830,38 @@ Global
 		{627A80A7-F304-444E-B1DF-0F5A9515716F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{627A80A7-F304-444E-B1DF-0F5A9515716F}.Release|x86.ActiveCfg = Release|Any CPU
 		{627A80A7-F304-444E-B1DF-0F5A9515716F}.Release|x86.Build.0 = Release|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.DotNet|Any CPU.ActiveCfg = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.DotNet|Any CPU.Build.0 = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.DotNet|x86.ActiveCfg = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.DotNet|x86.Build.0 = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Publish|Any CPU.Build.0 = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Publish|x86.ActiveCfg = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Publish|x86.Build.0 = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Release|x86.ActiveCfg = Debug|Any CPU
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5}.Release|x86.Build.0 = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Debug|x86.Build.0 = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.DotNet|Any CPU.ActiveCfg = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.DotNet|Any CPU.Build.0 = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.DotNet|x86.ActiveCfg = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.DotNet|x86.Build.0 = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Publish|Any CPU.Build.0 = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Publish|x86.ActiveCfg = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Publish|x86.Build.0 = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Release|x86.ActiveCfg = Debug|Any CPU
+		{90889A06-1694-4B38-9592-49CF069E4E20}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -861,6 +938,8 @@ Global
 		{65A9786E-96BB-4D81-BD41-E9C81E15DA05} = {8D9AC879-C123-4356-B9B6-BE5393FCBFF8}
 		{627A80A7-F304-444E-B1DF-0F5A9515716F} = {8D9AC879-C123-4356-B9B6-BE5393FCBFF8}
 		{E0560A9E-5A6C-464D-8114-10E9889882B3} = {510C00FB-FB4F-4C9E-A2F6-86D2FA171CD1}
+		{88239AFF-1B8E-4B6C-92C1-DE0357B260B5} = {9E6E38F6-13C4-49A0-A278-018742486965}
+		{90889A06-1694-4B38-9592-49CF069E4E20} = {9E6E38F6-13C4-49A0-A278-018742486965}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B0FED20-F156-4724-9241-1F63A97DA43E}

diff --git a/DNSConfig/Goedel.Tool.DNSConfig/Generate.Script b/DNSConfig/Goedel.Tool.DNSConfig/Generate.Script
@@ -16,7 +16,7 @@
 #end method
 
 #method GenerateOptions DNSConfig DNSConfig
-; PATH=/etc/bind/named.conf.options 
+## PATH=/etc/bind/named.conf.options 
 
 options {
         directory "/var/cache/bind";
@@ -34,7 +34,7 @@ options {
 #end method
 
 #method GenerateLocal DNSConfig DNSConfig
-; PATH=/etc/bind/named.conf.local
+## PATH=/etc/bind/named.conf.local
 
 #foreach (var Domain in DNSConfig.Domains) 
 zone "#{Domain.Id}" {
@@ -50,11 +50,11 @@ zone "#{Domain.Id}" {
 #method GenerateDomain Domain Domain
 #% var DNS = Domain.DNS;
 #% var Web = Domain.Web;
-; PATH=/etc/bind/zones/db.#{DNS.Id}
-;
+; PATH=/etc/bind/zones/db.#{Domain.Id}
+; 
 ; DNS Zone file for #{Domain.Id} using DNS setup #{DNS.Id}
 ;
-; This file is automatically generated CHANGES WILL BE OVERWRITTEN
+; This file is automatically generated CHANGES WILL BE OVERWRITTEN!
 ;
 $TTL #{DNS.TTL.DefaultedTime}
 #{Domain.Id}.      IN      SOA     #{Domain.DNS.Master.Id}.#{Domain.Id}. #{Domain.DNS.Contact}. (
@@ -84,16 +84,16 @@ $TTL #{DNS.TTL.DefaultedTime}
 #end if
 #end foreach
 
-; For now, forward all mail to a forwarder on the authopritative
+; For now, forward all mail to a forwarder on the authoritative
 #foreach (var MX in DNS.MX)
 #{Domain.Id}.       IN      MX       #{MX.Priority} #{MX.Id}.
 #end foreach
 
 #if (Domain.Web != null)
-; Web redirect to #{Domain.Web.Id} (is in host directory #{Domain.Web.Root})
+# Web redirect to #{Domain.Web.Id} (is in host directory #{Domain.Web.Root})
 
 #foreach (var Host in Domain.Web.Host)
-; Host #{Host.Name} #{Host.IP}
+; Host #{Host.Name} #{Host.IP} 
 #{Domain.MakeAddress(Host.Machine, Domain.Id)} 
 #{Domain.MakeAddress(Host.Machine, "www", Domain.Id)} 
 #{Domain.MakeAddress(Host.Machine, "http", Domain.Id)}
@@ -107,9 +107,9 @@ _https._tcp.#{Domain.Id}.   IN   SRV 1 1 443 #{Host.Name}.
 ; Service records for #{Service.Name}
 #foreach (var Host in Service.Host) 
 #{Domain.MakeAddress(Host.Machine, Service.Name, Domain.Id)} 
-_#{Service.Name}._tcp.Domain.Id SRV #{Host.Priority.Value} #{Host.Weight.Value} #{Host.Port.Value} #{Host.Id}
+_#{Service.Name}._tcp.#{Domain.Id}. SRV #{Host.Priority.Value} #{Host.Weight.Value} #{Host.Port.Value} #{Host.Id}.
 #foreach (var TXT in Host.TXT) 
-_#{Service.Name}._tcp.Domain.Id TXT "#{TXT.Text}"
+_#{Service.Name}._tcp.#{Domain.Id}. TXT "#{TXT.Text}"
 #end foreach
 #end foreach
 #end foreach
@@ -119,7 +119,7 @@ _#{Service.Name}._tcp.Domain.Id TXT "#{TXT.Text}"
 
 #method GenerateAdressRecords DNSConfig DNSConfig
 #foreach (var Machine in DNSConfig.Machines)
-; Machine #{Machine.Id} #{Machine.Data}
+## Machine #{Machine.Id} #{Machine.Data}
 
 #foreach (var Record in Machine.Records_A)
 #{Record.Canonical()}

diff --git a/DNSConfig/Goedel.Tool.DNSConfig/Generate.cs b/DNSConfig/Goedel.Tool.DNSConfig/Generate.cs
@@ -59,7 +59,7 @@ public void GenerateZone (DNSConfig DNSConfig) {
 		// GenerateOptions
 		//
 		public void GenerateOptions (DNSConfig DNSConfig) {
-			_Output.Write ("; PATH=/etc/bind/named.conf.options \n{0}", _Indent);
+			_Output.Write ("# PATH=/etc/bind/named.conf.options \n{0}", _Indent);
 			_Output.Write ("\n{0}", _Indent);
 			_Output.Write ("options {{\n{0}", _Indent);
 			_Output.Write ("        directory \"/var/cache/bind\";\n{0}", _Indent);
@@ -81,7 +81,7 @@ public void GenerateOptions (DNSConfig DNSConfig) {
 		// GenerateLocal
 		//
 		public void GenerateLocal (DNSConfig DNSConfig) {
-			_Output.Write ("; PATH=/etc/bind/named.conf.local\n{0}", _Indent);
+			_Output.Write ("# PATH=/etc/bind/named.conf.local\n{0}", _Indent);
 			_Output.Write ("\n{0}", _Indent);
 			foreach  (var Domain in DNSConfig.Domains)  {
 				_Output.Write ("zone \"{1}\" {{\n{0}", _Indent, Domain.Id);
@@ -100,11 +100,11 @@ public void GenerateLocal (DNSConfig DNSConfig) {
 		public void GenerateDomain (Domain Domain) {
 			 var DNS = Domain.DNS;
 			 var Web = Domain.Web;
-			_Output.Write ("; PATH=/etc/bind/zones/db.{1}\n{0}", _Indent, DNS.Id);
-			_Output.Write (";\n{0}", _Indent);
+			_Output.Write ("; PATH=/etc/bind/zones/db.{1}\n{0}", _Indent, Domain.Id);
+			_Output.Write ("; \n{0}", _Indent);
 			_Output.Write ("; DNS Zone file for {1} using DNS setup {2}\n{0}", _Indent, Domain.Id, DNS.Id);
 			_Output.Write (";\n{0}", _Indent);
-			_Output.Write ("; This file is automatically generated CHANGES WILL BE OVERWRITTEN\n{0}", _Indent);
+			_Output.Write ("; This file is automatically generated CHANGES WILL BE OVERWRITTEN!\n{0}", _Indent);
 			_Output.Write (";\n{0}", _Indent);
 			_Output.Write ("$TTL {1}\n{0}", _Indent, DNS.TTL.DefaultedTime);
 			_Output.Write ("{1}.      IN      SOA     {2}.{3}. {4}. (\n{0}", _Indent, Domain.Id, Domain.DNS.Master.Id, Domain.Id, Domain.DNS.Contact);
@@ -134,16 +134,15 @@ public void GenerateDomain (Domain Domain) {
 					}
 				}
 			_Output.Write ("\n{0}", _Indent);
-			_Output.Write ("; For now, forward all mail to a forwarder on the authopritative\n{0}", _Indent);
+			_Output.Write ("; For now, forward all mail to a forwarder on the authoritative\n{0}", _Indent);
 			foreach  (var MX in DNS.MX) {
 				_Output.Write ("{1}.       IN      MX       {2} {3}.\n{0}", _Indent, Domain.Id, MX.Priority, MX.Id);
 				}
 			_Output.Write ("\n{0}", _Indent);
 			if (  (Domain.Web != null) ) {
-				_Output.Write ("; Web redirect to {1} (is in host directory {2})\n{0}", _Indent, Domain.Web.Id, Domain.Web.Root);
 				_Output.Write ("\n{0}", _Indent);
 				foreach  (var Host in Domain.Web.Host) {
-					_Output.Write ("; Host {1} {2}\n{0}", _Indent, Host.Name, Host.IP);
+					_Output.Write ("; Host {1} {2} \n{0}", _Indent, Host.Name, Host.IP);
 					_Output.Write ("{1} \n{0}", _Indent, Domain.MakeAddress(Host.Machine, Domain.Id));
 					_Output.Write ("{1} \n{0}", _Indent, Domain.MakeAddress(Host.Machine, "www", Domain.Id));
 					_Output.Write ("{1}\n{0}", _Indent, Domain.MakeAddress(Host.Machine, "http", Domain.Id));
@@ -157,9 +156,9 @@ public void GenerateDomain (Domain Domain) {
 				_Output.Write ("; Service records for {1}\n{0}", _Indent, Service.Name);
 				foreach  (var Host in Service.Host)  {
 					_Output.Write ("{1} \n{0}", _Indent, Domain.MakeAddress(Host.Machine, Service.Name, Domain.Id));
-					_Output.Write ("_{1}._tcp.Domain.Id SRV {2} {3} {4} {5}\n{0}", _Indent, Service.Name, Host.Priority.Value, Host.Weight.Value, Host.Port.Value, Host.Id);
+					_Output.Write ("_{1}._tcp.{2}. SRV {3} {4} {5} {6}.\n{0}", _Indent, Service.Name, Domain.Id, Host.Priority.Value, Host.Weight.Value, Host.Port.Value, Host.Id);
 					foreach  (var TXT in Host.TXT)  {
-						_Output.Write ("_{1}._tcp.Domain.Id TXT \"{2}\"\n{0}", _Indent, Service.Name, TXT.Text);
+						_Output.Write ("_{1}._tcp.{2}. TXT \"{3}\"\n{0}", _Indent, Service.Name, Domain.Id, TXT.Text);
 						}
 					}
 				}
@@ -173,7 +172,7 @@ public void GenerateDomain (Domain Domain) {
 		//
 		public void GenerateAdressRecords (DNSConfig DNSConfig) {
 			foreach  (var Machine in DNSConfig.Machines) {
-				_Output.Write ("; Machine {1} {2}\n{0}", _Indent, Machine.Id, Machine.Data);
+				_Output.Write ("# Machine {1} {2}\n{0}", _Indent, Machine.Id, Machine.Data);
 				_Output.Write ("\n{0}", _Indent);
 				foreach  (var Record in Machine.Records_A) {
 					_Output.Write ("{1}\n{0}", _Indent, Record.Canonical());

diff --git a/DNSConfig/srvconf/Test/PHBZones.dns b/DNSConfig/srvconf/Test/PHBZones.dns
@@ -1,6 +1,8 @@
 // First DNS service listed is the default
 
 Machine Home             "108.7.198.158"
+
+Machine Voodoo             "192.168.1.21"
 Machine CloudFloating    "139.59.200.120"
 Machine CloudDroplet	 "178.62.79.124"
 
@@ -37,17 +39,31 @@ Site hallambaker
 Site mathmesh
 	Domain mathmesh.com
 		Address host1.mathmesh.com Home
+
 	Domain cryptomesh.org
+		Address host1.cryptomesh.org Voodoo
 		Service "mmm"
 			TXT "TLS=require"
-			Host host1.mathmesh.com 
-				Port 42666
+			Host host1.cryptomesh.org
+				Port 80
+				Priority 1
+				Weight 100
+		Service "account"
+			TXT "TLS=require"
+			Host host1.cryptomesh.org
+				Port 80	
+				Priority 1
+				Weight 100
+		Service "recrypt"
+			TXT "TLS=require"
+			Host host1.cryptomesh.org
+				Port 80	
 				Priority 1
 				Weight 100
-		Service "mmmapp"
+		Service "confirm"
 			TXT "TLS=require"
-			Host host1.mathmesh.com 
-				Port 42667	
+			Host host1.cryptomesh.org 
+				Port 80	
 				Priority 1
 				Weight 100
 	Domain mathmesh.net

diff --git a/DNSConfig/srvconf/Test/named.addresses b/DNSConfig/srvconf/Test/named.addresses
@@ -1,4 +1,4 @@
-; Machine Home 108.7.198.158
+# Machine Home 108.7.198.158
 
 hallambaker.com.    A 108.7.198.158
 www.hallambaker.com.    A 108.7.198.158
@@ -29,8 +29,6 @@ cryptomesh.org.    A 108.7.198.158
 www.cryptomesh.org.    A 108.7.198.158
 http.cryptomesh.org.    A 108.7.198.158
 https.cryptomesh.org.    A 108.7.198.158
-mmm.cryptomesh.org.    A 108.7.198.158
-mmmapp.cryptomesh.org.    A 108.7.198.158
 mathmesh.net.    A 108.7.198.158
 www.mathmesh.net.    A 108.7.198.158
 http.mathmesh.net.    A 108.7.198.158
@@ -101,7 +99,16 @@ http.sayanythingtrump.org.    A 108.7.198.158
 https.sayanythingtrump.org.    A 108.7.198.158
 
 
-; Machine CloudFloating 139.59.200.120
+# Machine Voodoo 192.168.1.21
+
+host1.cryptomesh.org.    A 192.168.1.21
+mmm.cryptomesh.org.    A 192.168.1.21
+account.cryptomesh.org.    A 192.168.1.21
+recrypt.cryptomesh.org.    A 192.168.1.21
+confirm.cryptomesh.org.    A 192.168.1.21
+
+
+# Machine CloudFloating 139.59.200.120
 
 dns2.hallambaker.com.    A 139.59.200.120
 dns2.defaultdenysecurity.com.    A 139.59.200.120
@@ -129,7 +136,7 @@ dns2.sayanythingtrump.com.    A 139.59.200.120
 dns2.sayanythingtrump.org.    A 139.59.200.120
 
 
-; Machine CloudDroplet 178.62.79.124
+# Machine CloudDroplet 178.62.79.124
 
 dns1.hallambaker.com.    A 178.62.79.124
 smtp1.hallambaker.com.    A 178.62.79.124

diff --git a/DNSConfig/srvconf/Test/named.conf.local b/DNSConfig/srvconf/Test/named.conf.local
@@ -1,4 +1,4 @@
-; PATH=/etc/bind/named.conf.local
+# PATH=/etc/bind/named.conf.local
 
 zone "hallambaker.com" {
     type master;

diff --git a/DNSConfig/srvconf/Test/named.conf.options b/DNSConfig/srvconf/Test/named.conf.options
@@ -1,4 +1,4 @@
-; PATH=/etc/bind/named.conf.options 
+# PATH=/etc/bind/named.conf.options 
 
 options {
         directory "/var/cache/bind";