Merge branch 'master' of github.com:starr-dusT/dotfiles

provision/hosts/kestrel/configuration.nix

@@ -1,7 +1,6 @@
 { config, pkgs, user, lib, ... }:
 {
   imports = [ 
-    ./rss.nix
     ./syncthing.nix
   ];
 

provision/hosts/torus/configuration.nix

@@ -7,6 +7,7 @@
     ./syncthing.nix
     ./obsidian-vault.nix
     ./share.nix
+    ./rss.nix
   ];
 
   nix = {
@@ -116,6 +117,9 @@
       "rss.tstarr.us" = (SSL // {
         locations."/".proxyPass = "http://localhost:8081/"; 
       });
+      "rss1.tstarr.us" = (SSL // {
+        locations."/".proxyPass = "http://localhost:8087/"; 
+      });
       "rssbridge.tstarr.us" = (SSL // {
         locations."/".proxyPass = "http://localhost:3000/"; 
       });

provision/hosts/torus/rss.nix

@@ -1,6 +1,5 @@
 { config, lib, pkgs, user, ... }:
 {
-
   services.postgresql = {
     enable = true;
     authentication = pkgs.lib.mkOverride 10 ''
@@ -8,13 +7,18 @@
       local all       all     trust
     '';
   };
+
+  networking.firewall.allowedTCPPorts = [ 8087 ];
+  networking.firewall.allowedUDPPorts = [ 8087 ];
+
   services.miniflux = {
     enable = true;
     config = {
-      LISTEN_ADDR = "localhost:8087";
+      PORT = "8087";
       # Break youtube embeds so they dont show
       YOUTUBE_EMBED_URL_OVERRIDE="https://";
     };
+    # Set initial admin user/password
     adminCredentialsFile = pkgs.writeText "cred" ''
                              ADMIN_USERNAME=miniflux
                              ADMIN_PASSWORD=miniflux