-

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

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")])