adding servername as a variable that can be called in the templates

master
manetta 3 years ago
parent 048456eb05
commit 4044509e77

@ -17,7 +17,7 @@ ap.add_argument("--nginx", type=argparse.FileType("w"), default="users.nginx.con
ap.add_argument("--md", type=argparse.FileType("w"), default="users.md") ap.add_argument("--md", type=argparse.FileType("w"), default="users.md")
ap.add_argument("--port", type=int, default=9060) ap.add_argument("--port", type=int, default=9060)
ap.add_argument("--addusers", action="store_true", default=False) ap.add_argument("--addusers", action="store_true", default=False)
ap.add_argument("--servername", type=str, default="sandbox) ap.add_argument("--servername", type=str, default="sandbox")
args = ap.parse_args() args = ap.parse_args()
passwords = args.passwords.read().strip().splitlines() passwords = args.passwords.read().strip().splitlines()
@ -25,7 +25,8 @@ passwords = [w.lower() for w in passwords]
template_env = Environment(loader=FileSystemLoader(args.templates)) template_env = Environment(loader=FileSystemLoader(args.templates))
curport = args.port curport = args.port
usernames = args.from_file.read().strip().splitlines() usernames = args.from_file.read().strip().splitlines()
servername = args.servername.read().strip()
nbconfig = template_env.get_template("jupyter_notebook_config.py") nbconfig = template_env.get_template("jupyter_notebook_config.py")
csvout = writer(args.csv) csvout = writer(args.csv)
csvout.writerow("username port password".split()) csvout.writerow("username port password".split())
@ -39,6 +40,7 @@ for username in usernames:
userdata['password'] = password userdata['password'] = password
userdata['password_sha1'] = passwd(password) userdata['password_sha1'] = passwd(password)
userdata['port'] = curport userdata['port'] = curport
userdata['servername'] = servername
users.append(userdata) users.append(userdata)
csvout.writerow((userdata['username'], userdata['port'], userdata['password'])) csvout.writerow((userdata['username'], userdata['port'], userdata['password']))
curport += 1 curport += 1

Loading…
Cancel
Save