From e361606807b2dcfe7ba2b3eaa29fa651fe3b5e14 Mon Sep 17 00:00:00 2001 From: Mateusz779 Date: Thu, 13 Apr 2023 13:32:21 +0200 Subject: [PATCH] bug --- app.py | 2 +- configs/create.sh | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app.py b/app.py index 8fbb0c9..f70efa7 100644 --- a/app.py +++ b/app.py @@ -48,7 +48,7 @@ def create_conf_post(): key_length = request.form['key_length'] folder = utils.generate_random_string(5) try: - os.mkdir(folder) + os.mkdir(os.path.join(os.getcwd(), 'configs',folder)) authorized_keys_config = request.form['authorized_keys_config'] authorized_keys_file = open(folder+"/authorized_keys","w") authorized_keys_file.write(authorized_keys_config) diff --git a/configs/create.sh b/configs/create.sh index 2714f9d..b196b6a 100755 --- a/configs/create.sh +++ b/configs/create.sh @@ -1,4 +1,5 @@ #!/bin/bash +echo "Parametry podane do skryptu: $@" kitcrypto_version="0.0.3" uvpn3_version="3.0.3" @@ -9,17 +10,17 @@ while getopts "a:b:c:d:e:i:k:l:m:n:s:" option do case "${option}" in - a)akeys=${OPTARG};; - b)build="yes";; - c)conf=${OPTARG};; - d)sshconf=${OPTARG};; - i)ini=${OPTARG};; - k)key=${OPTARG};; - l)keylen=${OPTARG};; - m)msmtp=${OPTARG};; - n)name=${OPTARG};; - s)scripts=${OPTARG};; - *)usage;; + a)akeys=${OPTARG};; + b)build="yes";; + c)conf=${OPTARG};; + d)sshconf=${OPTARG};; + i)ini=${OPTARG};; + k)key=${OPTARG};; + l)keylen=${OPTARG};; + m)msmtp=${OPTARG};; + n)name=${OPTARG};; + s)scripts=${OPTARG};; + *)usage;; esac done shift $((OPTIND-1)) @@ -83,10 +84,10 @@ if [ -n "$msmtp" ]; then fi -sed -i '/^private_key/c\private_key uVPN.priv' /tmp/output/vpn/$conf -sed -i '/^name/c\name '"$name" /tmp/output/vpn/$conf -sed -i '/^servers_config/c\servers_config '"$ini" /tmp/output/vpn/$conf -sed -i '1s/.*/['"$name"']/' /tmp/output/vpn/$ini +sed -i '/^private_key/c\private_key uVPN.priv' /tmp/output/vpn/$(basename "$conf") +sed -i '/^name/c\name '"$name" /tmp/output/vpn/$(basename "$conf") +sed -i '/^servers_config/c\servers_config '"$(basename "$ini")" /tmp/output/vpn/$(basename "$conf") +sed -i '1s/.*/['"$name"']/' /tmp/output/vpn/$(basename "$ini") cd /tmp/output mkdir configs