From 029b83ef4e08f1d0214ae81ae54badc36b369c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Thu, 29 Dec 2022 20:20:08 +0100
Subject: [PATCH] feat: remove mosquitto

Remove mosquitto including mqtt Home Assistant integration
since I've stopped using any services that require it.
---
 home-server.nix                     |   2 --
 secrets/mqtt/hass.age               | Bin 668 -> 0 bytes
 secrets/mqtt/tasmota.age            | Bin 628 -> 0 bytes
 secrets/secrets.nix                 |   2 --
 services/home-assistant/default.nix |   2 --
 services/mosquitto.nix              |  50 ----------------------------
 6 files changed, 56 deletions(-)
 delete mode 100644 secrets/mqtt/hass.age
 delete mode 100644 secrets/mqtt/tasmota.age
 delete mode 100644 services/mosquitto.nix

diff --git a/home-server.nix b/home-server.nix
index 291581b..85a513e 100644
--- a/home-server.nix
+++ b/home-server.nix
@@ -21,7 +21,6 @@ in with builtins; {
     # ./services/kodi.nix
     ./services/jellyfin.nix
     ./services/etebase.nix
-    ./services/mosquitto.nix
     ./services/genie.nix
     ./services/home-assistant
     ./services/esphome.nix
@@ -89,7 +88,6 @@ in with builtins; {
       "photos.felschr.com"
       "books.felschr.com"
       "news.felschr.com"
-      "mqtt.felschr.com"
       "etebase.felschr.com"
       "paperless.felschr.com"
     ];
diff --git a/secrets/mqtt/hass.age b/secrets/mqtt/hass.age
deleted file mode 100644
index f70040750e91e0aab18b4f9ea7f5bc3bfa23f1b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 668
zcmZ9_%WKnc003a|qy>)(PK2P$gR{${%i2zvBxznv(>CprriH=s__a&grcIh9X~BU*
z7y~aJ6!jp&L~#cZl_4SwPaBAbA&AP@X@YDb$YA10@w)FH__PLy1IO_CUEk_BqaCjS
z2WTul3H5rjabRLNj;5gkQIlo~h=mK8PSs6SC??0+0QReeLMdsmG^f@{QS@vri&k|E
z7gQ;xWV;e4jx?o)$6CTj-p|{XrUTHzBzcx1^)wo2MWHijxy{2{E2{|(0r^aTbrjoF
zL%AmLewh^&W+cl}7%t8kP2K4VVZrC<da9I)fi4o|ta2aM08&?+gyNu%T0odAY0)A;
z%ML$fu!3af1my6R#4I}*LY!scydk)@ZJ9N0ASX!?t7aL+1!$O2^No&>BZFY7J<=v(
zoR~5Bv53lR6h*Qq5Lreh-~^>JOjj<Z31D^8V=_XF0ptHR88MaV<V3vT0j&q1VdTn;
zkSaqFfYnJ1vadqvi}QRYjKO}C<Qb*Jxf~(ziJ&^@M9z3X=}Ln}OR(G5Dbc_qf(|th
zp=PgZSK2MOljx<$s%vQJnB#jvWcd;xJ++IfzC^_0@i>HpmZF+TFH99Ph>X>WIo06X
zQN2-Ni3a7F$atF;amGp5VQlx(QS0yipLgG$m_HXEyxD$VpFX&WFPyu-x?L$eJ`&K!
zH+F8XX^RuL%+uF)q3g?^4o3C)=Uch;Gdn9^@9ln}Hy?etad!XJg;Rs2y>;Qo8o|rI
zkF_ojEzOCGZ#V8d-CD^Gj`+*Pk1s#>hcfU(fB5?^(tZ76VdmNSz4_Wn<nD<k8u_dC
GX6YZ?>+sV6

diff --git a/secrets/mqtt/tasmota.age b/secrets/mqtt/tasmota.age
deleted file mode 100644
index 99a716013b9529c1bdfc0ec4bb59c10a51009b51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 628
zcmZ9_OKZ~r003ac2_rW>Om<LuHfC*JOX@*Q)1_ISO_!!?c1n{pP1-z`wn^KIJ9uyo
zK@m~#fr98oyr_6|OqlF2)QK`YNZo085<SeLc-{90KEtsgJ22y6)N{jNCXAhI0t3*6
zOt;&DYzx70IG>RzU1?DnnqYb`47*X{Nkd<x9hl1&V8xaFl3{Q{;-qA?;M0sg!T^%#
zvH2l^nq<E!BzcfzLA$Tfj0BdsS+$N~ZL?sgv>7Mj;jP0Nd_ZOVa?MkQJfU@Bg0_QR
zmmT0OUi7VE#Dr>E1Es}8r_3NmDWIkyS=(xYl3U~W`Y1Qj8>r#b85QZY(5|ob70Vtq
zsM0_-4{rqGdPJHD$+q5)`o8QtJ*k`&(HbM@6e^0#T3M!Q6<A^MP@m2AM<!4WaGypx
zPJtiP6V4Ilo6UT(pyw2<A_%13qT+hkO)DX0w*PM^KLa_jZFFq_PA!LQBKV*Tf)OQ&
zrq|~QHM?M!QqpiL4I8aX7~&-n>xn@glw)V4i)j*ijX9)R3{}8bwqV)C00@FIi!w%O
z!){cp4WpcDF`=dr#X&Pa&xeWamGH#sl-r!(3ZMft9_o9W_aBc>4zlsoczWdSteifx
zdHLzhaB6MZ;&=Ira}!r@h}5SayYFY-zFt4Lw0HCX_(E)h-zLHBzsL3~%9Z2i&ib!z
z{m#VS*Zt=byuWcBoKM+5?{X`jsW+`>t0%?}mOh@E7~}M0=jYPxovoMGSaYrO>&}Ps
T<Bdo67K=xKt-GsVpS<`7nONcY

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 1869b33..eca37ef 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -18,8 +18,6 @@ in {
   "restic/password.age".publicKeys = [ felschr home-pc home-server pilot1 ];
   "smtp.age".publicKeys = [ felschr home-pc home-server ];
   "samba.age".publicKeys = [ felschr home-pc home-server ];
-  "mqtt/hass.age".publicKeys = [ felschr home-pc home-server ];
-  "mqtt/tasmota.age".publicKeys = [ felschr home-pc home-server ];
   "cloudflare.age".publicKeys = [ felschr home-pc home-server ];
   "etebase-server.age".publicKeys = [ felschr home-pc home-server ];
   "calibre-web/htpasswd.age".publicKeys = [ felschr home-pc home-server ];
diff --git a/services/home-assistant/default.nix b/services/home-assistant/default.nix
index 3c85084..26099ff 100644
--- a/services/home-assistant/default.nix
+++ b/services/home-assistant/default.nix
@@ -4,7 +4,6 @@ with pkgs;
 
 let
   port = config.services.home-assistant.config.http.server_port;
-  mqttPort = 1883;
   geniePort = 3232;
 in {
   # just installed for ConBee firmware updates
@@ -30,7 +29,6 @@ in {
     extraComponents = [
       "default_config"
       "otp"
-      "mqtt"
       "esphome"
       "homekit_controller"
       "fritz"
diff --git a/services/mosquitto.nix b/services/mosquitto.nix
deleted file mode 100644
index 70bbba0..0000000
--- a/services/mosquitto.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs;
-
-let
-  port = 1883;
-  wsPort = 9001;
-
-  mkSecret = file: {
-    inherit file;
-    owner = "mosquitto";
-  };
-in {
-  age.secrets = {
-    mqtt-felix = mkSecret ../secrets/mqtt/felix.age;
-    mqtt-birgit = mkSecret ../secrets/mqtt/birgit.age;
-    mqtt-hass = mkSecret ../secrets/mqtt/hass.age;
-    mqtt-tasmota = mkSecret ../secrets/mqtt/tasmota.age;
-  };
-
-  services.nginx = {
-    virtualHosts."mqtt.felschr.com" = {
-      enableACME = true;
-      forceSSL = true;
-      locations."/" = {
-        proxyPass = "http://localhost:${toString wsPort}";
-        proxyWebsockets = true;
-      };
-    };
-  };
-
-  networking.firewall.allowedTCPPorts = [ port ];
-
-  services.mosquitto = {
-    enable = true;
-    listeners = [{
-      port = port;
-      users = {
-        "hass" = {
-          acl = [ "readwrite homeassistant/#" "readwrite tasmota/#" ];
-          hashedPasswordFile = config.age.secrets.mqtt-hass.path;
-        };
-        "tasmota" = {
-          acl = [ "readwrite tasmota/#" "readwrite homeassistant/#" ];
-          hashedPasswordFile = config.age.secrets.mqtt-tasmota.path;
-        };
-      };
-    }];
-  };
-}