diff --git a/configs/cloud.nix b/configs/cloud.nix index 6d0fe8f..b3411dc 100644 --- a/configs/cloud.nix +++ b/configs/cloud.nix @@ -17,6 +17,16 @@ services.nextcloud-client.enable = true; }; + fileSystems."/media/moodle" = { + device = "zaatar.r:/moodle"; + fsType = "nfs"; + options = [ + "x-systemd.idle-timeout=600" + "noauto" + "x-systemd.automount" + ]; + }; + services.syncthing = rec { enable = true; user = "kfm"; @@ -37,10 +47,6 @@ devices = [ "wilde" "manakish" "heym" "zaatar" ]; id = "music"; }; - "${cloud-dir}/moodle" = { - devices = [ "wilde" "zaatar" "manakish" ]; - id = "moodle-dl"; - }; }; }; }; diff --git a/configs/moodle-dl/meinhark.nix b/configs/moodle-dl/meinhark.nix index 9b20a8a..f51a051 100644 --- a/configs/moodle-dl/meinhark.nix +++ b/configs/moodle-dl/meinhark.nix @@ -56,22 +56,18 @@ in }; }; - services.syncthing = let moodle-dl-directory = config.services.moodle-dl.directory; in { + fileSystems."/export/moodle" = { + device = config.services.moodle-dl.directory; + options = [ "bind" ]; + }; + + networking.firewall.allowedTCPPorts = [ 2049 ]; + + services.nfs.server = { enable = true; - user = "moodle-dl"; # config.users.extraUsers.moodle.name; - openDefaultPorts = true; - configDir = "${moodle-dl-directory}/.config/syncthing"; - dataDir = "${moodle-dl-directory}/.config/syncthing"; - declarative = rec { - cert = toString ; - key = toString ; - devices = { - inherit ((import ).syncthing.devices) wilde manakish zaatar; - }; - folders.${moodle-dl-directory} = { - devices = [ "zaatar" "wilde" "manakish" ]; - id = "moodle-dl"; - }; - }; + exports = '' + /export 10.243.2.4(fsid=0) 10.243.2.85(fsid=0) + /export/moodle 10.243.2.4(insecure,rw) 10.243.2.85(insecure,rw) + ''; }; }