confctl 1.0.0 → 2.1.0

data/man/man8/confctl.8.md

@@ -38,6 +38,11 @@ similarly to shell patterns, see
 <http://ruby-doc.org/core/File.html#method-c-fnmatch-3F> for more
 information.
 
+## GENERATION OFFSETS
+Generations can be selected by *offset*. `0` is the current (last) generation.
+`1` is the first (oldest) generation, `2` the second generation, etc. `-1` is
+the generation before last and so on.
+
 ## GLOBAL OPTIONS
 `-c`, `--color` `always`|`never`|`auto`
   Set output color mode. Defaults to `auto`, which enables colors when
@@ -113,6 +118,9 @@ information.
     `-j`, `--max-jobs` *number*
       Maximum number of build jobs, passed to `nix-build`. See man nix-build(1).
 
+    `--cores` *number*
+      Number of CPU cores to use, passed to `nix-build`. See man nix-build(1).
+
 `confctl deploy` [*options*] [*machine-pattern* [`boot`|`switch`|`test`|`dry-activate`]]
   Deploy either a new or an existing build generation to matching machines.
 
@@ -134,7 +142,7 @@ information.
     `-y`, `--yes`
       Do not ask for confirmation on standard input, assume the answer is yes.
 
-    `-g`, `--generation` *generation*|`current`
+    `-g`, `--generation` *generation*|*offset*|`current`
       Do not build a new generation, but deploy an existing generation.
 
     `--outdated`
@@ -165,6 +173,12 @@ information.
     `--copy-only`
       Do not activate the copied closures.
 
+    `--enable-auto-rollback`
+      Enable auto-rollback on deploy even if it is not enabled in machine configuration.
+
+    `--disable-auto-rollback`
+      Disable auto-rollback on deploy if it is enabled in machine configuration.
+
     `--reboot`
       Applicable only when *switch-action* is `boot`. Reboot the machine after the
       configuration is activated.
@@ -176,6 +190,9 @@ information.
     `-j`, `--max-jobs` *number*
       Maximum number of build jobs, passed to `nix-build`. See man nix-build(1).
 
+    `--cores` *number*
+      Number of CPU cores to use, passed to `nix-build`. See man nix-build(1).
+
     `--no-health-checks`
       Do not run configured health checks. Health checks are run by default
       when *switch-action* is `switch`, `test` or `boot` with `--reboot`.
@@ -216,7 +233,7 @@ information.
     `-y`, `--yes`
       Do not ask for confirmation on standard input, assume the answer is yes.
 
-    `-g`, `--generation` *generation*|`current`|`none`
+    `-g`, `--generation` *generation*|*offset*|`current`|`none`
       Check status against a selected generation instead of a new build. If set
       to `none`, only the currently configured software pins are checked and not
       the system version itself.
@@ -224,6 +241,9 @@ information.
     `-j`, `--max-jobs` *number*
       Maximum number of build jobs, passed to `nix-build`. See man nix-build(1).
 
+    `--cores` *number*
+      Number of CPU cores to use, passed to `nix-build`. See man nix-build(1).
+
 `confctl changelog` [*options*] [*machine-pattern* [*sw-pattern*]]
   Show differences in deployed and configured software pins. For git software
   pins, it's a git log.
@@ -249,7 +269,7 @@ information.
     `-y`, `--yes`
       Do not ask for confirmation on standard input, assume the answer is yes.
 
-    `-g`, `--generation` *generation*|`current`
+    `-g`, `--generation` *generation*|*offset*|`current`
       Show changelog against software pins from a selected generation instead
       of the current configuration.
 
@@ -267,6 +287,9 @@ information.
     `-j`, `--max-jobs` *number*
       Maximum number of build jobs, passed to `nix-build`. See man nix-build(1).
 
+    `--cores` *number*
+      Number of CPU cores to use, passed to `nix-build`. See man nix-build(1).
+
 `confctl diff` [*options*] [*machine-pattern* [*sw-pattern*]]
   Show differences in deployed and configured software pins. For git software
   pins, it's a git diff.
@@ -292,7 +315,7 @@ information.
     `-y`, `--yes`
       Do not ask for confirmation on standard input, assume the answer is yes.
 
