Compare commits
	
		
			3 Commits
		
	
	
		
			02795a6ee4
			...
			f0740741a4
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| f0740741a4 | |||
| 0c0b66b8db | |||
| bdf3c04595 | 
@@ -4,7 +4,7 @@ let
 | 
				
			|||||||
  inherit (lib) mkMerge mkDefault;
 | 
					  inherit (lib) mkMerge mkDefault;
 | 
				
			||||||
  inherit (lib.my) net;
 | 
					  inherit (lib.my) net;
 | 
				
			||||||
  inherit (lib.my.c) pubDomain;
 | 
					  inherit (lib.my.c) pubDomain;
 | 
				
			||||||
  inherit (lib.my.c.colony) domain prefixes;
 | 
					  inherit (lib.my.c.colony) domain prefixes firewallForwards;
 | 
				
			||||||
  inherit (lib.my.c.nginx) baseHttpConfig proxyHeaders;
 | 
					  inherit (lib.my.c.nginx) baseHttpConfig proxyHeaders;
 | 
				
			||||||
in
 | 
					in
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@@ -197,6 +197,7 @@ in
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
              firewall = {
 | 
					              firewall = {
 | 
				
			||||||
                tcp.allowed = [ 19999 "http" "https" ];
 | 
					                tcp.allowed = [ 19999 "http" "https" ];
 | 
				
			||||||
 | 
					                nat.forwardPorts."${allAssignments.estuary.internal.ipv4.address}" = firewallForwards allAssignments;
 | 
				
			||||||
                extraRules = ''
 | 
					                extraRules = ''
 | 
				
			||||||
                  table inet filter {
 | 
					                  table inet filter {
 | 
				
			||||||
                    chain forward {
 | 
					                    chain forward {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -131,6 +131,7 @@ in
 | 
				
			|||||||
            };
 | 
					            };
 | 
				
			||||||
          };
 | 
					          };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          flaresolverr.enable = true;
 | 
				
			||||||
          jackett.enable = true;
 | 
					          jackett.enable = true;
 | 
				
			||||||
          radarr.enable = true;
 | 
					          radarr.enable = true;
 | 
				
			||||||
          sonarr.enable = true;
 | 
					          sonarr.enable = true;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,8 +24,8 @@ in
 | 
				
			|||||||
        onState = [ "routable" ];
 | 
					        onState = [ "routable" ];
 | 
				
			||||||
        script = ''
 | 
					        script = ''
 | 
				
			||||||
          #!${pkgs.runtimeShell}
 | 
					          #!${pkgs.runtimeShell}
 | 
				
			||||||
          if [ $IFACE = "lan" ]; then
 | 
					          if [ "$IFACE" = "lan" ]; then
 | 
				
			||||||
            ${mstpd}/sbin/mstpctl setforcevers $IFACE rstp
 | 
					            ${mstpd}/sbin/mstpctl setforcevers "$IFACE" rstp
 | 
				
			||||||
          fi
 | 
					          fi
 | 
				
			||||||
        '';
 | 
					        '';
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user