summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arfnet2.html77
-rw-r--r--arfnet2.md58
-rw-r--r--arfnet2.pdfbin144847 -> 145545 bytes
3 files changed, 106 insertions, 29 deletions
diff --git a/arfnet2.html b/arfnet2.html
index 8d8b21d..3103548 100644
--- a/arfnet2.html
+++ b/arfnet2.html
@@ -922,7 +922,11 @@ ISP ===| ONT |---| DELL switch |-----| TP-Link switch |
<li>gDebrid (gookie)</li>
</ul></li>
</ul>
- <h3 id="pubnix">pubnix?*</h3>
+ <h3 id="t2-t2-sde-dmz.15">t2 (T/2 SDE) DMZ.15</h3>
+ <h3 id="pubnix-openbsd-7.5-dmz.16">pubnix (OpenBSD 7.5) DMZ.16</h3>
+ <ul>
+ <li>SSH</li>
+ </ul>
<h3 id="mail-arfnet-ionos-vps-5.250.186.185-2001ba0210d6001">mail
(ARFNET-IONOS VPS) 5.250.186.185 2001:ba0:210:d600::1</h3>
<ul>
@@ -932,6 +936,7 @@ ISP ===| ONT |---| DELL switch |-----| TP-Link switch |
href="https://github.com/ARF20NET/mail-conf">config</a></li>
<li>dovecot - imapd</li>
<li>opendkim</li>
+ <li>opendmarc</li>
<li>bind9 - slave authoritative nameserver NS2</li>
<li>mlmmj - mailing list manager
<ul>
@@ -967,25 +972,53 @@ ISP ===| ONT |---| DELL switch |-----| TP-Link switch |
</tr>
</tbody>
</table>
- <h3 id="proxy-arfnet-hostmenow-vps">proxy (ARFNET-HOSTMENOW VPS)
- *</h3>
+ <h3 id="proxy-arfnet-hostmenow-vps-92.60.77.4">proxy (ARFNET-HOSTMENOW
+ VPS) 92.60.77.4</h3>
<ul>
- <li>SSH*</li>
- <li>IPsec tunnel*</li>
- <li>IP forward to nas*</li>
+ <li>SSH</li>
+ <li>IPsec tunnel</li>
+ <li>nginx reverse proxy to nas</li>
</ul>
+ <table>
+ <thead>
+ <tr class="header">
+ <th>vhost</th>
+ <th>webroot/proxy</th>
+ <th>Comment</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr class="odd">
+ <td>default</td>
+ <td>&lt;return 418 im a teapot&gt;</td>
+ <td></td>
+ </tr>
+ <tr class="even">
+ <td>jokesondmca.mooo.com</td>
+ <td>http://nas/</td>
+ <td>Stuff</td>
+ </tr>
+ </tbody>
+ </table>
<hr />
- <h3 id="yerovps-dmz.192-yero">yerovps DMZ.192 (yero)</h3>
+ <h3 id="yero-debian-vps-dmz.192-yero">yero-debian VPS DMZ.192
+ (yero)</h3>
<ul>
<li>SSH</li>
<li>mariadb</li>
<li>FiveM SuperioresRP</li>
</ul>
- <h3 id="exovps-dmz.195-exo">exovps DMZ.195 (exo)</h3>
+ <h3 id="exo-debian-vps-dmz.195-exo">exo-debian VPS DMZ.195 (exo)</h3>
<ul>
<li>SSH</li>
<li>netbox</li>
</ul>
+ <h3 id="loofa-debian-vps-dmz.196-loofa">loofa-debian VPS DMZ.196
+ (loofa)</h3>
+ <ul>
+ <li>SSH</li>
+ <li>?</li>
+ </ul>
<p>*TODO</p>
<h2 id="internal-name-and-number-assignation-table">Internal Name and
Number Assignation Table</h2>
@@ -1051,16 +1084,28 @@ ISP ===| ONT |---| DELL switch |-----| TP-Link switch |
<td>misc.lan</td>
</tr>
<tr class="even">
+ <td>DMZ.15</td>
+ <td>(t2)</td>
+ </tr>
+ <tr class="odd">
+ <td>DMZ.16</td>
+ <td>pubnix</td>
+ </tr>
+ <tr class="even">
<td></td>
<td></td>
</tr>
<tr class="odd">
<td>DMZ.192</td>
- <td>yerovps</td>
+ <td>yero-debian</td>
</tr>
<tr class="even">
<td>DMZ.195</td>
- <td>exovps</td>
+ <td>exo-debian</td>
+ </tr>
+ <tr class="odd">
+ <td>DMZ.196</td>
+ <td>loofa-debian</td>
</tr>
</tbody>
</table>
@@ -1203,6 +1248,18 @@ ISP ===| ONT |---| DELL switch |-----| TP-Link switch |
<td></td>
</tr>
<tr class="even">
+ <td>pubnix.arf20.com</td>
+ <td>A</td>
+ <td>2.59.235.35</td>
+ <td></td>
+ </tr>
+ <tr class="odd">
+ <td>pubnix.arf20.com</td>
+ <td>AAAA</td>
+ <td>2600:70ff:f039:4::16</td>
+ <td></td>
+ </tr>
+ <tr class="even">
<td></td>
<td></td>
<td></td>
diff --git a/arfnet2.md b/arfnet2.md
index c892fc3..b63124b 100644
--- a/arfnet2.md
+++ b/arfnet2.md
@@ -359,7 +359,11 @@ RAID attached here (with the grey stuff) (local only)
- Discord servers
- gDebrid (gookie)
-### pubnix?*
+### t2 (T/2 SDE) DMZ.15
+
+### pubnix (OpenBSD 7.5) DMZ.16
+
+ - SSH
### mail (ARFNET-IONOS VPS) 5.250.186.185 2001:ba0:210:d600::1
@@ -369,6 +373,7 @@ RAID attached here (with the grey stuff) (local only)
[config](https://github.com/ARF20NET/mail-conf)
- dovecot - imapd
- opendkim
+ - opendmarc
- bind9 - slave authoritative nameserver NS2
- mlmmj - mailing list manager
- installed to /usr/local/bin/mlmmj-webarchiver.sh and
@@ -380,25 +385,35 @@ RAID attached here (with the grey stuff) (local only)
| default | \<return 418 im a teapot> | |
| lists.arf20.com | / = /var/www/lists.arf20.com/html/<br> /archive = /srv/www/htdocs/archive/ | Mailing lists |
-### proxy (ARFNET-HOSTMENOW VPS) *
+### proxy (ARFNET-HOSTMENOW VPS) 92.60.77.4
- - SSH*
- - IPsec tunnel*
- - IP forward to nas*
+ - SSH
+ - IPsec tunnel
+ - nginx reverse proxy to nas
+
+ | vhost | webroot/proxy | Comment |
+ |-------|---------------|---------|
+ | default | \<return 418 im a teapot> | |
+ | jokesondmca.mooo.com | http://nas/ | Stuff |
---
-### yerovps DMZ.192 (yero)
+### yero-debian VPS DMZ.192 (yero)
- SSH
- mariadb
- FiveM SuperioresRP
-### exovps DMZ.195 (exo)
+### exo-debian VPS DMZ.195 (exo)
- SSH
- netbox
+### loofa-debian VPS DMZ.196 (loofa)
+
+ - SSH
+ - ?
+
\*TODO
## Internal Name and Number Assignation Table
@@ -420,9 +435,12 @@ DMZ IPv4s and IPv6 ends in the same way
| DMZ.11 | game.lan |
| DMZ.12 | comm.lan |
| DMZ.13 | misc.lan |
+| DMZ.15 | (t2) |
+| DMZ.16 | pubnix |
| | | |
-| DMZ.192 | yerovps | yero.lan |
-| DMZ.195 | exovps | exo.lan |
+| DMZ.192 | yero-debian | yero.lan |
+| DMZ.195 | exo-debian | exo.lan |
+| DMZ.196 | loofa-debian | loofa.lan |
## DNS
@@ -441,16 +459,18 @@ DMZ IPv4s and IPv6 ends in the same way
| arf20.com | A | 2.59.235.35 | |
| arf20.com | AAAA | 2600:70ff:f039:4::9 | |
|
-| 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 |
-| game.arf20.com | A | 2.59.235.35
-| game.arf20.com | AAAA | 2600:70ff:f039:4::11
-| comm.arf20.com | A | 2.59.235.35
-| comm.arf20.com | AAAA | 2600:70ff:f039:4::12
-| misc.arf20.com | A | 2.59.235.35
-| misc.arf20.com | AAAA | 2600:70ff:f039:4::13
+| 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 |
+| game.arf20.com | A | 2.59.235.35
+| game.arf20.com | AAAA | 2600:70ff:f039:4::11
+| comm.arf20.com | A | 2.59.235.35
+| comm.arf20.com | AAAA | 2600:70ff:f039:4::12
+| misc.arf20.com | A | 2.59.235.35
+| misc.arf20.com | AAAA | 2600:70ff:f039:4::13
+| pubnix.arf20.com | A | 2.59.235.35
+| pubnix.arf20.com | AAAA | 2600:70ff:f039:4::16
|
| irc.arf20.com | CNAME | comm.arf20.com |
| jellyfin.arf20.com | CNAME | web.arf20.com |
diff --git a/arfnet2.pdf b/arfnet2.pdf
index b6ceae6..3dd819e 100644
--- a/arfnet2.pdf
+++ b/arfnet2.pdf
Binary files differ