tinc: drop tincUpExtra
This commit is contained in:
parent
c8c916ccf1
commit
ebd22b2d28
@ -26,10 +26,7 @@ with import <stockholm/lib>;
|
|||||||
Port = ${toString tinc.config.host.nets.${netname}.tinc.port}
|
Port = ${toString tinc.config.host.nets.${netname}.tinc.port}
|
||||||
${tinc.config.extraConfig}
|
${tinc.config.extraConfig}
|
||||||
'';
|
'';
|
||||||
"tinc-up" = pkgs.writeDash "${netname}-tinc-up" /* sh */ ''
|
"tinc-up" = pkgs.writeDash "${netname}-tinc-up" tinc.config.tincUp;
|
||||||
${tinc.config.tincUp}
|
|
||||||
${tinc.config.tincUpExtra}
|
|
||||||
'';
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -85,11 +82,6 @@ with import <stockholm/lib>;
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
tincUpExtra = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "";
|
|
||||||
};
|
|
||||||
|
|
||||||
tincPackage = mkOption {
|
tincPackage = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = pkgs.tinc_pre;
|
default = pkgs.tinc_pre;
|
||||||
|
Loading…
Reference in New Issue
Block a user