From e8b253e458fdfd2fc3e18092f65144acad1ccadc Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Wed, 6 Dec 2023 23:33:16 +0900
Subject: [PATCH] Update xinetd

---
 nixos/hosts/osaka-linode-01/xinetd.nix | 50 ++++++--------------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git a/nixos/hosts/osaka-linode-01/xinetd.nix b/nixos/hosts/osaka-linode-01/xinetd.nix
index 0e4f54db..9333a82e 100644
--- a/nixos/hosts/osaka-linode-01/xinetd.nix
+++ b/nixos/hosts/osaka-linode-01/xinetd.nix
@@ -56,18 +56,12 @@
       {
         name = "http";
         server = "/usr/bin/env"; # Placeholder.
-        extraConfig = ''
-            socket_type = raw
-            redirect = 10.100.0.2 80
-        '';
+        extraConfig = "redirect = 10.100.0.2 80";
       }
       {
         name = "https";
         server = "/usr/bin/env"; # Placeholder.
-        extraConfig = ''
-            socket_type = raw
-            redirect = 10.100.0.2 443
-        '';
+        extraConfig = "redirect = 10.100.0.2 443";
       }
       {
         name = "minecraft";
@@ -75,10 +69,7 @@
         protocol = "tcp";
         unlisted = true;
         server = "/usr/bin/env"; # Placeholder.
-        extraConfig = ''
-            socket_type = raw
-            redirect = 10.100.0.2 25565
-        '';
+        extraConfig = "redirect = 10.100.0.2 25565";
       }
       {
         name = "vintage-story";
@@ -86,10 +77,7 @@
         protocol = "tcp";
         unlisted = true;
         server = "/usr/bin/env"; # Placeholder.
-        extraConfig = ''
-            socket_type = raw
-            redirect = 10.100.0.2 42420
-        '';
+        extraConfig = "redirect = 10.100.0.2 42420";
       }
 
       ################################################ mail
@@ -99,10 +87,7 @@
         protocol = "tcp";
         unlisted = true;
         server = "/usr/bin/env"; # Placeholder.
-        extraConfig = ''
-            socket_type = raw
-            redirect = 10.100.0.2 25
-        '';
+        extraConfig = "redirect = 10.100.0.2 25";
       }
       {
         name = "mail 465";
@@ -110,10 +95,7 @@
         protocol = "tcp";
         unlisted = true;
         server = "/usr/bin/env"; # Placeholder.
-        extraConfig = ''
-            socket_type = raw
-            redirect = 10.100.0.2 465
-        '';
+        extraConfig = "redirect = 10.100.0.2 465";
       }
       {
         name = "mail 587";
@@ -121,10 +103,7 @@
         protocol = "tcp";
         unlisted = true;
         server = "/usr/bin/env"; # Placeholder.
-        extraConfig = ''
-            socket_type = raw
-            redirect = 10.100.0.2 587
-        '';
+        extraConfig = "redirect = 10.100.0.2 587";
       }
       {
         name = "mail 143";
@@ -132,10 +111,7 @@
         protocol = "tcp";
         unlisted = true;
         server = "/usr/bin/env"; # Placeholder.
-        extraConfig = ''
-            socket_type = raw
-            redirect = 10.100.0.2 143
-        '';
+        extraConfig = "redirect = 10.100.0.2 143";
       }
       {
         name = "mail 993";
@@ -143,10 +119,7 @@
         protocol = "tcp";
         unlisted = true;
         server = "/usr/bin/env"; # Placeholder.
-        extraConfig = ''
-            socket_type = raw
-            redirect = 10.100.0.2 993
-        '';
+        extraConfig = "redirect = 10.100.0.2 993";
       }
       {
         name = "mail 4190";
@@ -154,10 +127,7 @@
         protocol = "tcp";
         unlisted = true;
         server = "/usr/bin/env"; # Placeholder.
-        extraConfig = ''
-            socket_type = raw
-            redirect = 10.100.0.2 4190
-        '';
+        extraConfig = "redirect = 10.100.0.2 4190";
       }
       ################################################ /mail