adding ioit vlan to jeeves-jr

This commit is contained in:
Richie Cahill 2024-08-11 17:51:26 -04:00
parent 73448e7949
commit b514504178
5 changed files with 38 additions and 26 deletions

View File

@ -104,6 +104,7 @@
"hyprland", "hyprland",
"hyprwm", "hyprwm",
"INITDB", "INITDB",
"ioit",
"iperf", "iperf",
"jmgilman", "jmgilman",
"jnoortheen", "jnoortheen",

View File

@ -9,7 +9,6 @@ in
"${../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" "${../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
"${vars.main_mirror}:/data" "${vars.main_mirror}:/data"
]; ];
ports = [ "800:80" ];
extraOptions = [ "--network=web" ]; extraOptions = [ "--network=web" ];
autoStart = true; autoStart = true;
}; };

View File

@ -15,32 +15,16 @@
useSystemdBoot = true; useSystemdBoot = true;
}; };
environment = { environment.systemPackages = with pkgs; [ docker-compose ];
systemPackages = with pkgs; [ docker-compose ];
etc = {
# Creates /etc/lynis/custom.prf
"lynis/custom.prf" = {
text = ''
skip-test=BANN-7126
skip-test=BANN-7130
skip-test=DEB-0520
skip-test=DEB-0810
skip-test=FIRE-4513
skip-test=HRDN-7222
skip-test=KRNL-5820
skip-test=LOGG-2190
skip-test=LYNIS
skip-test=TOOL-5002
'';
mode = "0440";
};
};
};
services = { services = {
nfs.server.enable = true; openssh = {
ports = [ 352 ];
openssh.ports = [ 352 ]; listenAddresses = [
{ addr = "192.168.95.35"; }
{ addr = "192.168.90.35"; }
];
};
smartd.enable = true; smartd.enable = true;

View File

@ -3,7 +3,14 @@
enable = true; enable = true;
openFirewall = true; openFirewall = true;
config = { config = {
server_port = 8123; http = {
server_port = 8123;
server_host = [
"192.168.95.35"
"192.168.90.35"
"192.168.98.4"
];
};
homeassistant = { homeassistant = {
time_zone = "America/New_York"; time_zone = "America/New_York";
unit_system = "imperial"; unit_system = "imperial";

View File

@ -6,12 +6,28 @@
systemd.network = { systemd.network = {
enable = true; enable = true;
netdevs = {
"20-ioit-vlan" = {
netdevConfig = {
Kind = "vlan";
Name = "ioit-vlan";
};
vlanConfig.Id = 20;
};
};
networks = { networks = {
"10-lan" = { "10-lan" = {
matchConfig.Name = "enp4s0"; matchConfig.Name = "enp4s0";
DHCP = "yes"; DHCP = "yes";
vlan = [ "ioit-vlan" ];
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
}; };
"40-ioit-vlan" = {
matchConfig.Name = "ioit-vlan";
DHCP = "yes";
};
}; };
}; };
@ -20,3 +36,8 @@
joinNetworks = [ "e4da7455b2ae64ca" ]; joinNetworks = [ "e4da7455b2ae64ca" ];
}; };
} }
# 22/tcp open ssh
# 800/tcp open mdbs_daemon
# 5355/tcp open llmnr
# 8123/tcp open polipo
# 9993/tcp open palace-2