rekey secrets and update mini pc config

This commit is contained in:
Kopatz
2024-05-04 12:32:52 +02:00
parent 132fc1c05f
commit c2f40e2777
23 changed files with 74 additions and 58 deletions

View File

@@ -28,7 +28,6 @@
../hdd-spindown.nix ../hdd-spindown.nix
../logging.nix ../logging.nix
../motd.nix ../motd.nix
../static-ip.nix
]; ];
custom = { custom = {
@@ -44,7 +43,10 @@
settings.enable = true; settings.enable = true;
}; };
services = { services = {
kavita.enable = true; kavita = {
enable = true;
dir = "/mnt/1tbssd/kavita";
};
}; };
hardware = { hardware = {
firmware.enable = true; firmware.enable = true;

View File

@@ -11,11 +11,11 @@ in
description = "ipv4 address"; description = "ipv4 address";
}; };
dns = lib.mkOption { dns = lib.mkOption {
default = types.str; type = types.str;
description = "ip of the dns server"; description = "ip of the dns server";
}; };
interface = lib.mkOption { interface = lib.mkOption {
default = types.str; type = types.str;
description = "interface to apply the change to"; description = "interface to apply the change to";
}; };
}; };

View File

@@ -6,13 +6,23 @@ in
{ {
options.custom.services.kavita = { options.custom.services.kavita = {
enable = mkEnableOption "Enables kavita"; enable = mkEnableOption "Enables kavita";
https = mkOption {
type = types.bool;
default = true;
description = "Should it use https?";
};
dir = mkOption {
default = "/data/kavita";
type = types.path;
description = "data path";
};
}; };
config = config =
let let
fqdn = "kavita-kopatz.duckdns.org"; fqdn = "kavita-kopatz.duckdns.org";
useStepCa = false; #config.services.step-ca.enable; useStepCa = false; #config.services.step-ca.enable;
useHttps = true; useHttps = cfg.https;
baseDir = "/mnt/1tbssd/kavita"; baseDir = cfg.dir;
mangal = "${pkgs.mangal}/bin/mangal"; mangal = "${pkgs.mangal}/bin/mangal";
githubRunnerEnabled = config.services.github-runners ? oberprofis.enable; githubRunnerEnabled = config.services.github-runners ? oberprofis.enable;
in lib.mkIf cfg.enable { in lib.mkIf cfg.enable {

Binary file not shown.

View File

@@ -1,4 +1,5 @@
agenix -e secret1.age # create secrets
`agenix -e secret1.age`
example secrets.nix file example secrets.nix file
@@ -28,4 +29,7 @@ services.nextcloud = {
hostName = "localhost"; hostName = "localhost";
config.adminpassFile = config.age.secrets.nextcloud.path; config.adminpassFile = config.age.secrets.nextcloud.path;
}; };
``` ```
# rekeying
`agenix -r`

View File

@@ -1,11 +1,10 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 yfCCMw bknEVINSpmzqbs669XXGW10WlRU2eYqM21nCra4Grm0 -> ssh-ed25519 su0Eyw abgbb/Gl03Gkn8FXt8OWvsQZIIkmp+9OJYJBARfuMHE
UH/rieabfARVLfMojUzRpMV8OgQQegmkERr3OsudizI C6btapYsEstmrPfOSzApBxo88PCVG0ECbJJ9ATvHwSo
-> ssh-ed25519 IV3DkQ ae0X4te6ZevvoybUP20LgE4ymTiisoBMfrZQBm0LHEo -> ssh-ed25519 IV3DkQ r1h8O7eotpWQ7R2MC/EgWsndd+V+YNJs6SEQqxY4DHk
f9VxOHjo6W349d/T9DuH0KbQRHj+EXa+yascxnG/oEA FRuoj1KMLoHYGYk+78cgQbtH6QN0LQX69LzS72zTeLA
-> ssh-ed25519 DCzi1A vBpgN1TwpEv+mJNIMoHitLshG0q1RDTz3WrvRbRGnno -> ssh-ed25519 DCzi1A S5japvaVIvNF8gB8d6lDMniYvWDhPXKxdHIypoYQiho
Nc9I8WWXDDzCfOHkcbhqXjk0Fvp23f8QxiW6bdPix3Q us1sOKs3YwTQZEbgh3YgN6GgRDP7Na3KGdzTSqzENrA
-> 5-grease ;gX' KVd. S[Du |%f:LC8 --- Nq1cKNge2TngWd41zf1sTneHozmQzGrFQ6y6qtXzRDs
g5R1yuzS9892Jf0N+RsaVg77389vLxeowKKcD/PM962AMYCe4iHdCw 9<EFBFBD>1
--- u/d/x8qCopx23d4TiecnfbaL+l+JJu5i+yJqmU6XH/c <EFBFBD>ºU ¤6¤®eد0n×¹çvª¢[ðªfZ½ž(~½sY'™SG‰±fí€û¯cÐ$ùŠÆ#yÚÓDk
4n„~¡Xv€6ŒÉjÌ80ÄÚã} _=$H@ÒuÕ{Àqú·É/<2F>¬^+vÔ¹Á Oyˆ³E—p¢K3ª<33>L²âZ

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,26 +1,26 @@
let let
kop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeP6qtVqE/gu72ZUZE8cdRi3INiUW9NqDR7SjXIzTw2 lukas@Kopatz-PC2"; kop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeP6qtVqE/gu72ZUZE8cdRi3INiUW9NqDR7SjXIzTw2 lukas@Kopatz-PC2";
nix-test-vm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMVqEb1U1c9UX3AF8otNyYKpIUMjc7XSjZY3IkIPGOqi root@server";
server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUA7uVKXAF2UcwaIDSJP2Te8Fi++2zkKzSPoRx1vQrI root@server"; server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUA7uVKXAF2UcwaIDSJP2Te8Fi++2zkKzSPoRx1vQrI root@server";
mini-pc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKla9+Gj2i9Ax7cIdnTM6zsmze3g1N/qCPqhga0P+toU root@mini-pc";
users = [ kop ]; users = [ kop ];
systems = [ nix-test-vm server ]; systems = [ mini-pc server ];
in in
{ {
"github-runner-token.age".publicKeys = [ nix-test-vm server kop ]; "github-runner-token.age".publicKeys = [ mini-pc server kop ];
"github-runner-pw.age".publicKeys = [ nix-test-vm server kop ]; "github-runner-pw.age".publicKeys = [ mini-pc server kop ];
"duckdns.age".publicKeys = [ nix-test-vm server kop ]; "duckdns.age".publicKeys = [ mini-pc server kop ];
"nextcloud-admin.age".publicKeys = [ nix-test-vm server kop ]; "nextcloud-admin.age".publicKeys = [ mini-pc server kop ];
"nextcloud-cert.age".publicKeys = [ nix-test-vm server kop ]; "nextcloud-cert.age".publicKeys = [ mini-pc server kop ];
"nextcloud-key.age".publicKeys = [ nix-test-vm server kop ]; "nextcloud-key.age".publicKeys = [ mini-pc server kop ];
"restic-pw.age".publicKeys = [ nix-test-vm server kop ]; "restic-pw.age".publicKeys = [ mini-pc server kop ];
"restic-s3.age".publicKeys = [ nix-test-vm server kop ]; "restic-s3.age".publicKeys = [ mini-pc server kop ];
"restic-gdrive.age".publicKeys = [ nix-test-vm server kop ]; "restic-gdrive.age".publicKeys = [ mini-pc server kop ];
"wireguard-private.age".publicKeys = [ nix-test-vm server kop ]; "wireguard-private.age".publicKeys = [ mini-pc server kop ];
"coturn-secret.age".publicKeys = [ nix-test-vm server kop ]; "coturn-secret.age".publicKeys = [ mini-pc server kop ];
"matrix-registration.age".publicKeys = [ nix-test-vm server kop ]; "matrix-registration.age".publicKeys = [ mini-pc server kop ];
"paperless.age".publicKeys = [ nix-test-vm server kop ]; "paperless.age".publicKeys = [ mini-pc server kop ];
"kavita.age".publicKeys = [ nix-test-vm server kop ]; "kavita.age".publicKeys = [ mini-pc server kop ];
"step-ca-pw.age".publicKeys = [ nix-test-vm server kop ]; "step-ca-pw.age".publicKeys = [ mini-pc server kop ];
"step-ca-key.age".publicKeys = [ nix-test-vm server kop ]; "step-ca-key.age".publicKeys = [ mini-pc server kop ];
"grafana-contact-points.age".publicKeys = [ server kop]; "grafana-contact-points.age".publicKeys = [ mini-pc server kop ];
} }

Binary file not shown.

View File

@@ -1,12 +1,9 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 yfCCMw OgXEZi4GHlh0htigcyT0c86ZlZvmv5ve6g0Dnk9mhS8 -> ssh-ed25519 su0Eyw 6vviSJcXLLG9cOZb1owE2oudEYGqRfq9lk8Ulq9Gmj0
57hPI3DO/2Lic5JZ/4Cgq1y0tYoZKc+E6LwS62Zi0kg OHuZl76lF83C8kMhoRMV6cMLR0LXVim/vG5hm+MqnCM
-> ssh-ed25519 IV3DkQ YG3gxtuOx5sfD7rwAClr+MrFzEgw2sgfpxzZDyT9nj4 -> ssh-ed25519 IV3DkQ DKxFE4xir6ykfEohvZOE/zh5dqb05mRRksapheXSfUM
VIP3Hkk9ZBG9BHNPHt4C6LazylU6htJ6gmdamqAYLUw HkdZI6L96PLSXvnnfcMhaxB67JBjFr6pdfShB0FeBpY
-> ssh-ed25519 DCzi1A DcsbrGWEyzUB7QKGvlMU9CMB/bq7JVz/aSz7uJprQRg -> ssh-ed25519 DCzi1A kHrUepWwMDt6pgmETeclWpscQdWS/X0744mKn1C7kjU
NpBDT786hL0GZNaY1IsDnU9iFxlYZs8ti1FAfBeHBIQ vrWA1Dapi5APp2EDXccCEEGV0j8YrRrC2e2Wfp75Vko
-> z-grease |WDf ~K7q9K *xzH^n6{ --- StnQRDu2BAUK36iyf9lOUtWOwwwcNA7De2G3tSd1L2M
6G9KAajGo/o6dcYb/MAOE7AIIZKTTMrN9fh9ACkINLB38ZrREUCsrJDE90sx62nX c2“ímÚŸ Ÿ¢Á}bö†EüßÖßFä"÷YVâìD_àSØE fhGû¡îJ63Íw:ëO§<4F>ùhu²2Í
MOJKZ3k4
--- ExlgUArhnqSMlZwWWoFdM/Ugc3fLKbQ9ZCguzqUIlkM
ò<EFBFBD>F!º<>à0QÀ†¶ÎQm¾[ öeç«Ü6M“ýÕûéxB

View File

@@ -1,11 +1,9 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 yfCCMw HoX1AI2rIYDJbfKRDRXr1ZRsNM1OVRVrr0XRnBD29FQ -> ssh-ed25519 su0Eyw 9mpUnyWpauqdSlrjHZb2uyTG5U7wyWesQz0WfNms1nc
aM3HP0kxq9ACb2TFcb7f9rxKXFoT2Y9nEjL+XD3nHIM 652z/tIinaCwhBQitxSLWMl1n9FCEaRKC6F/h9c4rzk
-> ssh-ed25519 IV3DkQ EKn/xr5EWEev3stYXDGrzfLtwt2thJ+34e5eP1v4l0g -> ssh-ed25519 IV3DkQ esDKdA6+78STpPx2kCRbRCjJ7w5+YCRwR9G5IHusRl8
raaOM6zpmokVCBKNWx9xHpsQJSpTbHHQeRbz2+wC3+0 cFc2EJE+gfY7YJzindI+3Q7Eum/D02GetqjHjaZUQzk
-> ssh-ed25519 DCzi1A mVLJ1c2e1UOsTuDCKIwLliBz3OVBH8vGp/gICb8cyQY -> ssh-ed25519 DCzi1A meR8aXi4kq1xxSdGvieMZ0tcrgT4Ifo2fRoR6v7wP1U
dXok0Tr56SdW5sf74IYk7rDnim/s7vZI/PZIGKvNuaM rULzoIdJyh/MwDXGfI9Nh3nPfqdUBoQHV7s15cYpKsw
-> ;mHckk.i-grease [&? MW78 %Ee4m --- 6cTo396+lzrd+YrQnEU3GvW6gPLo4rVaukpx48QdGGY
LebJ6ZshTkkY+fM5zI/sbQzGpcKN5oGiEu5tWSPnmeQQxJrjT7Utqf3KAfI ˆšœØäÈhдfF¼¥š8F ö˜¼0ò^| ™Éu«_aãIvy!ýeVCdj2º™v?+*úß8€‡g0¸½F©CZróއ7K¤
--- 6HedZR4VvouzHmjeV9DY6BsybKcainxK9fro9MSjpxg
hÔqÂÇ<3<>:7{,Á9'Ä<1A>š„öw¾(FVGuLAA0“̽üÿa| ½õKwµ?–¥!\Z-\¼³$ü<>ä6yÖÖ§¿xý

View File

@@ -29,6 +29,12 @@
firmware.enable = true; firmware.enable = true;
ssd.enable = true; ssd.enable = true;
}; };
services = {
kavita = {
enable = true;
dir = "/data/kavita";
};
};
nftables.enable = true; nftables.enable = true;
cli-tools.enable = true; cli-tools.enable = true;
nix = { nix = {