diff options
author | Vincent Ambo <mail@tazj.in> | 2021-04-11T20·50+0200 |
---|---|---|
committer | tazjin <mail@tazj.in> | 2021-04-11T22·18+0000 |
commit | 90281c4eac4cd25045ed80c5f8f27c74898a02b3 (patch) | |
tree | 804425642af16b9e299d469ad6e21c6a23a400e9 /ops/modules | |
parent | 7deabb8c8d6f4c7e58e2b16548b8a1895795963b (diff) |
refactor(ops): Split //ops/nixos into different locations r/2482
Splits //ops/nixos into: * //ops/nixos.nix - utility functions for building systems * //ops/machines - shared machine definitions (read by readTree) * //ops/modules - shared NixOS modules (skipped by readTree) This simplifies working with the configuration fixpoint in whitby, and is overall a bit more in line with how NixOS systems in user folders currently work. Change-Id: I1322ec5cc76c0207c099c05d44828a3df0b3ffc1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2931 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to '')
-rw-r--r-- | ops/modules/.skip-subtree (renamed from ops/nixos/.skip-subtree) | 0 | ||||
-rw-r--r-- | ops/modules/README.md (renamed from ops/nixos/README.md) | 0 | ||||
-rw-r--r-- | ops/modules/clbot.nix (renamed from ops/nixos/clbot.nix) | 0 | ||||
-rw-r--r-- | ops/modules/default.nix | 2 | ||||
-rw-r--r-- | ops/modules/irccat.nix (renamed from ops/nixos/irccat.nix) | 0 | ||||
-rw-r--r-- | ops/modules/monorepo-gerrit.nix (renamed from ops/nixos/monorepo-gerrit.nix) | 0 | ||||
-rw-r--r-- | ops/modules/panettone.nix (renamed from ops/nixos/panettone.nix) | 0 | ||||
-rw-r--r-- | ops/modules/paroxysm.nix (renamed from ops/nixos/paroxysm.nix) | 0 | ||||
-rw-r--r-- | ops/modules/quassel.nix (renamed from ops/nixos/quassel.nix) | 0 | ||||
-rw-r--r-- | ops/modules/smtprelay.nix (renamed from ops/nixos/smtprelay.nix) | 0 | ||||
-rw-r--r-- | ops/modules/sourcegraph.nix (renamed from ops/nixos/sourcegraph.nix) | 0 | ||||
-rw-r--r-- | ops/modules/tvl-buildkite.nix (renamed from ops/nixos/tvl-buildkite.nix) | 0 | ||||
-rw-r--r-- | ops/modules/tvl-slapd/default.nix (renamed from ops/nixos/tvl-slapd/default.nix) | 0 | ||||
-rw-r--r-- | ops/modules/tvl-sso/default.nix (renamed from ops/nixos/tvl-sso/default.nix) | 0 | ||||
-rw-r--r-- | ops/modules/v4l2loopback.nix (renamed from ops/nixos/v4l2loopback.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/b.tvl.fyi.nix (renamed from ops/nixos/www/b.tvl.fyi.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/base.nix (renamed from ops/nixos/www/base.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/cache.tvl.su.nix (renamed from ops/nixos/www/cache.tvl.su.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/cl.tvl.fyi.nix (renamed from ops/nixos/www/cl.tvl.fyi.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/code.tvl.fyi.nix (renamed from ops/nixos/www/code.tvl.fyi.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/cs.tvl.fyi.nix (renamed from ops/nixos/www/cs.tvl.fyi.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/login.tvl.fyi.nix (renamed from ops/nixos/www/login.tvl.fyi.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/tazj.in.nix (renamed from ops/nixos/www/tazj.in.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/todo.tvl.fyi.nix (renamed from ops/nixos/www/todo.tvl.fyi.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/tvl.fyi.nix (renamed from ops/nixos/www/tvl.fyi.nix) | 0 | ||||
-rw-r--r-- | ops/modules/www/wigglydonke.rs.nix (renamed from ops/nixos/www/wigglydonke.rs.nix) | 0 |
26 files changed, 2 insertions, 0 deletions
diff --git a/ops/nixos/.skip-subtree b/ops/modules/.skip-subtree index 09520f8c831f..09520f8c831f 100644 --- a/ops/nixos/.skip-subtree +++ b/ops/modules/.skip-subtree diff --git a/ops/nixos/README.md b/ops/modules/README.md index 595b4c3344c6..595b4c3344c6 100644 --- a/ops/nixos/README.md +++ b/ops/modules/README.md diff --git a/ops/nixos/clbot.nix b/ops/modules/clbot.nix index ad33e25a4d54..ad33e25a4d54 100644 --- a/ops/nixos/clbot.nix +++ b/ops/modules/clbot.nix diff --git a/ops/modules/default.nix b/ops/modules/default.nix new file mode 100644 index 000000000000..8bdfecdf41b0 --- /dev/null +++ b/ops/modules/default.nix @@ -0,0 +1,2 @@ +# Make readTree happy at this level. +_: {} diff --git a/ops/nixos/irccat.nix b/ops/modules/irccat.nix index e4b30b73553e..e4b30b73553e 100644 --- a/ops/nixos/irccat.nix +++ b/ops/modules/irccat.nix diff --git a/ops/nixos/monorepo-gerrit.nix b/ops/modules/monorepo-gerrit.nix index eaea386ecd11..eaea386ecd11 100644 --- a/ops/nixos/monorepo-gerrit.nix +++ b/ops/modules/monorepo-gerrit.nix diff --git a/ops/nixos/panettone.nix b/ops/modules/panettone.nix index 51a7468578f4..51a7468578f4 100644 --- a/ops/nixos/panettone.nix +++ b/ops/modules/panettone.nix diff --git a/ops/nixos/paroxysm.nix b/ops/modules/paroxysm.nix index cd9cd3866e47..cd9cd3866e47 100644 --- a/ops/nixos/paroxysm.nix +++ b/ops/modules/paroxysm.nix diff --git a/ops/nixos/quassel.nix b/ops/modules/quassel.nix index df26a3945532..df26a3945532 100644 --- a/ops/nixos/quassel.nix +++ b/ops/modules/quassel.nix diff --git a/ops/nixos/smtprelay.nix b/ops/modules/smtprelay.nix index d8e03b5794b0..d8e03b5794b0 100644 --- a/ops/nixos/smtprelay.nix +++ b/ops/modules/smtprelay.nix diff --git a/ops/nixos/sourcegraph.nix b/ops/modules/sourcegraph.nix index a24328f3e366..a24328f3e366 100644 --- a/ops/nixos/sourcegraph.nix +++ b/ops/modules/sourcegraph.nix diff --git a/ops/nixos/tvl-buildkite.nix b/ops/modules/tvl-buildkite.nix index 2aa3b81811f4..2aa3b81811f4 100644 --- a/ops/nixos/tvl-buildkite.nix +++ b/ops/modules/tvl-buildkite.nix diff --git a/ops/nixos/tvl-slapd/default.nix b/ops/modules/tvl-slapd/default.nix index ae99fced7499..ae99fced7499 100644 --- a/ops/nixos/tvl-slapd/default.nix +++ b/ops/modules/tvl-slapd/default.nix diff --git a/ops/nixos/tvl-sso/default.nix b/ops/modules/tvl-sso/default.nix index 8e33c708b7f3..8e33c708b7f3 100644 --- a/ops/nixos/tvl-sso/default.nix +++ b/ops/modules/tvl-sso/default.nix diff --git a/ops/nixos/v4l2loopback.nix b/ops/modules/v4l2loopback.nix index 636b2ff6cf27..636b2ff6cf27 100644 --- a/ops/nixos/v4l2loopback.nix +++ b/ops/modules/v4l2loopback.nix diff --git a/ops/nixos/www/b.tvl.fyi.nix b/ops/modules/www/b.tvl.fyi.nix index 45f6c6ed5141..45f6c6ed5141 100644 --- a/ops/nixos/www/b.tvl.fyi.nix +++ b/ops/modules/www/b.tvl.fyi.nix diff --git a/ops/nixos/www/base.nix b/ops/modules/www/base.nix index 4b956cd95ef1..4b956cd95ef1 100644 --- a/ops/nixos/www/base.nix +++ b/ops/modules/www/base.nix diff --git a/ops/nixos/www/cache.tvl.su.nix b/ops/modules/www/cache.tvl.su.nix index 182306bebff1..182306bebff1 100644 --- a/ops/nixos/www/cache.tvl.su.nix +++ b/ops/modules/www/cache.tvl.su.nix diff --git a/ops/nixos/www/cl.tvl.fyi.nix b/ops/modules/www/cl.tvl.fyi.nix index 470122c395ea..470122c395ea 100644 --- a/ops/nixos/www/cl.tvl.fyi.nix +++ b/ops/modules/www/cl.tvl.fyi.nix diff --git a/ops/nixos/www/code.tvl.fyi.nix b/ops/modules/www/code.tvl.fyi.nix index c8a4b27b1b52..c8a4b27b1b52 100644 --- a/ops/nixos/www/code.tvl.fyi.nix +++ b/ops/modules/www/code.tvl.fyi.nix diff --git a/ops/nixos/www/cs.tvl.fyi.nix b/ops/modules/www/cs.tvl.fyi.nix index fac814baf064..fac814baf064 100644 --- a/ops/nixos/www/cs.tvl.fyi.nix +++ b/ops/modules/www/cs.tvl.fyi.nix diff --git a/ops/nixos/www/login.tvl.fyi.nix b/ops/modules/www/login.tvl.fyi.nix index 05b7cee25338..05b7cee25338 100644 --- a/ops/nixos/www/login.tvl.fyi.nix +++ b/ops/modules/www/login.tvl.fyi.nix diff --git a/ops/nixos/www/tazj.in.nix b/ops/modules/www/tazj.in.nix index 7d658a5ec4c1..7d658a5ec4c1 100644 --- a/ops/nixos/www/tazj.in.nix +++ b/ops/modules/www/tazj.in.nix diff --git a/ops/nixos/www/todo.tvl.fyi.nix b/ops/modules/www/todo.tvl.fyi.nix index b53f5437e7ab..b53f5437e7ab 100644 --- a/ops/nixos/www/todo.tvl.fyi.nix +++ b/ops/modules/www/todo.tvl.fyi.nix diff --git a/ops/nixos/www/tvl.fyi.nix b/ops/modules/www/tvl.fyi.nix index 45fd35803de7..45fd35803de7 100644 --- a/ops/nixos/www/tvl.fyi.nix +++ b/ops/modules/www/tvl.fyi.nix diff --git a/ops/nixos/www/wigglydonke.rs.nix b/ops/modules/www/wigglydonke.rs.nix index 0bc67898c633..0bc67898c633 100644 --- a/ops/nixos/www/wigglydonke.rs.nix +++ b/ops/modules/www/wigglydonke.rs.nix |