Cleanup
This commit is contained in:
parent
190cd4ece1
commit
3af388b5f0
|
@ -694,10 +694,10 @@
|
||||||
|
|
||||||
sshlog = nixosSystem' {
|
sshlog = nixosSystem' {
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/sshlog
|
|
||||||
self.nixosModules.cluster-options
|
self.nixosModules.cluster-options
|
||||||
self.nixosModules.microvm
|
self.nixosModules.microvm
|
||||||
sshlogd.nixosModule
|
sshlogd.nixosModule
|
||||||
|
./hosts/sshlog
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
c3d2 = {
|
c3d2 = {
|
||||||
deployment.server = "server10";
|
deployment.server = "server10";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
c3d2MacAddress = "00:0b:ad:00:1d:ea";
|
c3d2MacAddress = "00:0b:ad:00:1d:ea";
|
||||||
|
|
|
@ -48,6 +48,7 @@ in
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
portunus.addToHosts = true;
|
portunus.addToHosts = true;
|
||||||
|
|
||||||
postfix = {
|
postfix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableSmtp = true;
|
enableSmtp = true;
|
||||||
|
|
|
@ -111,9 +111,8 @@
|
||||||
journald.extraConfig = ''
|
journald.extraConfig = ''
|
||||||
Storage=volatile
|
Storage=volatile
|
||||||
'';
|
'';
|
||||||
openssh = {
|
openssh.enable = true;
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
# Allow access to USB
|
# Allow access to USB
|
||||||
udev.extraRules = ''
|
udev.extraRules = ''
|
||||||
SUBSYSTEM=="usb", MODE:="0666"
|
SUBSYSTEM=="usb", MODE:="0666"
|
||||||
|
|
|
@ -43,9 +43,9 @@ in
|
||||||
"/etc/machine-id"
|
"/etc/machine-id"
|
||||||
"/etc/passwd"
|
"/etc/passwd"
|
||||||
"/etc/shadow"
|
"/etc/shadow"
|
||||||
"/etc/ssh/ssh_host_rsa_key"
|
|
||||||
"/etc/ssh/ssh_host_ed25519_key"
|
"/etc/ssh/ssh_host_ed25519_key"
|
||||||
"/etc/ssh/ssh_host_ed25519_key.pub"
|
"/etc/ssh/ssh_host_ed25519_key.pub"
|
||||||
|
"/etc/ssh/ssh_host_rsa_key"
|
||||||
"/etc/ssh/ssh_host_rsa_key.pub"
|
"/etc/ssh/ssh_host_rsa_key.pub"
|
||||||
"/etc/subgid"
|
"/etc/subgid"
|
||||||
"/etc/subuid"
|
"/etc/subuid"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ zentralwerk, options, config, lib, pkgs, ... }:
|
{ zentralwerk, config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
defaultGateways = {
|
defaultGateways = {
|
||||||
|
@ -60,9 +60,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
mountBase = mkOption {
|
mountBase = mkOption {
|
||||||
description = ''
|
description = "Location (ZFS dataset, ...) where all the shares live.";
|
||||||
Location (ZFS dataset, ...) where all the shares live.
|
|
||||||
'';
|
|
||||||
type = types.path;
|
type = types.path;
|
||||||
default = "/var/lib/microvms/${hostName}";
|
default = "/var/lib/microvms/${hostName}";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue