Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
Showing only changes of commit e82047e49d - Show all commits

View file

@ -11,6 +11,13 @@ in {
networking.hostName = "CFB4ED74"; # Define your hostname.
networking.firewall.enable = true;
networking.interfaces.eth0 = {
useDHCP = true;
ipv6.addresses = [ {
address = "2a02:c207:3003:2387::1";
prefixLength = 64;
} ];
};
# Kubernetes
# services.kubernetes.roles = ["master" "node"];
@ -23,7 +30,6 @@ in {
services.spice-vdagentd.enable = true;
services.qemuGuest.enable = true;
networking.useDHCP = true;
boot.initrd.network = {
enable = true;
udhcpc.extraArgs = [ "-x hostname:${config.networking.hostName}" ];