Fixes and update DNS

3 files changed, 272 insertions, 111 deletions

diff --git a/arfnet2.html b/arfnet2.html
index 1b833db..d4f7488 100644
--- a/arfnet2.html
+++ b/arfnet2.html
@@ -501,8 +501,16 @@ ISP ===| ONT |---| DELL switch              |-----| TP-Link switch |
   unbound config)</li>
   </ul>
   <h3 id="nas-dmz.6">nas DMZ.6</h3>
-  <p>RAID attached here (with the grey stuff) (local only) - SSH - NFS -
-  Samba SMB<em> - MiniDLNA</em> - FTP - qBittorrent-nox - jellyfin</p>
+  <p>RAID attached here (with the grey stuff) (local only)</p>
+  <ul>
+  <li>SSH</li>
+  <li>NFS</li>
+  <li>Samba SMB*</li>
+  <li>MiniDLNA*</li>
+  <li>FTP</li>
+  <li>qBittorrent-nox</li>
+  <li>jellyfin</li>
+  </ul>
   <h3 id="web-dmz.9">web DMZ.9</h3>
   <ul>
   <li>SSH</li>
@@ -670,18 +678,17 @@ ISP ===| ONT |---| DELL switch              |-----| TP-Link switch |
   </ul>
   <h3 id="misc-deb12-lxc-dmz.13">misc (Deb12 LXC) DMZ.13</h3>
   <ul>
-  <li><p>SSH</p></li>
-  <li><p>iperf3</p></li>
-  <li><p>bind9 - master authoritative nameserver for arf20.com zone
-  NS1</p>
+  <li>SSH</li>
+  <li>iperf3</li>
+  <li>bind9 - master authoritative nameserver for arf20.com zone NS1
   <ul>
   <li>public recursive*</li>
   </ul></li>
-  <li><p>OpenLDAP LDAP*</p></li>
-  <li><p>INN2 - NNTP USENET server with SDF peering</p></li>
-  <li><p>Discord servers</p>
+  <li>OpenLDAP LDAP*</li>
+  <li>INN2 - NNTP USENET server with SDF peering</li>
+  <li>Discord servers
   <ul>
-  <li>gDebrid</li>
+  <li>gDebrid (gookie)</li>
   </ul></li>
   </ul>
   <h3 id="pubnix">pubnix?*</h3>
@@ -697,7 +704,8 @@ ISP ===| ONT |---| DELL switch              |-----| TP-Link switch |
   <li>majordomo? - mailing list manager*</li>
   <li>bind9 - slave authoritative nameserver NS2</li>
   </ul>
-  <p>### proxy (ARFNET-HOSTMENOW VPS) *</p>
+  <h3 id="proxy-arfnet-hostmenow-vps">proxy (ARFNET-HOSTMENOW VPS)
+  *</h3>
   <ul>
   <li>SSH*</li>
   <li>IPsec client*</li>
@@ -718,13 +726,81 @@ ISP ===| ONT |---| DELL switch              |-----| TP-Link switch |
   <p>*TODO</p>
   <h2 id="internal-name-and-number-assignation-table">Internal Name and
   Number Assignation Table</h2>
-  <p>DMZ IPv4s and IPv6 ends in the same way | Addr | Name | |——|——| |
-  DMZ.1 | router.lan | | DMZ.2 | switch.lan | | DMZ.3 | wap.lan | |
-  DMZ.4 | proxmox.lan | | DMZ.5 | idrac.lan | | DMZ.6 | nas.lan | |
-  DMZ.7 | printer.lan | | DMZ.8 | desktop.lan | | DMZ.9 | web.lan | |
-  DMZ.10 | wazuh.lan | | DMZ.11 | game.lan | | DMZ.12 | comm.lan | |
-  DMZ.13 | misc.lan | | | | | | DMZ.192 | yerovps | yero.lan | | DMZ.195
-  | exovps | exo.lan |</p>
+  <p>DMZ IPv4s and IPv6 ends in the same way</p>
+  <table>
+  <thead>
+  <tr class="header">
+  <th>Addr</th>
+  <th>Name</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr class="odd">
+  <td>DMZ.1</td>
+  <td>router.lan</td>
+  </tr>
+  <tr class="even">
+  <td>DMZ.2</td>
+  <td>switch.lan</td>
+  </tr>
+  <tr class="odd">
+  <td>DMZ.3</td>
+  <td>wap.lan</td>
+  </tr>
+  <tr class="even">
+  <td>DMZ.4</td>
+  <td>proxmox.lan</td>
+  </tr>
+  <tr class="odd">
+  <td>DMZ.5</td>
+  <td>idrac.lan</td>
+  </tr>
+  <tr class="even">
+  <td>DMZ.6</td>
+  <td>nas.lan</td>
+  </tr>
+  <tr class="odd">
+  <td>DMZ.7</td>
+  <td>printer.lan</td>
+  </tr>
+  <tr class="even">
+  <td>DMZ.8</td>
+  <td>desktop.lan</td>
+  </tr>
+  <tr class="odd">
+  <td>DMZ.9</td>
+  <td>web.lan</td>
+  </tr>
+  <tr class="even">
+  <td>DMZ.10</td>
+  <td>wazuh.lan</td>
+  </tr>
+  <tr class="odd">
+  <td>DMZ.11</td>
+  <td>game.lan</td>
+  </tr>
+  <tr class="even">
+  <td>DMZ.12</td>
+  <td>comm.lan</td>
+  </tr>
+  <tr class="odd">
+  <td>DMZ.13</td>
+  <td>misc.lan</td>
+  </tr>
+  <tr class="even">
+  <td></td>
+  <td></td>
+  </tr>
+  <tr class="odd">
+  <td>DMZ.192</td>
+  <td>yerovps</td>
+  </tr>
+  <tr class="even">
+  <td>DMZ.195</td>
+  <td>exovps</td>
+  </tr>
+  </tbody>
+  </table>
   <h2 id="domain-dns-zone">Domain DNS zone</h2>
   <table>
   <thead>
@@ -737,41 +813,53 @@ ISP ===| ONT |---| DELL switch              |-----| TP-Link switch |
   </thead>
   <tbody>
   <tr class="odd">
-  <td>arf20.com</td>
+  <td>@</td>
   <td>NS</td>
   <td>ns1.arf20.com</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>arf20.com</td>
+  <td>@</td>
   <td>NS</td>
   <td>ns2.arf20.com</td>
   <td></td>
   </tr>
   <tr class="odd">
+  <td></td>
+  <td></td>
+  <td></td>
+  <td></td>
+  </tr>
+  <tr class="even">
   <td>ns1</td>
   <td>A</td>
   <td>2.59.235.35</td>
   <td></td>
   </tr>
-  <tr class="even">
+  <tr class="odd">
   <td>ns1</td>
   <td>AAAA</td>
   <td>2001:470:1f21:125::13</td>
   <td></td>
   </tr>
-  <tr class="odd">
+  <tr class="even">
   <td>ns2</td>
   <td>A</td>
   <td>5.250.186.185</td>
   <td></td>
   </tr>
-  <tr class="even">
+  <tr class="odd">
   <td>ns2</td>
   <td>AAAA</td>
   <td>2001:ba0:210:d600::1</td>
   <td></td>
   </tr>
+  <tr class="even">
+  <td></td>
+  <td></td>
+  <td></td>
+  <td></td>
+  </tr>
   <tr class="odd">
   <td>arf20.com</td>
   <td>A</td>
@@ -785,191 +873,251 @@ ISP ===| ONT |---| DELL switch              |-----| TP-Link switch |
   <td></td>
   </tr>
   <tr class="odd">
-  <td>arf20.com</td>
-  <td>MX</td>
-  <td>mail.arf20.com</td>
+  <td></td>
+  <td></td>
+  <td></td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>mail</td>
+  <td>mail.arf20.com</td>
   <td>A</td>
   <td>5.250.186.185</td>