-    `-g`, `--generation` *generation*|`current`
+    `-g`, `--generation` *generation*|*offset*|`current`
       Show diff against software pins from a selected generation instead
       of the current configuration.
 
@@ -304,6 +327,9 @@ information.
     `-j`, `--max-jobs` *number*
       Maximum number of build jobs, passed to `nix-build`. See man nix-build(1).
 
+    `--cores` *number*
+      Number of CPU cores to use, passed to `nix-build`. See man nix-build(1).
+
 `confctl test-connection` [*options*] [*machine-pattern*]
   Try to open a SSH connection to the selected machines. This command can be
   used to confirm SSH host keys of the selected machines.
@@ -381,7 +407,7 @@ information.
     `-y`, `--yes`
       Do not ask for confirmation on standard input, assume the answer is yes.
 
-`confctl generation ls` [*machine-pattern* [*generation-pattern*]|*n*`d`|`old`]
+`confctl generation ls` [*machine-pattern* [*generation-pattern*]|*n*`d`|*offset*|`old`]
   List all or selected generations. By default only local build generations
   are listed.
 
@@ -400,11 +426,13 @@ information.
     `-r`, `--remote`
       List remote generations found on deployed machines.
 
-`confctl generation rm` [*machine-pattern* [*generation-pattern*|*n*`d`|`old`]]
+`confctl generation rm` [*machine-pattern* [*generation-pattern*|*n*`d`|*offset*|`old`]]
   Remove selected generations.
 
   *n*`d` will remove generations older than *n* days.
 
+  *offset* will remove generations at a specific offset, see `GENERATION OFFSETS`.
+
   `old` will remove all generations except the current one, i.e. the one that
   was built by `confctl build` the last.
 
@@ -461,6 +489,9 @@ information.
     `-r`, `--remote`
       Consider generations found on deployed machines.
 
+    `--no-gc`, `--no-collect-garbage`
+      Do not run the garbage collector even if it is enabled in configuration.
+
     `--max-concurrent-gc` *n*
       Run `nix-collect-garbage` at most on *n* machines at the same time.
       Defaults to `5`.
@@ -516,16 +547,16 @@ information.
   Update selected or all software packages that have been configured to support
   this command. The usual case for git is to pin to the current branch head.
 
-  `--[no-]commit`
-    Commit changed swpins files to git. Disabled by default.
+    `--[no-]commit`
+      Commit changed swpins files to git. Disabled by default.
 
-  `--[no-]changelog`
-    Include changelog in the commit message when `--commit` is used. Enabled by
-    default.
+    `--[no-]changelog`
+      Include changelog in the commit message when `--commit` is used. Enabled by
+      default.
 
-  `-d`, `--downgrade`
-    Use when the new version is older than the previously set version. Used for
-    generating changelog for the commit message.
+    `-d`, `--downgrade`
+      Use when the new version is older than the previously set version. Used for
+      generating changelog for the commit message.
 
 `confctl swpins channel ls` [*channel-pattern* [*sw-pattern*]]
   List existing channels with pinned software packages.
@@ -535,32 +566,32 @@ information.
   of *version* depends on the type of the software pin, for git it is a git
   reference, e.g. a revision.
 
-  `--[no-]commit`
-    Commit changed swpins files to git. Disabled by default.
+    `--[no-]commit`
+      Commit changed swpins files to git. Disabled by default.
 
-  `--[no-]changelog`
-    Include changelog in the commit message when `--commit` is used. Enabled by
-    default.
+    `--[no-]changelog`
+      Include changelog in the commit message when `--commit` is used. Enabled by
+      default.
 
-  `-d`, `--downgrade`
-    Use when the new version is older than the previously set version. Used for
-    generating changelog for the commit message.
+    `-d`, `--downgrade`
+      Use when the new version is older than the previously set version. Used for
+      generating changelog for the commit message.
 
 `confctl swpins channel update` [*channel-pattern* [*sw-pattern*]]
   Update selected or all software packages in channels that have been configured
   to support this command. The usual case for git is to pin to the current
   branch head.
 
-  `--[no-]commit`
-    Commit changed swpins files to git. Disabled by default.
+    `--[no-]commit`
+      Commit changed swpins files to git. Disabled by default.
 
