Author: sandervanderburg
Date: Wed Jan 19 13:14:19 2011
New Revision: 25627
URL: https://svn.nixos.org/websvn/nix/?rev=25627&sc=1
Log:
Removed UNIX socket backdoor, as it is not needed anymore
Modified:
disnix/disnixos/trunk/data/generate-infrastructure.nix.in
disnix/disnixos/trunk/data/infrastructure.nix.in
disnix/disnixos/trunk/data/testing.nix.in
Modified: disnix/disnixos/trunk/data/generate-infrastructure.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/generate-infrastructure.nix.in Wed Jan 19
12:59:32 2011 (r25626)
+++ disnix/disnixos/trunk/data/generate-infrastructure.nix.in Wed Jan 19
13:14:19 2011 (r25627)
@@ -1,6 +1,5 @@
{ networkFile
, useBackdoor ? false
-, useTcpSocket ? true
, nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
, nixos ? builtins.getEnv "NIXOS"
}:
@@ -15,7 +14,6 @@
sed -e "s|@networkFile@|${networkFile}|" \
-e "s|@nixpkgs@|${nixpkgs}|" \
-e "s|@nixos@|${nixos}|" \
- -e "s|@useBackdoor@|${if useBackdoor then "true" else "false"}|" \
- -e "s|@useTcpSocket@|${if useTcpSocket then "true" else "false"}|"
${infrastructureNix} > $out
+ -e "s|@useBackdoor@|${if useBackdoor then "true" else "false"}|"
${infrastructureNix} > $out
'';
}
Modified: disnix/disnixos/trunk/data/infrastructure.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/infrastructure.nix.in Wed Jan 19 12:59:32
2011 (r25626)
+++ disnix/disnixos/trunk/data/infrastructure.nix.in Wed Jan 19 13:14:19
2011 (r25627)
@@ -3,7 +3,6 @@
nixpkgs = "@nixpkgs@";
nixos = "@nixos@";
useBackdoor = @useBackdoor@;
- useTcpSocket = @useTcpSocket@;
pkgs = import nixpkgs {};
network = import networkFile;
@@ -24,7 +23,7 @@
]
++ pkgs.lib.optional useBackdoor {
key = "backdoor";
- services.disnix.infrastructure.backdoor = if useTcpSocket then
"TCP:${targetName}:512" else "UNIX-CONNECT:${targetName}.socket";
+ services.disnix.infrastructure.backdoor = "TCP:${targetName}:512";
};
extraArgs = configurations;
}).config) network;
Modified: disnix/disnixos/trunk/data/testing.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/testing.nix.in Wed Jan 19 12:59:32 2011
(r25626)
+++ disnix/disnixos/trunk/data/testing.nix.in Wed Jan 19 13:14:19 2011
(r25627)
@@ -57,7 +57,6 @@
infrastructure = import
"${disnixos}/share/disnixos/generate-infrastructure.nix" {
networkFile = "${manifestSrc}/${networkFile}";
useBackdoor = true;
- useTcpSocket = true;
inherit nixpkgs nixos;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
