Compare commits
No commits in common. "17fce8756883b2c193f6f58d6d33496fd319a44a" and "cad834ade0951793f3227b070fd75282fb412bc7" have entirely different histories.
17fce87568
...
cad834ade0
6 changed files with 13 additions and 48 deletions
11
.sops.yaml
11
.sops.yaml
|
@ -1,7 +1,10 @@
|
||||||
keys:
|
keys:
|
||||||
- &server_kb-game-01 age165jt2q3uxp79k4jfsegnq7ul9j54l2rqsn87rq0qjkcv3y5krcmqsznyw7
|
- &kbwork_yerukall CEFAA4772EBDE0F5CFD1D1B3ED7E4FF32820BDE8
|
||||||
|
- &kbwork_yerukall2 age1lyv48cuxvnwp4ykugw57zjl728pn2tvss6486n9avgvw6uqj3ydqddkrmu
|
||||||
creation_rules:
|
creation_rules:
|
||||||
- path_regex: modules/nixos/services/minecraft/secrets.yaml$
|
- path_regex: systems/x86_64-linux/yerukall/secrets/secrets.yaml$
|
||||||
key_groups:
|
key_groups:
|
||||||
- age:
|
- pgp:
|
||||||
- *server_kb-game-01
|
- *kbwork_yerukall
|
||||||
|
age:
|
||||||
|
- *kbwork_yerukall2
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
lix-module.nixosModules.default
|
lix-module.nixosModules.default
|
||||||
];
|
];
|
||||||
|
|
||||||
# Modules for Host kb-game-01
|
# Modules for Host kb-games-01
|
||||||
systems.hosts.kb-game-01.modules = with inputs; [
|
systems.hosts.kb-game-01.modules = with inputs; [
|
||||||
lix-module.nixosModules.default
|
lix-module.nixosModules.default
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
|
|
|
@ -42,9 +42,6 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
eula = true;
|
eula = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Create Secrets
|
|
||||||
sops.secrets."minecraft/database/luckperms_password" = { sopsFile = ./secrets.yaml; };
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
minecraft:
|
|
||||||
database:
|
|
||||||
luckperms_password: ENC[AES256_GCM,data:Gnt/SilH7q4t1NzCeaqCc6nxso9cWt7b/KXCxzrDdR1LAnmex3QL5Q==,iv:PrTkXcMPPyfJkAKxSKUkaPbYcH+9n6W7MPcTR5e4L8g=,tag:sxDdUHyN+fCIi4g0K+oQIw==,type:str]
|
|
||||||
sops:
|
|
||||||
kms: []
|
|
||||||
gcp_kms: []
|
|
||||||
azure_kv: []
|
|
||||||
hc_vault: []
|
|
||||||
age:
|
|
||||||
- recipient: age165jt2q3uxp79k4jfsegnq7ul9j54l2rqsn87rq0qjkcv3y5krcmqsznyw7
|
|
||||||
enc: |
|
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBScTUyNFBNdHFwd1pudWNK
|
|
||||||
Y2F2aXFLYmh4RURJLy9mMisxMU96VGRiU2hjCjdSZmxLRFF6OVpFNy9iQ0NLdytl
|
|
||||||
UHdSaUVtMnlWQ3d1ZnluNXVHOWdoalkKLS0tIDBxVGdaZWhTclJWZ3FwZHRHSTN1
|
|
||||||
RDhlN1JjWW1XZERLWExRSTlDN3ZjZkEKMiQaUezdBcWOH82Sk451PdB54SzYwcXY
|
|
||||||
YkjGp+bB7rIz07no68Xl4qmO+/iHKSFlPvG4jR/j4ZaNYiU9aeldLA==
|
|
||||||
-----END AGE ENCRYPTED FILE-----
|
|
||||||
lastmodified: "2025-01-17T14:22:01Z"
|
|
||||||
mac: ENC[AES256_GCM,data:BlLD3wEezCCA9t1X4xmy9lfT3ztsR3dknio78Si9v3UJmpJSOpwJ/VhU5RRbMzL1EyOrU1abEr6em83s6LRq87fwso1j6asOavELT5WOfl6f5CU2iK8nQGWZCFeR+09d9hVI+AAH9farpgTDd5sHfUFPCKEaGwuTenpeF4Tonak=,iv:JYoHMIPkT+Dv3GZlp1wt7wlU7IYL6erd/u0cuclB0Ow=,tag:XD8pd/GCrdLRvdEFBgowJA==,type:str]
|
|
||||||
pgp: []
|
|
||||||
unencrypted_suffix: _unencrypted
|
|
||||||
version: 3.9.2
|
|
|
@ -44,14 +44,12 @@ in
|
||||||
online-mode = false;
|
online-mode = false;
|
||||||
player-info-forwarding-mode = "modern";
|
player-info-forwarding-mode = "modern";
|
||||||
enable-player-address-logging = false;
|
enable-player-address-logging = false;
|
||||||
# servers.lobby = "";
|
servers.lobby = "";
|
||||||
servers.survival = "127.0.0.1:${toString config.services.minecraft-servers.servers."survival".serverProperties.server-port}";
|
servers.survival = "localhost:${toString config.services.minecraft-servers.servers."survival".serverProperties.server-port}";
|
||||||
servers.lobby = "127.0.0.1:123";
|
|
||||||
servers.try = [
|
servers.try = [
|
||||||
#"lobby"
|
"lobby"
|
||||||
"survival"
|
"survival"
|
||||||
];
|
];
|
||||||
forced-hosts."lobby.example.com" = [ "lobby" ];
|
|
||||||
advanced.tcp-fast-open = true;
|
advanced.tcp-fast-open = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -64,7 +62,7 @@ in
|
||||||
data.address = "localhost:${toString config.services.mysql.settings.mysqld.port}";
|
data.address = "localhost:${toString config.services.mysql.settings.mysqld.port}";
|
||||||
data.database = "luckperms";
|
data.database = "luckperms";
|
||||||
data.username = "luckperms";
|
data.username = "luckperms";
|
||||||
data.password = builtins.readFile /run/secrets/minecraft/database/luckperms_password;
|
data.password = "";
|
||||||
};
|
};
|
||||||
services.mysql = {
|
services.mysql = {
|
||||||
ensureDatabases = [ "luckperms" ];
|
ensureDatabases = [ "luckperms" ];
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
vim
|
vim
|
||||||
sops
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -52,7 +51,6 @@
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBHdxVb42GEb/rwrsQx/Wc2v2P+WIq8/WNlF+l31Rl/a Remotebuilds from HyperC"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBHdxVb42GEb/rwrsQx/Wc2v2P+WIq8/WNlF+l31Rl/a Remotebuilds from HyperC"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL/WONflZXVoZd8I4HdNMXNtoYELnCaxqdFY0QKDXXS9 Remotebuilds from Rubtrm"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL/WONflZXVoZd8I4HdNMXNtoYELnCaxqdFY0QKDXXS9 Remotebuilds from Rubtrm"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJqjdhtK0xeJcHwwCAia6I+WuZCkN9pUS21MNjJ2jOuc Remotebuilds from LANA9Z"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -64,14 +62,6 @@
|
||||||
tree
|
tree
|
||||||
];
|
];
|
||||||
|
|
||||||
# Default Editor
|
|
||||||
programs.vim.enable = true;
|
|
||||||
programs.vim.defaultEditor = true;
|
|
||||||
|
|
||||||
# Sops Secrets Config
|
|
||||||
sops.defaultSopsFormat = "yaml";
|
|
||||||
sops.age.keyFile = "/home/master/.config/sops/age/keys.txt";
|
|
||||||
|
|
||||||
# SSH and Mosh
|
# SSH and Mosh
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -93,7 +83,7 @@
|
||||||
services.forgejo-runner.enable = true;
|
services.forgejo-runner.enable = true;
|
||||||
|
|
||||||
# Binary Cache
|
# Binary Cache
|
||||||
services.binary-cache.enable = false; # No Binary-Cache, when there are Secrets in the /nix/store
|
services.binary-cache.enable = true;
|
||||||
|
|
||||||
# Enable QUEMU Quest Agent
|
# Enable QUEMU Quest Agent
|
||||||
services.qemuGuest.enable = true;
|
services.qemuGuest.enable = true;
|
||||||
|
|
Loading…
Add table
Reference in a new issue