diff --git a/data.nix b/data.nix index 03b4d97..1b8a625 100644 --- a/data.nix +++ b/data.nix @@ -242,7 +242,7 @@ rec { _acme-endpoint.bitwarden NS ns._acme-endpoint.bitwarden ns._acme-endpoint.bitwarden A ${vno1} - hdd A ${hosts."vno3-rp3b.servers.jakst".jakstIP} + hdd 3600 A ${hosts."fwminex.servers.jakst".jakstIP} _acme-challenge.hdd CNAME _acme-endpoint.hdd _acme-endpoint.hdd NS ns._acme-endpoint.hdd ns._acme-endpoint.hdd A ${vno1} diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix index 64f6088..5c07db4 100644 --- a/hosts/fwminex/configuration.nix +++ b/hosts/fwminex/configuration.nix @@ -649,6 +649,15 @@ in ]; } ]; + + jakstpub = { + enable = true; + dataDir = "/home/motiejus/annex2/vno3-shared"; + requires = [ "data-shared.mount" ]; + uidgid = myData.uidgid.jakstpub; + hostname = "hdd.jakstys.lt"; + }; + }; }; diff --git a/modules/services/jakstpub/default.nix b/modules/services/jakstpub/default.nix index 1f1d385..d7b419f 100644 --- a/modules/services/jakstpub/default.nix +++ b/modules/services/jakstpub/default.nix @@ -21,7 +21,7 @@ in services = { caddy = { enable = true; - virtualHosts.":80".extraConfig = with myData.subnets; '' + virtualHosts."hdd.jakstys.lt:80".extraConfig = with myData.subnets; '' root * ${cfg.dataDir} @denied not remote_ip ${vno1.cidr} ${vno3.cidr} ${tailscale.cidr} file_server browse { @@ -64,11 +64,11 @@ in "create mask" = "0664"; "directory mask" = "0775"; }; - snapshots = defaults // { - "path" = cfg.dataDir + "/.zfs/snapshot"; - "writeable" = "no"; - "read only" = "yes"; - }; + #snapshots = defaults // { + # "path" = cfg.dataDir + "/.zfs/snapshot"; + # "writeable" = "no"; + # "read only" = "yes"; + #}; }; }; @@ -102,7 +102,7 @@ in vno3.cidr ]; tcp = [ - 80 # caddy above + #80 # caddy above 139 # smbd 445 # smbd 5357 # wsdd