-  <td></td>
+  <td>ARFNET-IONOS</td>
   </tr>
   <tr class="odd">
-  <td>mail</td>
+  <td>mail.arf20.com</td>
   <td>AAAA</td>
   <td>2001:ba0:210:d600::1</td>
-  <td></td>
+  <td>ARFNET-IONOS</td>
   </tr>
   <tr class="even">
-  <td>selector._domainkey</td>
-  <td>TXT</td>
-  <td>(DKIM)</td>
-  <td>DKIM for selector ‘selector’</td>
+  <td>web.arf20.com</td>
+  <td>A</td>
+  <td>2.59.235.35</td>
+  <td></td>
   </tr>
   <tr class="odd">
-  <td>_dmarc</td>
-  <td>TXT</td>
-  <td>(DMARC)</td>
+  <td>web.arf20.com</td>
+  <td>AAAA</td>
+  <td>2001:470:1f21:125::9</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>arf20.com</td>
-  <td>TXT</td>
-  <td>(SPF)</td>
+  <td>game.arf20.com</td>
+  <td>A</td>
+  <td>2.59.235.35</td>
   <td></td>
   </tr>
   <tr class="odd">
+  <td>game.arf20.com</td>
+  <td>AAAA</td>
+  <td>2001:470:1f21:125::11</td>
+  <td></td>
+  </tr>
+  <tr class="even">
+  <td>comm.arf20.com</td>
+  <td>A</td>
+  <td>2.59.235.35</td>
   <td></td>
+  </tr>
+  <tr class="odd">
+  <td>comm.arf20.com</td>
+  <td>AAAA</td>
+  <td>2001:470:1f21:125::12</td>
   <td></td>
+  </tr>
+  <tr class="even">
+  <td>misc.arf20.com</td>
+  <td>A</td>
+  <td>2.59.235.35</td>
   <td></td>
+  </tr>
+  <tr class="odd">
+  <td>misc.arf20.com</td>
+  <td>AAAA</td>
+  <td>2001:470:1f21:125::13</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>irc</td>
-  <td>CNAME</td>
-  <td>arf20.com</td>
+  <td></td>
+  <td></td>
+  <td></td>
   <td></td>
   </tr>
   <tr class="odd">
-  <td>jellyfin</td>
+  <td>irc.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>comm.arf20.com</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>matrix</td>
+  <td>jellyfin.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="odd">
-  <td>nextcloud</td>
+  <td>matrix.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>turn</td>
+  <td>nextcloud.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="odd">
-  <td>webmail</td>
+  <td>turn.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>comm.arf20.com</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>www</td>
+  <td>webmail.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="odd">
-  <td>xmpp</td>
+  <td>www.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>xmppconf</td>
+  <td>xmpp.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>comm.arf20.com</td>
   <td></td>
   </tr>
   <tr class="odd">
-  <td>grafana</td>
+  <td>xmppconf.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>comm.arf20.com</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>git</td>
+  <td>grafana.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="odd">
-  <td>cgit</td>
+  <td>git.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>blog</td>
+  <td>cgit.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="odd">
-  <td>forum</td>
+  <td>blog.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>deb</td>
+  <td>forum.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="odd">
-  <td>zabbix</td>
+  <td>deb.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="even">
-  <td>memes</td>
+  <td>zabbix.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="odd">
-  <td>news</td>
+  <td>memes.arf20.com</td>
   <td>CNAME</td>
-  <td>arf20.com</td>
+  <td>web.arf20.com</td>
   <td></td>
   </tr>
   <tr class="even">
+  <td>news.arf20.com</td>
+  <td>CNAME</td>
+  <td>misc.arf20.com</td>
+  <td></td>
+  </tr>
+  <tr class="odd">
   <td></td>
   <td></td>
   <td></td>
   <td></td>
   </tr>
-  <tr class="odd">
+  <tr class="even">
   <td>_acme-challenge.jellyfin</td>
   <td>CNAME</td>
   <td>(challenge)</td>
   <td></td>
   </tr>
