From 140351de979e9dd0b528c2332a30bb22c1b077b5 Mon Sep 17 00:00:00 2001 From: Anish L Date: Tue, 26 Apr 2022 23:00:01 +1000 Subject: [PATCH] still no wallabag... --- flake.nix | 2 +- modules/wallabag.nix | 41 +++++++++++++++--------------- profiles/dns/default.nix | 2 +- profiles/mossnet-hosts/default.nix | 1 + 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.nix b/flake.nix index 1ae77e62..983766aa 100644 --- a/flake.nix +++ b/flake.nix @@ -118,7 +118,7 @@ suites = with profiles; rec { base = [ core users.root users.anish ]; sealight = [ base server ]; # matrix rsshub backup wireguard - mossnet = [ base server taskd nextcloud wireguard-box shaarli wallabag headphones dns backup monitoring gonic nfs ]; + mossnet = [ base server taskd nextcloud wireguard-box shaarli wallabag headphones dns backup monitoring gonic nfs rss-bridge ]; # grasp hpi cube = [ base site server ]; graphical = [ base bluetooth music sync wireguard wifi desktop ]; curve = [ graphical secrets ]; diff --git a/modules/wallabag.nix b/modules/wallabag.nix index 8e4f4db1..c7bf6745 100644 --- a/modules/wallabag.nix +++ b/modules/wallabag.nix @@ -139,27 +139,26 @@ in fastcgi_param DOCUMENT_ROOT ${cfg.package}/web; fastcgi_read_timeout 120; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_NAME $fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; - fastcgi_param REQUEST_URI $request_uri; - fastcgi_param DOCUMENT_URI $document_uri; - fastcgi_param SERVER_PROTOCOL $server_protocol; - - fastcgi_param GATEWAY_INTERFACE CGI/1.1; - fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; - - fastcgi_param REMOTE_ADDR $remote_addr; - fastcgi_param REMOTE_PORT $remote_port; - fastcgi_param SERVER_ADDR $server_addr; - fastcgi_param SERVER_PORT $server_port; - fastcgi_param SERVER_NAME $server_name; + fastcgi_param QUERY_STRING $query_string; + fastcgi_param REQUEST_METHOD $request_method; + fastcgi_param CONTENT_TYPE $content_type; + fastcgi_param CONTENT_LENGTH $content_length; + + fastcgi_param SCRIPT_NAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; + fastcgi_param REQUEST_URI $request_uri; + fastcgi_param DOCUMENT_URI $document_uri; + fastcgi_param SERVER_PROTOCOL $server_protocol; + + fastcgi_param GATEWAY_INTERFACE CGI/1.1; + fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + + fastcgi_param REMOTE_ADDR $remote_addr; + fastcgi_param REMOTE_PORT $remote_port; + fastcgi_param SERVER_ADDR $server_addr; + fastcgi_param SERVER_PORT $server_port; + fastcgi_param SERVER_NAME $server_name; # internal; ''; diff --git a/profiles/dns/default.nix b/profiles/dns/default.nix index 73ea4a17..351b5910 100644 --- a/profiles/dns/default.nix +++ b/profiles/dns/default.nix @@ -10,7 +10,7 @@ addn-hosts=/ec/adblock.hosts ''; services.dnsmasq.servers = [ "45.90.30.49" "45.90.28.49" "1.1.1.1" "8.8.8.8" ]; - networking.hosts = { "172.16.11.240" = [ "mossnet.lan" "links.mossnet.lan" "read.mossnet.lan" "stats.mossnet.lan" "music.mossnet.lan" "rss.mossnet.lan" "tasks.mossnet.lan" ]; }; + networking.hosts = { "192.168.1.240" = [ "mossnet.lan" "links.mossnet.lan" "read.mossnet.lan" "stats.mossnet.lan" "music.mossnet.lan" "rss.mossnet.lan" "tasks.mossnet.lan" ]; }; networking.firewall.allowedTCPPorts = [ 53 ]; networking.firewall.allowedUDPPorts = [ 53 ]; } diff --git a/profiles/mossnet-hosts/default.nix b/profiles/mossnet-hosts/default.nix index 3f357072..37ead7a3 100644 --- a/profiles/mossnet-hosts/default.nix +++ b/profiles/mossnet-hosts/default.nix @@ -3,6 +3,7 @@ 192.168.1.240 mossnet.lan 192.168.1.240 links.mossnet.lan 192.168.1.240 read.mossnet.lan + 192.168.1.240 music.mossnet.lan 192.168.1.240 stats.mossnet.lan ''; # 10.0.69.4 mossnet.lan