garage and forgejo fixes
This commit is contained in:
parent
0e5513da86
commit
5536af3b94
3 changed files with 12 additions and 11 deletions
|
|
@ -20,7 +20,7 @@
|
||||||
../../common/efi.nix
|
../../common/efi.nix
|
||||||
|
|
||||||
# Hardware-specific (commented out)
|
# Hardware-specific (commented out)
|
||||||
# ../../common/nvidia.nix
|
../../common/nvidia.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
|
|
@ -29,8 +29,7 @@
|
||||||
system.stateVersion = "24.11";
|
system.stateVersion = "24.11";
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
|
||||||
# Intel microcode updates
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault
|
|
||||||
config.hardware.enableRedistributableFirmware;
|
config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
|
|
@ -150,6 +149,7 @@
|
||||||
"d /storage/immich/photos 0755 immich immich -"
|
"d /storage/immich/photos 0755 immich immich -"
|
||||||
"Z /storage/immich 0755 immich immich -"
|
"Z /storage/immich 0755 immich immich -"
|
||||||
"d /storage/tm_share 0755 regent users"
|
"d /storage/tm_share 0755 regent users"
|
||||||
|
"Z /garage/ 0755 garage garage -"
|
||||||
];
|
];
|
||||||
|
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
|
|
@ -269,7 +269,7 @@
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
# VIRTUAL MACHINES
|
# VIRTUAL MACHINES
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
systemd.services."microvm@".after = [ "microvm-virtiofsd@%i.service" ];
|
/*systemd.services."microvm@".after = [ "microvm-virtiofsd@%i.service" ];
|
||||||
|
|
||||||
microvm.vms = {
|
microvm.vms = {
|
||||||
gameservers = {
|
gameservers = {
|
||||||
|
|
@ -279,5 +279,5 @@
|
||||||
|
|
||||||
microvm.autostart = [
|
microvm.autostart = [
|
||||||
"gameservers"
|
"gameservers"
|
||||||
];
|
];*/
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,8 +37,9 @@ in
|
||||||
SSH_LISTEN_PORT = 2222;
|
SSH_LISTEN_PORT = 2222;
|
||||||
SSH_PORT = 2222;
|
SSH_PORT = 2222;
|
||||||
START_SSH_SERVER = true;
|
START_SSH_SERVER = true;
|
||||||
|
SSH_DOMAIN = "sgit.nekomimi.pet";
|
||||||
};
|
};
|
||||||
# service.DISABLE_REGISTRATION = true;
|
service.DISABLE_REGISTRATION = true;
|
||||||
actions = {
|
actions = {
|
||||||
ENABLED = true;
|
ENABLED = true;
|
||||||
DEFAULT_ACTIONS_URL = "github";
|
DEFAULT_ACTIONS_URL = "github";
|
||||||
|
|
|
||||||
|
|
@ -16,12 +16,12 @@ in
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
services.garage = {
|
services.garage = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.garage;
|
package = pkgs.garage_2;
|
||||||
settings = {
|
settings = {
|
||||||
metadata_dir = "/garage/metadata";
|
metadata_dir = "/garage/metadata";
|
||||||
data_dir = "/garage/data";
|
data_dir = "/garage/data";
|
||||||
db_engine = "lmdb";
|
db_engine = "lmdb";
|
||||||
replication_mode = "2";
|
replication_factor = 2;
|
||||||
rpc_bind_addr = "[::]:3901";
|
rpc_bind_addr = "[::]:3901";
|
||||||
rpc_public_addr = "${config.networking.hostName}:3901";
|
rpc_public_addr = "${config.networking.hostName}:3901";
|
||||||
rpc_secret_file = config.age.secrets."garage-rpc-secret".path;
|
rpc_secret_file = config.age.secrets."garage-rpc-secret".path;
|
||||||
|
|
@ -41,8 +41,8 @@ in
|
||||||
metrics_token_file = config.age.secrets."garage-metrics-token".path;
|
metrics_token_file = config.age.secrets."garage-metrics-token".path;
|
||||||
};
|
};
|
||||||
bootstrap_peers = [
|
bootstrap_peers = [
|
||||||
"d548d0c9ae9aec9e26fe0bd2ca3efe75f654fa350bad5cb02bc9aebc9850ba8f@[2a04:52c0:135:48d1::2]:3901" # buer
|
"d548d0c9ae9aec9e26fe0bd2ca3efe75f654fa350bad5cb02bc9aebc9850ba8f@[buer]:3901"
|
||||||
"5504cb25910dcef4a4312006691d651c099cde7c3a88df9ca79aa350571e6e65@[2601:5c2:8400:26c0:4ecc:6aff:fef7:98ca]:3901" #valefar
|
"5504cb25910dcef4a4312006691d651c099cde7c3a88df9ca79aa350571e6e65@[valefar]:3901"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue