Skip to content

Commit a934b6b

Browse files
disassemblerdisassembler
committed
all the changes...
1 parent 854677c commit a934b6b

File tree

18 files changed

+19128
-3953
lines changed

18 files changed

+19128
-3953
lines changed

‎flake.lock

Lines changed: 18591 additions & 3843 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
nixpkgsLegacy.url = "github:NixOS/nixpkgs/nixos-23.11";
99
#nixpkgs-2111.follows = "cardano-node/haskellNix/nixpkgs-2111";
1010
#nixpkgs-2105.follows = "cardano-node/haskellNix/nixpkgs-2105";
11-
cardano-node.url = "github:input-output-hk/cardano-node/8.12.2";
11+
cardano-node.url = "github:intersectmbo/cardano-node/10.1.1-pre";
12+
credential-manager.url = "github:intersectmbo/credential-manager/0.1.0.0";
13+
hydra-doom.url = "github:cardano-scaling/hydra-doom";
1214
#cardano-node.inputs.nixpkgs.follows = "haskellNix/nixpkgs-2105";
1315
#cardano-addresses.url = "github:input-output-hk/cardano-addresses";
1416
#haskellNix.url = "github:input-output-hk/haskell.nix/14f740c7c8f535581c30b1697018e389680e24cb";

‎modules/services/omadad/default.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ in {
6363

6464
package = mkOption {
6565
type = types.package;
66-
default = pkgs.callPackage ./package.nix {};
66+
default = pkgs.callPackage ./package.nix {
67+
mongodb = cfg.mongodb;
68+
};
6769
description = ''
6870
Omada package
6971
'';
@@ -91,8 +93,9 @@ in {
9193

9294
systemd.services.omadad = {
9395
description = "Wifi access point controller";
94-
wantedBy = [ "multi-user.target" ];
96+
wants = [ "network-online.target" ];
9597
after = [ "network-online.target" ];
98+
wantedBy = [ "multi-user.target" ];
9699
path = [ pkgs.bash cfg.mongodb pkgs.nettools pkgs.curl pkgs.procps ];
97100

98101
serviceConfig = let

‎nixos/configurations.nix

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
, inputs
55
, nixos-hardware
66
, cardano-node
7+
, credential-manager
78
, nix
89
#, cardano-db-sync
910
, ...
@@ -70,7 +71,7 @@ in
7071
cardano-node.nixosModules.cardano-node
7172
./sarov/configuration.nix
7273
];
73-
specialArgs = { inherit inputs cardano-node; };
74+
specialArgs = { inherit inputs cardano-node credential-manager; };
7475
};
7576
valaam = nixosSystem {
7677
system = "x86_64-linux";
@@ -102,6 +103,13 @@ in
102103
];
103104
specialArgs = { inherit inputs; };
104105
};
106+
#installeriso = nixosSystem {
107+
# system = "x86_64-linux";
108+
# modules = [
109+
# ./installeriso/configuration.nix
110+
# ];
111+
# specialArgs = { inherit inputs; };
112+
#};
105113
airgap = nixosSystem {
106114
system = "x86_64-linux";
107115
modules = baseModules ++ [

‎nixos/deploy.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ in
1616
sshUser = "root";
1717
nodes = {
1818
optina = mkNode "optina" "10.40.33.20" true;
19-
portal = mkNode "portal" "10.40.33.1" true;
20-
#portal = mkNode "portal" "prophet.samleathers.com" true;
21-
sarov = mkNode "sarov" "10.40.33.159" true;
19+
portal = mkNode "portal" "portal.lan.disasm.us" true;
20+
#portal = mkNode "portal" "174.59.122.137" true;
21+
sarov = mkNode "sarov" "10.40.33.124" true;
2222
valaam = mkNode "valaam" "10.40.33.21" true;
23-
prod01 = mkNode "prod01" "45.76.4.212" false;
23+
prod01 = mkNode "prod01" "prod01.samleathers.com" false;
2424
prod03 = mkNode "prod03" "45.63.23.13" false;
2525
};
2626
}

‎nixos/irkutsk/configuration.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ in
329329

330330

331331
services = {
332-
tailscale.enable = true;
332+
tailscale.enable = false;
333333
lorri.enable = true;
334334
trezord.enable = true;
335335
resolved.enable = false;

‎nixos/optina/configuration.nix

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1-
{ lib, config, pkgs, pkgsLegacy, ... }:
1+
{ lib, config, pkgs, inputs, ... }:
22

33

44
with lib;
55

66
let
7+
legacyPkgs = import inputs.nixpkgsLegacy {
8+
system = "x86_64-linux";
9+
config = {
10+
allowUnfree = true;
11+
# required for mongodb 3.4
12+
permittedInsecurePackages = [ "openssl-1.0.2u" ];
13+
};
14+
};
715
shared = import ../../shared.nix;
816
netboot_root = pkgs.runCommand "nginxroot" { } ''
917
mkdir -pv $out
@@ -107,6 +115,7 @@ in
107115
hostName = "optina";
108116
domain = "lan.disasm.us";
109117
hostId = "1768b40b";
118+
tempAddresses = "disabled";
110119
interfaces.enp2s0.ipv4.addresses = [{ address = "10.40.33.20"; prefixLength = 24; }];
111120
defaultGateway = "10.40.33.1";
112121
nameservers = [ "10.40.33.1" "8.8.8.8" ];
@@ -354,16 +363,18 @@ in
354363
};
355364
};
356365
# TODO: run omadad and unifi in a controller with an older nixpkgs
357-
#omadad = {
358-
# enable = true;
359-
# httpPort = 8089;
360-
# httpsPort = 10443;
361-
#};
362-
#unifi = {
363-
# enable = true;
364-
# unifiPackage = pkgs.unifi6;
365-
# openFirewall = true;
366-
#};
366+
omadad = {
367+
enable = true;
368+
httpPort = 8089;
369+
httpsPort = 10443;
370+
mongodb = legacyPkgs.mongodb;
371+
};
372+
unifi = {
373+
enable = true;
374+
unifiPackage = legacyPkgs.unifi6;
375+
mongodbPackage = legacyPkgs.mongodb-4_4;
376+
openFirewall = true;
377+
};
367378
#telegraf = {
368379
# enable = true;
369380
# extraConfig = {

‎nixos/optina/minecraft-bedrock.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{ stdenv, fetchurl, patchelf, openssl, unzip, lib, zlib, curl }:
22

33
let
4-
version = "1.21.3.01";
5-
sha256 = "sha256-6xznfVO4g+ICgVixwM7RrrmoVMlFnbIFwWDt1kYfvnM=";
4+
version = "1.21.51.01";
5+
sha256 = "sha256-7VBhpK5+Q9WFml6dKyVT/QgUssR5wzyugELJry4IU2M=";
66
rpath = lib.makeLibraryPath [ zlib openssl stdenv.cc.cc curl ];
77
in
88
stdenv.mkDerivation rec {
99
name = "${pname}-${version}";
1010
pname = "minecraft-bedrock-server";
1111
inherit version;
1212
src = fetchurl {
13-
url = "https://minecraft.azureedge.net/bin-linux/bedrock-server-${version}.zip";
13+
url = "https://util.samleathers.com/bedrock-server-${version}.zip";
1414
inherit sha256;
1515
};
1616
postPatch = ''

‎nixos/portal/configuration.nix

Lines changed: 64 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,13 @@ in
229229
# allow traffic with existing state
230230
ip46tables -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT
231231
# Allow forwarding the following ports from Internet via IPv6 only
232-
${forwardPortToHost 3001 "enp1s0" "tcp" "2601:98a:4102:ef0:8c6d:c3ff:fe13:5d63"}
232+
${forwardPortToHost 3001 "enp1s0" "tcp" "2601:98a:4100:1700:1046:d1ff:feea:9276"}
233233
# block forwarding from external interface
234234
ip6tables -A FORWARD -i enp1s0 -j DROP
235235
''
236236
];
237237
allowedTCPPorts = [ 32400 5222 5060 53 3001 ];
238-
allowedUDPPorts = [ 51820 1194 1195 5060 5222 53 config.services.toxvpn.port 19132 5353 ];
238+
allowedUDPPorts = [ 51820 1194 1195 5060 5222 53 19132 5353 ];
239239
};
240240
wireguard.interfaces = {
241241
wg0 = {
@@ -272,39 +272,69 @@ in
272272
publicKey = "eR6I+LI/BayJ90Kjt0wJyfJUsoSmayD+cb6Kb7qdCV4=";
273273
allowedIPs = [ "10.37.4.0/24" "10.37.6.1/32" "fd00::37/128" ];
274274
}
275+
#{
276+
# # buffalo run
277+
# publicKey = "b1SJJq77euLkBM/femF+jJ5HbR/dc3cEQEejYZMtFCA=";
278+
# allowedIPs = [ "10.40.9.5/32" ];
279+
#}
275280
{
276-
# buffalo run
277-
publicKey = "b1SJJq77euLkBM/femF+jJ5HbR/dc3cEQEejYZMtFCA=";
278-
allowedIPs = [ "10.40.9.5/32" ];
279-
}
280-
{
281-
# greenacres
282-
publicKey = "NhywNZQlIJitXta1V+HCLSiOTYlgxWOQGvxh2Tvinmk=";
283-
allowedIPs = [ "10.36.3.0/24" "fd00::36/128" "192.168.254.0/24" ];
284-
}
285-
{
286-
# bower-office
287-
publicKey = "rsRvtd4mm4hucE5W1QqCjWJwmSlhWnSWaIWts/Z8/xY=";
288-
allowedIPs = [ "10.38.0.1/32" "192.168.0.0/24" ];
289-
endpoint = "73.230.94.119:51820";
290-
}
291-
{
292-
# bower-home
293-
publicKey = "3sHFhvDxx6nVX/DBroIGTdHfehl9I/OOB4Fo5v7Vvxc=";
294-
allowedIPs = [ "10.38.0.2/32" "192.168.1.0/24" "192.168.10.0/24" ];
295-
endpoint = "98.235.35.253:51820";
296-
}
297-
{
298-
# clever
299-
publicKey = "oycbQ1DhtRh0hhD5gpyiKTUh0USkAwbjMer6/h/aHg8=";
300-
allowedIPs = [ "10.40.9.3/32" "fd00::3/128" ];
301-
endpoint = "nas.earthtools.ca:51821";
302-
}
303-
{
304-
# johnalotoski
305-
publicKey = "MRowDI1eC9B5Hx/zgPk5yyq2eWSq6kYFW5Sjm7w52AY=";
306-
allowedIPs = [ "10.40.9.4/32" "fd00::4/128" ];
307-
}
281+
# greenacres
282+
publicKey = "NhywNZQlIJitXta1V+HCLSiOTYlgxWOQGvxh2Tvinmk=";
283+
allowedIPs = [ "10.36.3.0/24" "fd00::36/128" "192.168.254.0/24" ];
284+
}
285+
{
286+
# bower-office
287+
publicKey = "rsRvtd4mm4hucE5W1QqCjWJwmSlhWnSWaIWts/Z8/xY=";
288+
allowedIPs = [ "10.38.0.1/32" "192.168.0.0/24" ];
289+
endpoint = "174.175.23.241:51820";
290+
}
291+
{
292+
# bower-home
293+
publicKey = "3sHFhvDxx6nVX/DBroIGTdHfehl9I/OOB4Fo5v7Vvxc=";
294+
allowedIPs = [ "10.38.0.2/32" "192.168.1.0/24" "192.168.10.0/24" ];
295+
endpoint = "98.235.35.253:51820";
296+
}
297+
{
298+
# clever
299+
publicKey = "oycbQ1DhtRh0hhD5gpyiKTUh0USkAwbjMer6/h/aHg8=";
300+
allowedIPs = [ "10.40.9.3/32" "fd00::3/128" ];
301+
endpoint = "nas.earthtools.ca:51821";
302+
}
303+
{
304+
# johnalotoski
305+
publicKey = "MRowDI1eC9B5Hx/zgPk5yyq2eWSq6kYFW5Sjm7w52AY=";
306+
allowedIPs = [ "10.40.9.4/32" "fd00::4/128" ];
307+
}
308+
{
309+
# installer
310+
publicKey = "FDES05UMXVPKusZaMjP0vbVlyM5UASZtE560RjVIo3E=";
311+
allowedIPs = [ "10.40.9.5/32" "fd00::5/128" ];
312+
}
313+
{
314+
# hydra-arcade-1
315+
publicKey = "aq7dxIkmWEQXr3eB7uzZOBEZ0WT6kgEW9BsqqH2eBDE=";
316+
allowedIPs = [ "10.40.9.6/32" "fd00::6/128" ];
317+
}
318+
{
319+
# hydra-arcade-2
320+
publicKey = "Q+Sx+o4ckWuO/CQ9IVCIIfBytXZkgDUIkSS50eUmCWU=";
321+
allowedIPs = [ "10.40.9.7/32" "fd00::7/128" ];
322+
}
323+
{
324+
# hydra-arcade-qemu
325+
publicKey = "A0LYo/Pjx99kUTA9jBzSzfi8qRELOfM+0N0JD1HhcBY=";
326+
allowedIPs = [ "10.40.9.8/32" "fd00::8/128" ];
327+
}
328+
{
329+
# hydra-doom-mini
330+
publicKey = "hP0Z/mlzGoiZ3XgavKGL40wypHKcRVDR1Hkx2Cz28Sg=";
331+
allowedIPs = [ "10.40.9.9/32" "fd00::9/128" ];
332+
}
333+
{
334+
# carlos
335+
publicKey = "/9YVN8nraowBRjhe6ysajY5bp4fUVqJE622OpLpl4Hs=";
336+
allowedIPs = [ "10.40.9.100/32" "fd00::100/128" ];
337+
}
308338
];
309339

