Add fudo-pkgs submodule
This commit is contained in:
+10
-3
@@ -2,7 +2,14 @@
|
||||
|
||||
# Config common to all hosts, which don't belong anywhere else
|
||||
{
|
||||
config = {
|
||||
home-manager.users.root = import ../home-manager/root.nix { inherit config lib pkgs; };
|
||||
config = let
|
||||
home-generator = pkgs.callPackage ../niten-home-generator.nix {};
|
||||
host-domain = config.fudo.hosts.${config.instance.hostname}.domain;
|
||||
in {
|
||||
home-manager.users.root = home-generator.generate-config {
|
||||
username = "root";
|
||||
home-dir = "/root";
|
||||
user-email = "root@${config.instance.hostname}.${host-domain}";
|
||||
} { };
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,6 @@ with lib; {
|
||||
};
|
||||
|
||||
supportedFilesystems = [ "zfs" ];
|
||||
# kernelPackages = pkgs.linuxPackages.zfs;
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
|
||||
@@ -22,7 +22,7 @@ in {
|
||||
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
supportedFilesystems = [ "zfs" ];
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
# kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
zfs.enableUnstable = true;
|
||||
|
||||
|
||||
@@ -199,20 +199,19 @@ in {
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://cargo.sea.fudo.org:5000/webman/3rdparty/SurveillanceStation/";
|
||||
# proxyPass = "http://cargo.sea.fudo.org:5000/webman/3rdparty/SurveillanceStation/";
|
||||
proxyPass = "http://cargo.sea.fudo.org:5000/";
|
||||
|
||||
extraConfig = ''
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "Upgrade";
|
||||
|
||||
resolver 10.0.0.1;
|
||||
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-By $server_addr:$server_port;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-By $server_addr:$server_port;
|
||||
# proxy_set_header X-Forwarded-For $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Proto $scheme;
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user