-  `--[no-]changelog`
-    Include changelog in the commit message when `--commit` is used. Enabled by
-    default.
+    `--[no-]changelog`
+      Include changelog in the commit message when `--commit` is used. Enabled by
+      default.
 
-  `-d`, `--downgrade`
-    Use when the new version is older than the previously set version. Used for
-    generating changelog for the commit message.
+    `-d`, `--downgrade`
+      Use when the new version is older than the previously set version. Used for
+      generating changelog for the commit message.
 
 `confctl swpins core ls` [*sw-pattern*]
   List core software packages used internally by confctl.
@@ -570,47 +601,47 @@ information.
   of *version* depends on the type of the software pin, for git it is a git
   reference, e.g. a revision.
 
-  `--[no-]commit`
-    Commit changed swpins files to git. Disabled by default.
+    `--[no-]commit`
+      Commit changed swpins files to git. Disabled by default.
 
-  `--[no-]changelog`
-    Include changelog in the commit message when `--commit` is used. Enabled by
-    default.
+    `--[no-]changelog`
+      Include changelog in the commit message when `--commit` is used. Enabled by
+      default.
 
-  `-d`, `--downgrade`
-    Use when the new version is older than the previously set version. Used for
-    generating changelog for the commit message.
+    `-d`, `--downgrade`
+      Use when the new version is older than the previously set version. Used for
+      generating changelog for the commit message.
 
 `confctl swpins core update` [*sw-pattern*]
   Update selected or all core software packages that have been configured
   to support this command. The usual case for git is to pin to the current
   branch head.
 
-  `--[no-]commit`
-    Commit changed swpins files to git. Disabled by default.
+    `--[no-]commit`
+      Commit changed swpins files to git. Disabled by default.
 
-  `--[no-]changelog`
-    Include changelog in the commit message when `--commit` is used. Enabled by
-    default.
+    `--[no-]changelog`
+      Include changelog in the commit message when `--commit` is used. Enabled by
+      default.
 
-  `-d`, `--downgrade`
-    Use when the new version is older than the previously set version. Used for
-    generating changelog for the commit message.
+    `-d`, `--downgrade`
+      Use when the new version is older than the previously set version. Used for
+      generating changelog for the commit message.
 
 `confctl swpins update`
   Update software pins that have been configured for updates, including pins
   in all channels, all machine-specific pins and the core pins.
 
-  `--[no-]commit`
-    Commit changed swpins files to git. Disabled by default.
+    `--[no-]commit`
+      Commit changed swpins files to git. Disabled by default.
 
-  `--[no-]changelog`
-    Include changelog in the commit message when `--commit` is used. Enabled by
-    default.
+    `--[no-]changelog`
+      Include changelog in the commit message when `--commit` is used. Enabled by
+      default.
 
-  `-d`, `--downgrade`
-    Use when the new version is older than the previously set version. Used for
-    generating changelog for the commit message.
+    `-d`, `--downgrade`
+      Use when the new version is older than the previously set version. Used for
+      generating changelog for the commit message.
 
 `confctl swpins reconfigure`
   Regenerate all confctl-managed software pin files according to the Nix
@@ -650,5 +681,5 @@ Report bugs to https://github.com/vpsfreecz/confctl/issues.
 
 ## ABOUT
 `confctl` was originally developed for the purposes of
-[vpsFree.cz](https://vpsfree.org) and its cluster 
+[vpsFree.cz](https://vpsfree.org) and its cluster
 [configuration](https://github.com/vpsfreecz/vpsfree-cz-configuration).

data/nix/evaluator.nix

@@ -18,8 +18,8 @@ let
   nameValuePairs = builtins.map (m: {
     name = m.name;
     value = {
-      inherit (m) name;
-    } // m.config;
+      inherit (m) name alias clusterName carrier metaConfig;
+    };
   }) machines;
 
   machinesAttrs = builtins.listToAttrs nameValuePairs;
@@ -53,7 +53,7 @@ let
     import ./lib/swpins/eval.nix {
       inherit (arg) confDir;
       name = m.name;
-      channels = m.config.swpins.channels;
+      channels = m.metaConfig.swpins.channels;
       pkgs = corePkgs.pkgs;
       lib = corePkgs.lib;
     };
@@ -70,17 +70,36 @@ let
     value = buildToplevel fullMachinesAttrs.${host};
   }) arg.machines);
 
