@@ -9,7 +9,7 @@ let
99 translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars);
1010 generateDaemonList = (daemonType: daemons: extraServiceConfig:
1111 mkMerge (
12− map (daemon:
12+ map (daemon:
1313 { "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; }
1414 ) daemons
1515 )
@@ -17,8 +17,8 @@ let
1717 generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: {
1818 enable = true;
1919 description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}";
20− after = [ "network-online.target" "local-fs.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
21− wants = [ "network-online.target" "local-fs.target" "time-sync.target" ];
20+ after = [ "network-online.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
21+ wants = [ "network-online.target" "time-sync.target" ];
2222 partOf = [ "ceph-${daemonType}.target" ];
2323 wantedBy = [ "ceph-${daemonType}.target" ];
2424
@@ -41,7 +41,7 @@ let
4141 daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"
4242 if [ ! -d ''$daemonPath ]; then
4343 mkdir -m 755 -p ''$daemonPath
44− chown -R ceph:ceph ''$daemonPath
44+ chown -R ceph:ceph ''$daemonPath
4545 fi
4646 '';
4747 } // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; }
@@ -55,7 +55,7 @@ let
5555 };
5656 }
5757 );
58−in
58+in
5959{
6060 options.services.ceph = {
6161 # Ceph has a monolithic configuration file but different sections for
@@ -86,7 +86,7 @@ in
8686 type = with types; nullOr commas;
8787 default = null;
8888 example = ''
89− node0, node1, node2
89+ node0, node1, node2
9090 '';
9191 description = ''
9292 List of hosts that will be used as monitors at startup.
@@ -313,9 +313,9 @@ in
313313 }
314314 ];
315315
316− warnings = optional (cfg.global.monInitialMembers == null)
316+ warnings = optional (cfg.global.monInitialMembers == null)
317317 ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function'';
318−
318+
319319 environment.etc."ceph/ceph.conf".text = let
320320 # Translate camelCaseOptions to the expected camel case option for ceph.conf
321321 translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global;
@@ -344,13 +344,13 @@ in
344344 };
345345
346346 systemd.services = let
347− services = []
348− ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; })
347+ services = []
348+ ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; })
349349 ++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; })
350350 ++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; })
351351 ++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { })
352352 ++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; });
353− in
353+ in
354354 mkMerge services;
355355
356356 systemd.targets = let