From 06267a238406fbb2a594a9b41823224c8d065d8a Mon Sep 17 00:00:00 2001
From: Matt Layher <mdlayher@gmail.com>
Date: Mon, 31 Jan 2022 20:16:15 -0500
Subject: [PATCH] nixos/routnerr-2: remove apcupsd and minecraft

Signed-off-by: Matt Layher <mdlayher@gmail.com>
---
 nixos/routnerr-2/configuration.nix | 3 ---
 nixos/routnerr-2/nftables.nix      | 9 ---------
 2 files changed, 12 deletions(-)

diff --git a/nixos/routnerr-2/configuration.nix b/nixos/routnerr-2/configuration.nix
index da88973..bf417f3 100644
--- a/nixos/routnerr-2/configuration.nix
+++ b/nixos/routnerr-2/configuration.nix
@@ -113,8 +113,6 @@ in {
       reflector = true;
     };
 
-    apcupsd.enable = true;
-
     lldpd.enable = true;
 
     # Enable the OpenSSH daemon.
@@ -125,7 +123,6 @@ in {
     };
 
     prometheus.exporters = {
-      apcupsd.enable = true;
       modemmanager.enable = true;
     };
 
diff --git a/nixos/routnerr-2/nftables.nix b/nixos/routnerr-2/nftables.nix
index 385b378..90e719b 100644
--- a/nixos/routnerr-2/nftables.nix
+++ b/nixos/routnerr-2/nftables.nix
@@ -14,7 +14,6 @@ let
     http = "80";
     https = "443";
     mdns = "5353";
-    minecraft = "25565";
     plex = "32400";
     ssh = "22";
     unifi_device = "8080";
@@ -247,12 +246,6 @@ in {
             }
           } tcp dport {${ports.ssh}, ${ports.consrv}} counter accept comment "IPv6 SSH"
 
-          # Minecraft running on server.
-          ip daddr ${vars.server_ipv4} tcp dport ${ports.minecraft} counter accept comment "server TCPv4 Minecraft"
-          ip6 daddr ${vars.server_ipv6} tcp dport ${ports.minecraft} counter accept comment "server TCPv6 Minecraft"
-          ip daddr ${vars.server_ipv4} udp dport ${ports.minecraft} counter accept comment "server UDPv4 Minecraft"
-          ip6 daddr ${vars.server_ipv6} udp dport ${ports.minecraft} counter accept comment "server UDPv6 Minecraft"
-
           # Plex running on server.
           ip daddr ${vars.server_ipv4} tcp dport ${ports.plex} counter accept comment "server IPv4 Plex"
           ip6 daddr ${vars.server_ipv6} tcp dport ${ports.plex} counter accept comment "server IPv6 Plex"
@@ -297,14 +290,12 @@ in {
 
         chain prerouting_wans {
           tcp dport {
-            ${ports.minecraft},
             ${ports.plex},
             ${ports.unifi_device},
             ${ports.unifi_web},
           } dnat ${vars.server_ipv4} comment "server TCPv4 DNAT"
 
           udp dport {
-            ${ports.minecraft},
             ${ports.unifi_stun},
           } dnat ${vars.server_ipv4} comment "server UDPv4 DNAT"