-  <tr class="even">
+  <tr class="odd">
   <td>_acme-challenge.irc</td>
   <td>CNAME</td>
   <td>(challenge)</td>
   <td></td>
   </tr>
-  <tr class="odd">
+  <tr class="even">
   <td>_acme-challenge.matrix</td>
   <td>CNAME</td>
   <td>(challenge)</td>
   <td></td>
   </tr>
-  <tr class="even">
+  <tr class="odd">
   <td>_acme-challenge.mail</td>
   <td>CNAME</td>
   <td>(challenge)</td>
   <td></td>
   </tr>
-  <tr class="odd">
+  <tr class="even">
   <td>_acme-challenge.xmpp</td>
   <td>CNAME</td>
   <td>(challenge)</td>
   <td></td>
   </tr>
+  <tr class="odd">
+  <td></td>
+  <td></td>
+  <td></td>
+  <td></td>
+  </tr>
+  <tr class="even">
+  <td>arf20.com</td>
+  <td>MX</td>
+  <td>mail.arf20.com</td>
+  <td></td>
+  </tr>
+  <tr class="odd">
+  <td>selector._domainkey</td>
+  <td>TXT</td>
+  <td>(DKIM)</td>
+  <td>DKIM for selector ‘selector’</td>
+  </tr>
+  <tr class="even">
+  <td>_dmarc</td>
+  <td>TXT</td>
+  <td>(DMARC)</td>
+  <td></td>
+  </tr>
+  <tr class="odd">
+  <td>arf20.com</td>
+  <td>TXT</td>
+  <td>(SPF)</td>
+  <td></td>
+  </tr>
   </tbody>
   </table>
   <h2 id="he-v6-rdns-zone">HE v6 rDNS zone</h2>
diff --git a/arfnet2.md b/arfnet2.md
index 696acd1..5426fb7 100644
--- a/arfnet2.md
+++ b/arfnet2.md
@@ -200,6 +200,7 @@ All VMs are Debian 12 (templated) with wazuh agent
 ### nas DMZ.6
 
 RAID attached here (with the grey stuff) (local only)
+
  - SSH
  - NFS
  - Samba SMB*
@@ -291,9 +292,8 @@ RAID attached here (with the grey stuff) (local only)
     - public recursive*
  - OpenLDAP LDAP*
  - INN2 - NNTP USENET server with SDF peering
-
  - Discord servers
-   - gDebrid
+   - gDebrid (gookie)
 
 ### pubnix?*
 
@@ -308,7 +308,7 @@ RAID attached here (with the grey stuff) (local only)
  - majordomo? - mailing list manager*
  - bind9 - slave authoritative nameserver NS2
 
- ### proxy (ARFNET-HOSTMENOW VPS) *
+### proxy (ARFNET-HOSTMENOW VPS) *
 
  - SSH*
  - IPsec client*
@@ -332,6 +332,7 @@ RAID attached here (with the grey stuff) (local only)
 ## Internal Name and Number Assignation Table
 
 DMZ IPv4s and IPv6 ends in the same way
+
 | Addr | Name |
 |------|------|
 | DMZ.1 |  router.lan |
@@ -355,45 +356,57 @@ DMZ IPv4s and IPv6 ends in the same way
 
 | Name | Type | Content | Comment |
 |------|------|---------|---------|
-| arf20.com | NS | ns1.arf20.com | |
-| arf20.com | NS | ns2.arf20.com | |
+| @ | NS | ns1.arf20.com | |
+| @ | NS | ns2.arf20.com | |
+|
 | ns1 | A | 2.59.235.35 | |
 | ns1 | AAAA | 2001:470:1f21:125::13 | |
 | ns2 | A | 5.250.186.185 | |
 | ns2 | AAAA | 2001:ba0:210:d600::1 | |
+|
 | arf20.com | A | 2.59.235.35 | |
 | arf20.com | AAAA | 2001:470:1f21:125::9 | |
