summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-06-02 11:12:35 +0200
committermakefu <github@syntax-fehler.de>2016-06-02 11:12:35 +0200
commit6b97aab241fa916178c32849fb00d12d08cec5d0 (patch)
tree9345d7e8e6ecb0b66554b76c20ce3d63c557a065
parent797eba3591e4ede5533cb0df9873a2d2db731605 (diff)
do not write zhostsHEADmaster
-rw-r--r--init-stockholm/host.py10
1 files changed, 0 insertions, 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])