diff --git a/nixos/agares/configuration.nix b/nixos/agares/configuration.nix index c28a4f8..edf7e9e 100644 --- a/nixos/agares/configuration.nix +++ b/nixos/agares/configuration.nix @@ -1,5 +1,4 @@ { config -, lib , modulesPath , pkgs , ... diff --git a/nixos/ninurta/configuration.nix b/nixos/ninurta/configuration.nix index 47b25bb..5512b1f 100644 --- a/nixos/ninurta/configuration.nix +++ b/nixos/ninurta/configuration.nix @@ -198,29 +198,7 @@ in allowed-uris = https://github.com/NixOS https://github.com/nix-community https://github.com/dadada https://git.dadada.li/ github.com/ryantm/agenix github.com/serokell/deploy-rs https://gitlab.com/khumba/nvd.git https://github.com/real-or-random/dokuwiki-plugin-icalevents https://github.com/giterlizzi/dokuwiki-template-bootstrap3 ''; - services.nginx = { - enable = true; - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - logError = "/dev/null"; - appendHttpConfig = '' - access_log off; - ''; - - virtualHosts."pruflas.uwu" = { - enableACME = false; - forceSSL = false; - root = "/var/www/pruflas.uwu"; - locations."/" = { - tryFiles = "$uri $uri/ = 404"; - index = "index.txt"; - }; - }; - }; - systemd.tmpfiles.rules = [ - "d /var/www/pruflas.uwu 0551 nginx nginx - -" "d /mnt/storage/backups/ninurta 0750 ${config.users.users.borg.name} ${config.users.users.borg.group} - -" "v /var/.snapshots 0755 root root - -" "v /home/.snapshots 0755 root root - -" @@ -387,14 +365,12 @@ in allowPing = true; allowedTCPPorts = [ 22 # SSH - 80 # HTTP - 443 # HTTPS - 631 # Printing (TODO only allow from some networks) + 631 # Printing 3000 # Hydra softServePort ]; allowedUDPPorts = [ - 631 # Printing (TODO only allow from some networks) + 631 # Printing 51234 # Wireguard 51235 # Wireguard ]; diff --git a/nixos/ninurta/printing.nix b/nixos/ninurta/printing.nix index 68e5c69..2551683 100644 --- a/nixos/ninurta/printing.nix +++ b/nixos/ninurta/printing.nix @@ -33,6 +33,7 @@ userServices = true; }; }; + services.printing = { listenAddresses = [ "192.168.101.184:631" "fd42:9c3b:f96d:101:4a21:bff:fe3e:9cfe:631" ]; allowFrom = [ "from 192.168.101.0/24" ];