Skip to content

Commit fe202d8

Browse files
authored
Merge pull request #1281 from flyingcircusio/PL-133416-devhost-2411
fix XFS UUID generation in many places; fix devhost
2 parents f906513 + 2f01d48 commit fe202d8

File tree

6 files changed

+71
-353
lines changed

6 files changed

+71
-353
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!--
2+
3+
A new changelog entry.
4+
5+
Delete placeholder items that do not apply. Empty sections will be removed
6+
automatically during release.
7+
8+
Leave the XX.XX as is: this is a placeholder and will be automatically filled
9+
correctly during the release and helps when backporting over multiple platform
10+
branches.
11+
12+
-->
13+
14+
### Impact
15+
16+
17+
### NixOS XX.XX platform
18+
19+
- internal: fix a regression in `restore-single-files` for accessing backups (PL-133416)
20+
- A behaviour change in `xfs_admin` resulted in a bug when adjusting filesystem UUIDs
21+
- make fc-devhost operational on this platform version (PL-133416)

nixos/roles/devhost/container.nix

-307
This file was deleted.

nixos/roles/devhost/default.nix

+2-7
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,14 @@ in
1212
options = {
1313
flyingcircus.roles.devhost = {
1414

15-
enable = lib.mkEnableOption "Enable our container-based development host";
15+
enable = lib.mkEnableOption "Enable our development host for slim virtual machines";
1616

1717
virtualisationType = lib.mkOption {
1818
type = lib.types.enum [ "vm" "container" ];
19+
# FIXME: Why is this still the default?
1920
default = "container";
2021
};
2122

22-
enableAliasProxy = lib.mkOption {
23-
description = "Enable HTTPS-Proxy for containers and their aliases.";
24-
type = lib.types.bool;
25-
default = !cfg.testing; # Disable on testing by default.
26-
};
27-
2823
publicAddress = lib.mkOption {
2924
description = "Name of the public address of this development server.";
3025
type = lib.types.str;

0 commit comments

Comments
 (0)