File tree Expand file tree Collapse file tree 5 files changed +147
-0
lines changed Expand file tree Collapse file tree 5 files changed +147
-0
lines changed Original file line number Diff line number Diff line change 21
21
nix-rpi5 . url = "gitlab:vriska/nix-rpi5?ref=main" ;
22
22
nur . url = "github:nix-community/NUR/e9e77b7985ef9bdeca12a38523c63d47555cc89b" ;
23
23
timewall . url = "github:bcyran/timewall/" ;
24
+ tangled . url = "github:RyanGibb/tangled/" ;
24
25
25
26
# deduplicate flake inputs
26
27
eilean . inputs . nixpkgs . follows = "nixpkgs" ;
38
39
nix-rpi5 . inputs . nixpkgs . follows = "nixpkgs" ;
39
40
nur . inputs . nixpkgs . follows = "nixpkgs" ;
40
41
timewall . inputs . nixpkgs . follows = "nixpkgs" ;
42
+ tangled . inputs . nixpkgs . follows = "nixpkgs" ;
41
43
} ;
42
44
43
45
outputs =
Original file line number Diff line number Diff line change 53
53
../../modules/ryan-website.nix
54
54
../../modules/alec-website.nix
55
55
../../modules/fn06-website.nix
56
+ inputs . tangled . nixosModules . knotserver
56
57
] ;
57
58
58
59
environment . systemPackages = with pkgs ; [
241
242
value = "vps" ;
242
243
}
243
244
245
+ {
246
+ name = "knot" ;
247
+ type = "CNAME" ;
248
+ value = "vps" ;
249
+ }
250
+
244
251
# generate with
245
252
# sudo openssl x509 -in /var/lib/acme/mail.freumh.org/fullchain.pem -pubkey -noout | openssl pkey -pubin -outform der | sha256sum | awk '{print "3 1 1", $1}'
246
253
{
406
413
security . acme-eon . nginxCerts = [
407
414
"capybara.fn06.org"
408
415
"shrew.freumh.org"
416
+ "knot.freumh.org"
409
417
] ;
410
418
services . nginx . virtualHosts . "capybara.fn06.org" = {
411
419
forceSSL = true ;
508
516
networking . firewall . allowedTCPPorts = [ 7001 ] ;
509
517
510
518
services . openssh . openFirewall = true ;
519
+
520
+ age . secrets . tangled = {
521
+ file = ../../secrets/tangled.age ;
522
+ mode = "660" ;
523
+ owner = "git" ;
524
+ group = "git" ;
525
+ } ;
526
+ services . tangled-knotserver = {
527
+ enable = true ;
528
+ repo . mainBranch = "master" ;
529
+ server . hostname = "knot.freumh.org" ;
530
+ server = {
531
+ secretFile = config . age . secrets . tangled . path ;
532
+ listenAddr = "127.0.0.1:5555" ;
533
+ internalListenAddr = "127.0.0.1:5444" ;
534
+ } ;
535
+ } ;
536
+ services . nginx . virtualHosts . "knot.freumh.org" = {
537
+ forceSSL = true ;
538
+ locations . "/" = {
539
+ proxyPass = ''
540
+ http://${ config . services . tangled-knotserver . server . listenAddr }
541
+ '' ;
542
+ proxyWebsockets = true ;
543
+ } ;
544
+ } ;
511
545
}
Original file line number Diff line number Diff line change 47
47
owl
48
48
] ;
49
49
"eon-sirref-primary.cap.age" . publicKeys = user ++ [ owl ] ;
50
+ "tangled.age" . publicKeys = user ++ [ owl ] ;
50
51
}
Original file line number Diff line number Diff line change
1
+ age-encryption.org/v1
2
+ -> ssh-ed25519 2wDnOw Ttbl5LTzHDAP3kG7kbRErJr+ayerVYZIWZeLPmZmD0U
3
+ Uvon5zchwp3jwP/wHJ5/jIrmDhSVOxGKEhLGPtnQj9w
4
+ -> ssh-ed25519 suwb0g N+Z7lyQailIdkJMiCuFapSN3LhYphejMvB0x4Au1zBI
5
+ dC6ju3bdhzyLB19/WFwgmr+HxTG9vd2fO/EB/WYjodM
6
+ --- s2WjTwvpTi8jhAn0/yqBcTmzh77wbpYulovyEdGE7KQ
7
+ G����}w����{� n�od&i,V���U��%�'!R46�{>� )>to�]Hh�����2F��A����Tv�!�;��)R�lM%U=|W"?*��e��"���i�KB�F
You can’t perform that action at this time.
0 commit comments