yevaud: specify (non-boot-critical) zfs datasets with randomcat's module
Also moves forgejo state directory to the default location
This commit is contained in:
parent
8d2d55e4c4
commit
d1b974b86c
|
@ -52,10 +52,14 @@
|
||||||
networking.firewall.allowedTCPPorts = [ 53 ];
|
networking.firewall.allowedTCPPorts = [ 53 ];
|
||||||
networking.firewall.allowedUDPPorts = [ 53 ];
|
networking.firewall.allowedUDPPorts = [ 53 ];
|
||||||
|
|
||||||
|
randomcat.services.zfs.datasets = {
|
||||||
|
"rpool/state" = { mountpoint = "none"; };
|
||||||
|
"rpool/state/forgejo" = { mountpoint = "/var/lib/forgejo"; };
|
||||||
|
};
|
||||||
|
|
||||||
qenya.services.forgejo = {
|
qenya.services.forgejo = {
|
||||||
enable = true;
|
enable = true;
|
||||||
domain = "git.qenya.tel";
|
domain = "git.qenya.tel";
|
||||||
stateDir = "/data/forgejo";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
|
|
|
@ -28,11 +28,6 @@
|
||||||
fsType = "zfs";
|
fsType = "zfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/data/forgejo" =
|
|
||||||
{ device = "rpool/forgejo";
|
|
||||||
fsType = "zfs";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/107D-5AB3";
|
{ device = "/dev/disk/by-uuid/107D-5AB3";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
|
|
|
@ -10,9 +10,6 @@ in
|
||||||
domain = mkOption {
|
domain = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
};
|
};
|
||||||
stateDir = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
@ -33,7 +30,6 @@ in
|
||||||
|
|
||||||
forgejo = {
|
forgejo = {
|
||||||
enable = true;
|
enable = true;
|
||||||
stateDir = cfg.stateDir;
|
|
||||||
settings = {
|
settings = {
|
||||||
DEFAULT.APP_NAME = cfg.domain;
|
DEFAULT.APP_NAME = cfg.domain;
|
||||||
cache = {
|
cache = {
|
||||||
|
|
Loading…
Reference in a new issue