diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix index 8c6c4fc..ac1b927 100644 --- a/modules/nextcloud.nix +++ b/modules/nextcloud.nix @@ -33,7 +33,7 @@ virtualHosts."${config.services.nextcloud.hostName}" = { forceSSL = true; enableACME = true; - http3 = true; + #http3 = true; }; }; diff --git a/modules/rclone.nix b/modules/rclone.nix index 992083f..b896e85 100644 --- a/modules/rclone.nix +++ b/modules/rclone.nix @@ -35,7 +35,7 @@ in --drive-pacer-min-sleep 10ms \ --drive-pacer-burst 1000 \ --vfs-cache-mode full \ - --vfs-cache-max-size 30G \ + --vfs-cache-max-size 20G \ --vfs-cache-max-age 5000h \ --vfs-cache-poll-interval 5m ''; diff --git a/systems/mc4/configuration.nix b/systems/mc4/configuration.nix index 9eff9bc..16ad102 100644 --- a/systems/mc4/configuration.nix +++ b/systems/mc4/configuration.nix @@ -11,23 +11,24 @@ ./modules/nextcloud.nix ./modules/postgresql.nix ./modules/rclone.nix + ./modules/ceph-common.nix ]; - services.ceph = { - enable = true; - global.fsid = "be1051e6-ee13-44d6-a9a1-96cc36300e13"; - #global.monHost = "10.0.69.234"; - global.monInitialMembers = "mc4"; - mds.enable = true; - mds.daemons = [ "mc4"]; - mon.enable = true; - mon.daemons = [ "mc4" ]; - #osd.enable = true; - #osd.daemons = [ "0" ]; + services.ceph = { + mds.enable = true; + mds.daemons = [ "mc4"]; + mgr.enable = true; + mgr.daemons = [ "mc4" ]; + mon.enable = true; + mon.daemons = [ "mc4" ]; + mon.extraConfig = { + "auth_allow_insecure_global_id_reclaim" = "false"; }; + osd.enable = true; + osd.daemons = [ "2" ]; + }; - services.ceph.client.enable = true; - environment.systemPackages = [ pkgs.ceph ]; + networking.firewall.allowedTCPPorts = [ 3300 ]; system.stateVersion = "21.05"; }