-  buildToplevel = m: (evalMachine m).config.system.build.toplevel;
+  buildToplevel = machine:
+    let
+      machineConfig = (evalMachine machine).config;
+
+      buildAttr = coreLib.attrByPath machine.build.attribute null machineConfig;
+
+      result =
+        if isNull buildAttr then
+          abort "Attribute 'config.${coreLib.concatStringsSep "." machine.build.attribute}' not found on machine ${machine.name}"
+        else
+          buildAttr;
+    in {
+      attribute = result;
+
+      autoRollback = corePkgs.substituteAll {
+        src = ../libexec/auto-rollback.rb;
+        isExecutable = true;
+        ruby = nixpkgs.ruby;
+      };
+    };
 
-  evalMachine = m:
+  evalMachine = machine:
     let
       importPath = {
         nixos = <nixpkgs/nixos/lib/eval-config.nix>;
         vpsadminos = <vpsadminos/os/default.nix>;
       };
 
-      evalConfig = import importPath.${m.config.spin} {
-        modules = [ m.build.toplevel ];
+      evalConfig = import importPath.${machine.metaConfig.spin} {
+        modules = machine.extraModules ++ [ machine.build.toplevel ];
       };
     in evalConfig;
 

data/nix/lib/default.nix

@@ -1,29 +1,74 @@
 { confDir, coreLib, corePkgs }:
 with coreLib;
 let
-  machine = import ./machine { inherit confDir corePkgs coreLib findConfig; };
+  machine = import ./machine { inherit confDir corePkgs coreLib findMetaConfig; };
 
-  findConfig =
+  findMetaConfig =
     { cluster, name }:
     cluster.${name};
 
   makeMachine =
-    { name, config }:
-    {
-      inherit name config;
-      build.toplevel = buildConfig { inherit name config; };
+    { name, metaConfig, carrier ? null, alias ? null, clusterName ? null, extraModules ? [], buildAttribute ? null }:
+    let
+      ensuredClusterName = if isNull clusterName then name else clusterName;
+    in {
+      inherit name alias metaConfig carrier extraModules;
+      clusterName = ensuredClusterName;
+
+      build = {
+        attribute = if isNull buildAttribute then metaConfig.buildAttribute else buildAttribute;
+        toplevel = buildConfig { name = ensuredClusterName; inherit metaConfig; };
+      };
     };
 
   buildConfig =
-    { name, config }:
-    if !config.managed then
+    { name, metaConfig }:
+    if !metaConfig.managed then
       null
-    else if config.spin == "nixos" then
-      machine.nixos { inherit name config; }
-    else if config.spin == "vpsadminos" then
-      machine.vpsadminos { inherit name config; }
+    else if metaConfig.spin == "nixos" then
+      machine.nixos { inherit name metaConfig; }
+    else if metaConfig.spin == "vpsadminos" then
+      machine.vpsadminos { inherit name metaConfig; }
     else
       null;
+
+  expandCarriers = machineAttrs: flatten (mapAttrsToList (name: m:
+    if m.metaConfig.carrier.enable then
+      [ m ] ++ (expandCarrier machineAttrs m)
+    else
+      m
+  ) machineAttrs);
+
+  expandCarrier = machineAttrs: carrierMachine: map (cm:
+    makeMachine {
+      name = "${carrierMachine.name}#${if isNull cm.alias then cm.machine else cm.alias}";
+      alias = cm.alias;
+      clusterName = cm.machine;
+      carrier = carrierMachine.name;
+      extraModules = cm.extraModules;
+      buildAttribute = cm.buildAttribute;
+      metaConfig = coreLib.updateManyAttrsByPath ([
+        {
+          path = [ "labels" ];
+          update = old: old // cm.labels;
+        }
+        {
+          path = [ "tags" ];
+          update = old: old ++ cm.tags;
+        }
+      ] ++ (generationUpdates cm)) machineAttrs.${cm.machine}.metaConfig;
+    }
+  ) carrierMachine.metaConfig.carrier.machines;
+
+  generationUpdates = cm:
+    flatten (map (generations:
+      map (attr: {
+        path = [ generations attr ];
+        update = old:
+          let v = cm.${generations}.${attr};
+          in if isNull v then old else v;
+      }) [ "min" "max" "maxAge" ]
+    ) [ "buildGenerations" "hostGenerations" ]);
 in rec {
   inherit corePkgs coreLib;
 
@@ -35,20 +80,22 @@ in rec {
     mkNetUdevRule name mac
   ) rs);
 
-  inherit findConfig;
+  inherit findMetaConfig;
 
   # Return all configured machines in a list
   getClusterMachines = cluster:
-    mapAttrsToList (name: config:
-      makeMachine { inherit name config; }
-    ) cluster;
+    let
+      machineAttrs = mapAttrs (name: metaConfig:
+        makeMachine { inherit name metaConfig; }
+      ) cluster;
+    in expandCarriers machineAttrs;
 
   # Get IP version addresses from all machines in a cluster
   getAllAddressesOf = cluster: v:
     let
       machines = getClusterMachines cluster;
       addresses = flatten (map (machine:
-        map (addr: machine // addr) machine.config.addresses.${"v${toString v}"}
+        map (addr: machine // addr) machine.metaConfig.addresses.${"v${toString v}"}
       ) machines);
     in addresses;
 

data/nix/lib/machine/default.nix

@@ -1,19 +1,19 @@
-{ confDir, corePkgs, coreLib, findConfig }:
+{ confDir, corePkgs, coreLib, findMetaConfig }:
 let
   swpinsFor =
-    { name, config }:
+    { name, metaConfig }:
     import ../swpins/eval.nix {
       inherit confDir name;
-      channels = config.swpins.channels;
+      channels = metaConfig.swpins.channels;
       pkgs = corePkgs;
       lib = coreLib;
     };
 
   makeModuleArgs =
-    { config, swpins, spin, name }@args: {
+    { metaConfig, swpins, spin, name }@args: {
       swpins = swpins.evaluated;
       swpinsInfo = swpins.infos;
-      confMachine = import ./info.nix (args // { inherit findConfig; });
+      confMachine = import ./info.nix (args // { inherit findMetaConfig; });
     };
 
   makeImports = spin: extraImports: [
@@ -34,18 +34,20 @@ let
         lib.mkIf (confMachine.host != null) (lib.mkDefault confMachine.host.fullDomain);
     })
   ] ++ (import ../../modules/module-list.nix).${spin}
+    ++ (import ../../modules/system-list.nix).${spin}
     ++ (import "${toString confDir}/modules/module-list.nix").${spin}
     ++ (import "${toString confDir}/cluster/module-list.nix")
     ++ extraImports;
 in rec {
-  nixos = { name, config }:
+  nixos = { name, metaConfig }:
     let
-      swpins = swpinsFor { inherit name config; };
+      swpins = swpinsFor { inherit name metaConfig; };
     in
       { config, pkgs, ... }@args:
       {
         _module.args = makeModuleArgs {
-          inherit config swpins;
+          metaConfig = config;
+          inherit swpins;
           spin = "nixos";
           inherit name;
         };
@@ -55,14 +57,15 @@ in rec {
         ];
       };
 
-  vpsadminos = { name, config }:
+  vpsadminos = { name, metaConfig }:
     let
-      swpins = swpinsFor { inherit name config; };
+      swpins = swpinsFor { inherit name metaConfig; };
     in
       { config, pkgs, ... }@args:
       {
         _module.args = makeModuleArgs {
-          inherit config swpins;
+          metaConfig = config;
+          inherit swpins;
           spin = "vpsadminos";
           inherit name;
         };

data/nix/lib/machine/info.nix

@@ -1,5 +1,5 @@
-{ config, spin, name, findConfig, ... }:
-({ inherit name; } // findConfig {
-  inherit (config) cluster;
+{ metaConfig, spin, name, findMetaConfig, ... }:
+({ inherit name; } // findMetaConfig {
+  inherit (metaConfig) cluster;
   inherit name;
 })