Disable DNS and GSSAPI auth on sshd
Remove NixNG code
This commit is contained in:
parent
3d456b1a43
commit
fcc2848523
5 changed files with 3 additions and 72 deletions
|
@ -52,6 +52,8 @@
|
|||
settings = {
|
||||
PasswordAuthentication = false;
|
||||
KbdInteractiveAuthentication = false;
|
||||
GSSAPIAuthentication = false;
|
||||
UseDns = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -164,33 +164,6 @@ in
|
|||
cp -f ${./k3s-ca/etcd/server-ca.crt} /var/lib/rancher/k3s/server/tls/etcd/server-ca.crt
|
||||
'';
|
||||
};
|
||||
|
||||
nixng = lib.mkIf (cfg.role == "server")
|
||||
(
|
||||
let
|
||||
dnsmasqStream = (import ./dnsmasq.nix {
|
||||
inherit (inputs) nixpkgs nixng;
|
||||
inherit (inputs.nixng) nglib;
|
||||
inherit (self) globals;
|
||||
}).config.system.build.ociImage.stream;
|
||||
|
||||
dnsmasqImage = pkgs.stdenv.mkDerivation {
|
||||
name = "dnsmasq.tar";
|
||||
src = dnsmasqStream;
|
||||
dontUnpack = true;
|
||||
buildPhase = ''
|
||||
$src > $out
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
text = ''
|
||||
rm -rf ${self.globals.imageDir}
|
||||
mkdir -p ${self.globals.imageDir}
|
||||
ln -sf ${dnsmasqImage} ${self.globals.imageDir}/dnsmasq.tar
|
||||
'';
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
sops.secrets =
|
||||
|
|
|
@ -1,41 +0,0 @@
|
|||
{ globals, nixpkgs, nglib, ... }:
|
||||
nglib.makeSystem {
|
||||
inherit nixpkgs;
|
||||
system = "x86_64-linux";
|
||||
name = "nixng-dnsmasq";
|
||||
|
||||
config = { ... }: {
|
||||
dumb-init = {
|
||||
enable = true;
|
||||
type.services = { };
|
||||
};
|
||||
|
||||
init.services.dnsmasq = {
|
||||
shutdownOnExit = true;
|
||||
};
|
||||
|
||||
services.dnsmasq = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
address = [
|
||||
"/kms.kun.is/${globals.kmsIPv4}"
|
||||
"/ssh.git.kun.is/${globals.gitIPv4}"
|
||||
];
|
||||
|
||||
alias = "${globals.routerPublicIPv4},${globals.traefikIPv4}";
|
||||
expand-hosts = true;
|
||||
local = "/dmz/";
|
||||
log-queries = true;
|
||||
no-hosts = true;
|
||||
no-resolv = true;
|
||||
port = 53;
|
||||
|
||||
server = [
|
||||
"192.168.30.1"
|
||||
"/kun.is/${globals.bind9IPv4}"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -10,9 +10,8 @@ let
|
|||
net = import ./net.nix lib;
|
||||
});
|
||||
|
||||
nonSystemAttrs = rec {
|
||||
nonSystemAttrs = {
|
||||
globals = import ./globals.nix;
|
||||
imagePath = name: "nix:0${globals.imageDir}/${name}.tar";
|
||||
};
|
||||
|
||||
allAttrs = systemAttrs // nonSystemAttrs;
|
||||
|
|
|
@ -25,6 +25,4 @@
|
|||
freshrssIPv4 = "192.168.30.146";
|
||||
immichIPv4 = "192.168.30.147";
|
||||
nextcloudIPv4 = "192.168.30.148";
|
||||
|
||||
imageDir = "/var/container_images";
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue