From 6b97aab241fa916178c32849fb00d12d08cec5d0 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 2 Jun 2016 11:12:35 +0200 Subject: do not write zhosts --- init-stockholm/host.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/init-stockholm/host.py b/init-stockholm/host.py index 08e3c62..8939ced 100644 --- a/init-stockholm/host.py +++ b/init-stockholm/host.py @@ -58,7 +58,6 @@ def write_stockholm_1systems(ret,stockholm_dir): krebs = {{ enable = true; retiolum.enable = true; - build.user = config.krebs.users.{username}; build.host = config.krebs.hosts.{hostname}; }}; # You want to change these :) @@ -95,14 +94,6 @@ ssh.pubkey = "{pubkey}";""".format(**ret['ssh']) }}; }};""".format(**ret)) -def create_zhosts_file(ret,path): - """ creates a new tinc hosts file in path - (stockholm/krebs/Zhosts/$hostname) """ - with open(path,"w+") as f: - for i in ('v4','v6'): - f.write("Subnet = {}\n".format(ret[i])) - f.write(ret['pubkey']) - mark(path) def generate_tinc_keys(base): """ creates tinc public and private keys in `base` @@ -199,7 +190,6 @@ def main(): # generate tinc keys, return pubkey retiolum = path_join(secrets_dir,hostname,"retiolum") ret['pubkey'] = generate_tinc_keys(retiolum) - create_zhosts_file(ret,path_join(stockholm_dir,"krebs/Zhosts",hostname)) if args["--create-passwords"]: ret['shadow'] = create_passwords(host_secrets,["root",username]) -- cgit v1.2.3