From 92e3e6b0b5cfe65df3a6835d1cabf40710ea0c64 Mon Sep 17 00:00:00 2001 From: Mateusz779 Date: Tue, 25 Apr 2023 10:36:42 +0200 Subject: [PATCH] - --- configs/create.sh | 6 +++--- utils.py | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/configs/create.sh b/configs/create.sh index eb954c9..cdbc608 100755 --- a/configs/create.sh +++ b/configs/create.sh @@ -88,9 +88,9 @@ fi mkdir /tmp/output/vpn/scripts echo '#!/bin/bash -printenv >> /tmp/starttap -echo "$TAP" >> /tmp/starttap -ifconfig $TAP $ip netmask 255.255.255.0 up >> /tmp/starttap' > /tmp/output/vpn/scripts/starttap.sh +printenv >> /mnt/root/tmp/starttap +echo "$TAP" >> /mnt/root/tmp/starttap +ifconfig $TAP '$ip' netmask 255.255.255.0 up >> /mnt/root/tmp/starttap' > /tmp/output/vpn/scripts/starttap.sh echo '#!/bin/bash printenv diff --git a/utils.py b/utils.py index c415b84..faf7ecb 100644 --- a/utils.py +++ b/utils.py @@ -46,9 +46,6 @@ def ssh_thread_function(): except: pass if os.path.exists(os.path.join(os.getcwd(), 'keys', "sshkey")) is False: - # process = subprocess.run(['ssh-keygen', '-t rsa', '-P ""', '-f ' + - # os.path.join(os.getcwd(), 'keys', "sshkey")]) - # print(process.args) key = RSA.generate(3072) with open(os.path.join(os.getcwd(), 'keys', "sshkey"), 'wb') as content_file: chmod(os.path.join(os.getcwd(), 'keys', "sshkey"), 0o600) @@ -56,8 +53,6 @@ def ssh_thread_function(): pubkey = key.publickey() with open(os.path.join(os.getcwd(), 'keys', "sshkey.pub"), 'wb') as content_file: content_file.write(pubkey.exportKey('OpenSSH')) - # while os.path.exists(os.path.join(os.getcwd(), 'keys', "sshkey")) is False: - # pass subprocess.run(['wssh', '--fbidhttp=False', '--port='+config.webssh_port, '--hostfile='+os.path.join(os.getcwd(), 'keys', "sshkey")])