310340
};

‎nixos/prod01/configuration.nix

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ in
6666
serverAliases = [ "www.nixedge.com" ];
6767
root = pkgs.nixedge_site;
6868
};
69+
"resume.disasm.us" = {
70+
enableACME = true;
71+
forceSSL = true;
72+
root = ./resume;
73+
};
6974
"rats.fail" =
7075
let
7176
metadata = ''
@@ -121,6 +126,15 @@ in
121126
serverAliases = [ "www.centrallakerealty.com" ];
122127
globalRedirect = "www.facebook.com/MarieLeathersRealtor?mibextid=2JQ9oc";
123128
};
129+
"doom.disasm.us" = {
130+
enableACME = true;
131+
forceSSL = true;
132+
root = inputs.hydra-doom.packages."x86_64-linux".hydra-doom-static-remote;
133+
extraConfig = ''
134+
disable_symlinks off;
135+
try_files $uri $uri /index.html;
136+
'';
137+
};
124138
};
125139
};
126140
services.mysql = {

‎nixos/prod01/modules/knot/disasm.us.zone

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@ 3600 IN SOA disasm.us. root.disasm.us. 2023091101 7200 3600 86400 3600
1+
@ 3600 IN SOA disasm.us. root.disasm.us. 2024092403 7200 3600 86400 3600
22

33
$TTL 600
44

@@ -13,41 +13,41 @@ _acme-challenge.lan IN NS ns1.disasm.us
1313
@ IN CAA 0 issue "letsencrypt.org"
1414
@ IN CAA 0 iodef "mailto:[email protected]"
1515

16-
@ 300 IN A 45.76.4.212
16+
@ 300 IN A 45.76.4.212
1717

1818
; Google records
19-
@ 300 IN MX 1 aspmx.l.google.com.
20-
@ 300 IN MX 3 alt1.aspmx.l.google.com.
21-
@ 300 IN MX 3 alt2.aspmx.l.google.com.
22-
@ 300 IN MX 5 aspmx2.googlemail.com.
23-
@ 300 IN MX 5 aspmx3.googlemail.com.
24-
@ 300 IN MX 5 aspmx4.googlemail.com.
25-
@ 300 IN MX 5 aspmx5.googlemail.com.
26-
@ 10800 IN TXT "google-site-verification=7qHsbQ1rdlFiMWL080OeAv7uGddX_-8E-Qc-WiUU_L8"
27-
calendar 300 IN CNAME ghs.google.com.
28-
docs 300 IN CNAME ghs.google.com.
29-
in 300 IN TXT "v=spf1" "include:_spf.google.com" "~all"
30-
mail 300 IN CNAME ghs.google.com.
31-
sites 300 IN CNAME ghs.google.com.
32-
start 300 IN CNAME ghs.google.com.
19+
@ 300 IN MX 1 aspmx.l.google.com.
20+
@ 300 IN MX 3 alt1.aspmx.l.google.com.
21+
@ 300 IN MX 3 alt2.aspmx.l.google.com.
22+
@ 300 IN MX 5 aspmx2.googlemail.com.
23+
@ 300 IN MX 5 aspmx3.googlemail.com.
24+
@ 300 IN MX 5 aspmx4.googlemail.com.
25+
@ 300 IN MX 5 aspmx5.googlemail.com.
26+
@ 10800 IN TXT "google-site-verification=7qHsbQ1rdlFiMWL080OeAv7uGddX_-8E-Qc-WiUU_L8"
27+
calendar 300 IN CNAME ghs.google.com.
28+
docs 300 IN CNAME ghs.google.com.
29+
in 300 IN TXT "v=spf1" "include:_spf.google.com" "~all"
30+
mail 300 IN CNAME ghs.google.com.
31+
sites 300 IN CNAME ghs.google.com.
32+
start 300 IN CNAME ghs.google.com.
3333

34-
localhost 300 IN A 127.0.0.1
35-
ns1 300 IN A 45.76.4.212
36-
ns2 300 IN A 45.76.4.212
37-
www 300 IN A 45.76.4.212
38-
resume 300 IN CNAME www
34+
localhost 300 IN A 127.0.0.1
35+
ns1 300 IN A 45.76.4.212
36+
ns2 300 IN A 45.76.4.212
37+
www 300 IN A 45.76.4.212
38+
resume 300 IN CNAME www
3939

4040
; lan
4141
optina.lan 300 IN A 10.40.33.20
42-
optina.lan 300 IN AAAA 2601:98a:4102:ef0:d63d:7eff:fe4d:c47f
42+
optina.lan 300 IN AAAA 2601:98a:4100:1700:76d4:35ff:fe9b:8462
4343
valaam.lan 300 IN A 10.40.33.21
44-
valaam.lan 300 IN AAAA 2601:98a:4102:ef0:1c99:304c:7769:9426
45-
relay.valaam.lan 300 IN AAAA 2601:98a:4102:ef0:8c6d:c3ff:fe13:5d63
46-
pool.valaam.lan 300 IN AAAA 2601:98a:4102:ef0:463:25ff:fe4c:d1e3
44+
valaam.lan 300 IN AAAA 2601:98a:4100:1700:2c0:8ff:fe9d:ba42
45+
relay.valaam.lan 300 IN AAAA 2601:98a:4100:1700:1046:d1ff:feea:9276
46+
pool.valaam.lan 300 IN AAAA 2601:98a:4100:1700:3858:abff:febd:83d1
4747
atari.lan 300 IN A 10.40.33.22
48-
atari.lan 300 IN AAAA 2601:98a:4102:ef0:9608:53ff:fe84:9b9d
48+
atari.lan 300 IN AAAA 2601:98a:4100:1700:9608:53ff:fe84:9b9d
4949
portal.lan 300 IN A 10.40.33.1
50-
portal.lan 300 IN AAAA 2601:98a:4102:ef0::1
50+
portal.lan 300 IN AAAA 2601:98a:4100:1700::1
5151
vw.lan 300 IN CNAME optina.lan
5252
omada.lan 300 IN CNAME optina.lan
5353
hass.lan 300 IN CNAME optina.lan
@@ -62,3 +62,5 @@ relay01.lan 300 IN A 147.28.149.209
6262
relay02.lan 300 IN A 147.28.183.225
6363

6464
sanchonet 300 IN CNAME input-output-hk.github.io.
65+
66+
doom 300 IN CNAME disasm.us.

0 commit comments

Comments
 (0)