Merge remote-tracking branch 'cd/master'
This commit is contained in:
commit
8512c0400f
@ -79,6 +79,15 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
hostsArchive = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.runCommand "retiolum-hosts.tar.bz2" {} ''
|
||||
${pkgs.coreutils}/bin/ln -s ${tinc.config.hostsPackage} hosts
|
||||
${pkgs.gnutar}/bin/tar -hcjf $out hosts
|
||||
'';
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
hostsPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.stdenv.mkDerivation {
|
||||
|
@ -14,7 +14,7 @@ with import <stockholm/lib>;
|
||||
stockholm.file = "/home/tv/stockholm";
|
||||
nixpkgs.git = {
|
||||
url = https://github.com/NixOS/nixpkgs;
|
||||
ref = "e4fb65a3627f8c17a2f92c08bf302dc30f0a8db9";
|
||||
ref = "0195ab84607ac3a3aa07a79d2d6c2781b1bb6731";
|
||||
};
|
||||
} // optionalAttrs host.secure {
|
||||
secrets-master.file = "/home/tv/secrets/master";
|
||||
|
Loading…
Reference in New Issue
Block a user