lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

ops/nixos: tidy up hostnames

Browse source
This commit is contained in:
Luke Granger-Brown 2021-04-10 20:15:30 +00:00
parent 1b3cb3f723
commit bfa7051e2f
5 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ops/nixos/bvm-nixosmgmt/default.nix
View file

@ -25,7 +25,7 @@
environment.etc."rundeck.nodes.yaml" = let environment.etc."rundeck.nodes.yaml" = let
content = builtins.mapAttrs (name: value: { content = builtins.mapAttrs (name: value: {
nodename = name; nodename = name;
hostname = value.config.networking.fqdn; hostname = value.config.my.rundeck.hostname;
tags = lib.concatStringsSep "," value.config.my.rundeck.tags; tags = lib.concatStringsSep "," value.config.my.rundeck.tags;
username = "deployer"; username = "deployer";
osFamily = "unix"; osFamily = "unix";

4
ops/nixos/lib/common.nix
View file

@ -11,6 +11,10 @@ in
{ {
imports = [ ../../../third_party/home-manager/nixos ]; imports = [ ../../../third_party/home-manager/nixos ];
options.my.rundeck.hostname = lib.mkOption {
type = lib.types.str;
default = config.networking.fqdn;
};
options.my.rundeck.expectedOnline = lib.mkOption { options.my.rundeck.expectedOnline = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = true; default = true;

1
ops/nixos/marukuru/default.nix
View file

@ -66,6 +66,7 @@ in {
services.openssh.ports = [ 20022 ]; services.openssh.ports = [ 20022 ];
my.deploy.args = "-p 20022"; my.deploy.args = "-p 20022";
my.rundeck.hostname = "${config.networking.fqdn}:20022";
networking.firewall = { networking.firewall = {
interfaces.docker0.allowedTCPPorts = [ 25 ]; interfaces.docker0.allowedTCPPorts = [ 25 ];

2
ops/nixos/swann/default.nix
View file

@ -34,7 +34,7 @@ in {
# Networking! # Networking!
networking = { networking = {
hostName = "swann"; # Define your hostname. hostName = "swann"; # Define your hostname.
domain = "house.as205479.net"; domain = "int.as205479.net";
nameservers = ["8.8.8.8" "8.8.4.4"]; nameservers = ["8.8.8.8" "8.8.4.4"];
useDHCP = false; useDHCP = false;
interfaces = { interfaces = {

2
ops/nixos/totoro/default.nix
View file

@ -67,7 +67,7 @@ in {
# Networking! # Networking!
networking = { networking = {
hostName = "totoro"; # Define your hostname. hostName = "totoro"; # Define your hostname.
domain = "lukegb.xyz"; domain = "int.as205479.net";
hostId = "676c08c4"; hostId = "676c08c4";
useDHCP = false; useDHCP = false;
interfaces.br-ext.useDHCP = true; interfaces.br-ext.useDHCP = true;