-| arf20.com | MX | mail.arf20.com | |
-| mail | A | 5.250.186.185 | |
-| mail | AAAA | 2001:ba0:210:d600::1 | |
-| selector._domainkey | TXT | (DKIM) | DKIM for selector 'selector' |
-| _dmarc | TXT | (DMARC) | |
-| arf20.com | TXT | (SPF) | |
 |
-| irc | CNAME | arf20.com |
-| jellyfin | CNAME | arf20.com |
-| matrix | CNAME | arf20.com |
-| nextcloud | CNAME | arf20.com |
-| turn | CNAME | arf20.com |
-| webmail | CNAME | arf20.com |
-| www | CNAME | arf20.com |
-| xmpp | CNAME | arf20.com |
-| xmppconf | CNAME | arf20.com |
-| grafana | CNAME | arf20.com |
-| git | CNAME | arf20.com |
-| cgit | CNAME | arf20.com |
-| blog | CNAME | arf20.com |
-| forum | CNAME | arf20.com |
-| deb | CNAME | arf20.com |
-| zabbix | CNAME | arf20.com |
-| memes | CNAME | arf20.com |
-| news | CNAME | arf20.com |
+| mail.arf20.com  | A	   | 5.250.186.185		   | ARFNET-IONOS
+| mail.arf20.com  | AAAA	| 2001:ba0:210:d600::1	| ARFNET-IONOS
+| web.arf20.com   | A	   | 2.59.235.35
+| web.arf20.com   | AAAA	| 2001:470:1f21:125::9
+| game.arf20.com  | A	   | 2.59.235.35
+| game.arf20.com  | AAAA	| 2001:470:1f21:125::11
+| comm.arf20.com  | A	   | 2.59.235.35
+| comm.arf20.com  | AAAA	| 2001:470:1f21:125::12
+| misc.arf20.com  | A	   | 2.59.235.35
+| misc.arf20.com  | AAAA	| 2001:470:1f21:125::13
+|
+| irc.arf20.com | CNAME | comm.arf20.com |
+| jellyfin.arf20.com | CNAME | web.arf20.com |
+| matrix.arf20.com | CNAME | web.arf20.com |
+| nextcloud.arf20.com | CNAME | web.arf20.com |
+| turn.arf20.com | CNAME | comm.arf20.com |
+| webmail.arf20.com | CNAME | web.arf20.com |
+| www.arf20.com | CNAME | web.arf20.com |
+| xmpp.arf20.com | CNAME | comm.arf20.com |
+| xmppconf.arf20.com | CNAME | comm.arf20.com |
+| grafana.arf20.com | CNAME | web.arf20.com |
+| git.arf20.com | CNAME | web.arf20.com |
+| cgit.arf20.com | CNAME | web.arf20.com |
+| blog.arf20.com | CNAME | web.arf20.com |
+| forum.arf20.com | CNAME | web.arf20.com |
+| deb.arf20.com | CNAME | web.arf20.com |
+| zabbix.arf20.com | CNAME | web.arf20.com |
+| memes.arf20.com | CNAME | web.arf20.com |
+| news.arf20.com | CNAME | misc.arf20.com |
 | 
 | _acme-challenge.jellyfin | CNAME | (challenge) | |
 | _acme-challenge.irc | CNAME | (challenge) | |
 | _acme-challenge.matrix | CNAME | (challenge) | |
 | _acme-challenge.mail |  CNAME | (challenge) | |
 | _acme-challenge.xmpp |  CNAME | (challenge) | |
+| 
+| arf20.com | MX | mail.arf20.com | |
+| selector._domainkey | TXT | (DKIM) | DKIM for selector 'selector' |
+| _dmarc | TXT | (DMARC) | |
+| arf20.com | TXT | (SPF) | |
 
 ## HE v6 rDNS zone
 
diff --git a/arfnet2.pdf b/arfnet2.pdf
index fd6ae34..42510ce 100644
--- a/arfnet2.pdf
+++ b/arfnet2.pdf