Update hardware

modeemi · Feb 6, 2024 · d6ad8b4 · d6ad8b4
1 parent cbd604c
commit d6ad8b4
Showing 1 changed file with 36 additions and 9 deletions.
diff --git a/modeemintternet/templates/hardware.html b/modeemintternet/templates/hardware.html
@@ -183,7 +183,7 @@ <h3>Erinäisten palveluiden pyörittäjiä</h3>
         <td>4 x UltraSPARC-IIIi 1281 MHz</td>
         <td>8GB</td>
         <td>72G RAID1</td>
-        <td>Solaris 10</td>
+        <td>Solaris 11.3</td>
         <td>Hallinta, Email</td>
     </tr>
     <tr>
@@ -195,19 +195,37 @@ <h3>Erinäisten palveluiden pyörittäjiä</h3>
         <td>Debian 9</td>
         <td>DNS, OpenVPN</td>
     </tr>
+    <tr>
+        <td>mgw</td>
+        <td>OpenIndiana zone</td>
+        <td>8 vCPU</td>
+        <td>16GB</td>
+        <td>268G</td>
+        <td>OpenIndiana Hipster 2023.10</td>
+        <td>Maailmalle lentävä sähköposti</td>
+    </tr>
     <tr>
         <td>spam</td>
         <td>VM</td>
-        <td>4 vCPU</td>
+        <td>2 vCPU</td>
         <td>4GB</td>
         <td>10G</td>
-        <td>Debian 9</td>
+        <td>Debian 12</td>
+        <td>Roskapostisuodin</td>
+    </tr>
+    <tr>
+        <td>junk</td>
+        <td>VM</td>
+        <td>2 vCPU</td>
+        <td>4GB</td>
+        <td>10G</td>
+        <td>Debian 12</td>
         <td>Roskapostisuodin</td>
     </tr>
     <tr>
         <td>cherry</td>
         <td>VM</td>
-        <td>4 vCPU</td>
+        <td>2 vCPU</td>
         <td>4GB</td>
         <td>10G</td>
         <td>Debian 9</td>
@@ -216,7 +234,7 @@ <h3>Erinäisten palveluiden pyörittäjiä</h3>
     <tr>
         <td>imperial</td>
         <td>VM</td>
-        <td>4 vCPU</td>
+        <td>1 vCPU</td>
         <td>4GB</td>
         <td>10G</td>
         <td>Debian 9</td>
@@ -225,7 +243,7 @@ <h3>Erinäisten palveluiden pyörittäjiä</h3>
 	<tr>
 		<td>gambina</td>
 		<td>VM</td>
-		<td>1 vCPU</td>
+		<td>2 vCPU</td>
 		<td>1 GB</td>
 		<td>8G</td>
 		<td>Debian 10</td>
@@ -234,12 +252,21 @@ <h3>Erinäisten palveluiden pyörittäjiä</h3>
     <tr>
         <td>matrix</td>
         <td>VM</td>
-        <td>8 vCPU</td>
+        <td>4 vCPU</td>
         <td>8GB</td>
-        <td>10G</td>
-        <td>Debian 9</td>
+        <td>20G + 100G</td>
+        <td>Debian 10</td>
         <td>Matrix-serveri</td>
     </tr>
+    <tr>
+        <td>grandi</td>
+        <td>VM</td>
+        <td>1 vCPU</td>
+        <td>4GB</td>
+        <td>8G</td>
+        <td>Debian 11</td>
+        <td>Netbox</td>
+    </tr>
     <tr>
         <td>can</td>
         <td>Dell R710</td>