From 429fb714cff29d78b27b4af00e534faa1a8c69b6 Mon Sep 17 00:00:00 2001
From: arf20 <aruizfernandez05@gmail.com>
Date: Thu, 30 May 2024 19:08:09 +0200
Subject: Panaland

---
 arfnet2.html |  37 ++++++++++++++++++++++++-------------
 arfnet2.md   |   6 ++++--
 arfnet2.pdf  | Bin 144288 -> 144458 bytes
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/arfnet2.html b/arfnet2.html
index 04b4b16..6305b61 100644
--- a/arfnet2.html
+++ b/arfnet2.html
@@ -858,6 +858,11 @@ ISP ===| ONT |---| DELL switch              |-----| TP-Link switch |
   <td>http://yerovps.lan:3001</td>
   <td></td>
   </tr>
+  <tr class="odd">
+  <td>panaland.arf20.com</td>
+  <td>/var/www/panaland.arf20.com/html/</td>
+  <td></td>
+  </tr>
   </tbody>
   </table>
   <h3 id="wazuh-dmz.10---secure">wazuh DMZ.10 -&gt; secure*</h3>
@@ -872,9 +877,9 @@ ISP ===| ONT |---| DELL switch              |-----| TP-Link switch |
   <li>waterfall (minecraft reverse proxy) :25565
   <ul>
   <li>mclobby (auth)</li>
-  <li>mcgrupo4*</li>
   <li>minepau*</li>
   </ul></li>
+  <li>panaland mc modded :25566</li>
   <li>css dedicated server :27015</li>
   </ul>
   <h3 id="comm-dmz.12">comm DMZ.12</h3>
@@ -1306,66 +1311,72 @@ ISP ===| ONT |---| DELL switch              |-----| TP-Link switch |
   <td></td>
   </tr>
   <tr class="odd">
+  <td>panaland.arf20.com</td>
+  <td>CNAME</td>
+  <td>web.arf20.com</td>
+  <td></td>
+  </tr>
+  <tr class="even">
   <td></td>
   <td></td>
   <td></td>
   <td></td>
   </tr>
-  <tr class="even">
+  <tr class="odd">
   <td>_acme-challenge.jellyfin</td>
   <td>CNAME</td>
   <td>(challenge)</td>
   <td></td>
   </tr>
-  <tr class="odd">
+  <tr class="even">
   <td>_acme-challenge.irc</td>
   <td>CNAME</td>
   <td>(challenge)</td>
   <td></td>
   </tr>
-  <tr class="even">
+  <tr class="odd">
   <td>_acme-challenge.matrix</td>
   <td>CNAME</td>
   <td>(challenge)</td>
   <td></td>
   </tr>
-  <tr class="odd">
+  <tr class="even">
   <td>_acme-challenge.mail</td>
   <td>CNAME</td>
   <td>(challenge)</td>
   <td></td>
   </tr>
-  <tr class="even">
+  <tr class="odd">
   <td>_acme-challenge.xmpp</td>
   <td>CNAME</td>
   <td>(challenge)</td>
   <td></td>
   </tr>
-  <tr class="odd">
+  <tr class="even">
   <td></td>
   <td></td>
   <td></td>
   <td></td>
   </tr>
-  <tr class="even">
+  <tr class="odd">
   <td>arf20.com</td>
   <td>MX</td>
   <td>mail.arf20.com</td>
   <td></td>
   </tr>
-  <tr class="odd">
+  <tr class="even">
   <td>selector._domainkey</td>
   <td>TXT</td>
   <td>(DKIM)</td>
   <td>DKIM for selector ‘selector’</td>
   </tr>
-  <tr class="even">
+  <tr class="odd">
   <td>_dmarc</td>
   <td>TXT</td>
   <td>(DMARC)</td>
   <td></td>
   </tr>
-  <tr class="odd">
+  <tr class="even">
   <td>arf20.com</td>
   <td>TXT</td>
   <td>(SPF)</td>
@@ -1431,8 +1442,8 @@ ISP ===| ONT |---| DELL switch              |-----| TP-Link switch |
   </table>
   <h2 id="custom-arfnet-software">Custom ARFNET software</h2>
   <ul>
-  <li>CSTIMS: client, service, ticket and invoice management system
-  (WIP)</li>
+  <li><a href="https://cgit.arf20.com/cstims">cstims</a>: client,
+  service, ticket and invoice management system</li>
   <li>status page (TODO)</li>
   </ul>
 	</body>
diff --git a/arfnet2.md b/arfnet2.md
index c355231..f773546 100644
--- a/arfnet2.md
+++ b/arfnet2.md
@@ -312,6 +312,7 @@ RAID attached here (with the grey stuff) (local only)
 | ftp.arf20.com | /d/FTPServer/public/ |  |
 | | | |
 | status.yero.dev | http://yerovps.lan:3001 | |
+| panaland.arf20.com | /var/www/panaland.arf20.com/html/ | |
 
 ### wazuh DMZ.10 -> secure*
 
@@ -324,8 +325,8 @@ RAID attached here (with the grey stuff) (local only)
  - SSH
  - waterfall (minecraft reverse proxy) :25565
     - mclobby (auth)
-    - mcgrupo4*
     - minepau*
+ - panaland mc modded :25566
  - css dedicated server :27015
 
 ### comm DMZ.12
@@ -467,6 +468,7 @@ DMZ IPv4s and IPv6 ends in the same way
 | zabbix.arf20.com | CNAME | web.arf20.com |
 | memes.arf20.com | CNAME | web.arf20.com |
 | news.arf20.com | CNAME | misc.arf20.com |
+| panaland.arf20.com | CNAME | web.arf20.com |
 | 
 | _acme-challenge.jellyfin | CNAME | (challenge) | |
 | _acme-challenge.irc | CNAME | (challenge) | |
@@ -496,5 +498,5 @@ DMZ IPv4s and IPv6 ends in the same way
 
 ## Custom ARFNET software
 
- - CSTIMS: client, service, ticket and invoice management system (WIP)
+ - [cstims](https://cgit.arf20.com/cstims): client, service, ticket and invoice management system
  - status page (TODO)
diff --git a/arfnet2.pdf b/arfnet2.pdf
index 1c43c4c..feea1f0 100644
Binary files a/arfnet2.pdf and b/arfnet2.pdf differ
-- 
cgit v1.2.3