diff --git a/.gitignore b/.gitignore index 2208975..5e1bc17 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ test_*.txt */p1.pl */p2.pl user_list.txt +req/*.ident diff --git a/app.py b/app.py index b076cb5..03d8c4a 100644 --- a/app.py +++ b/app.py @@ -21,7 +21,7 @@ app=Flask(__name__) # directory containing # account request files... WORKING_DIR = "/home/gashapwn/lyadmin/"; -ACCOUNT_DIR = "test/"; +ACCOUNT_DIR = "req/"; FULL_PATH = str(WORKING_DIR) + str(ACCOUNT_DIR) CONF_PATH = str(WORKING_DIR) + "lyadmin.conf.json" @@ -119,11 +119,12 @@ def signup(): # our request # This sets the ID of the request we're # abou to save to dsik - if(len(glob.glob("./test/[0-9]*ident*")) == 0): + if(len(glob.glob(ACCOUNT_DIR + str("[0-9]*ident*"))) == 0): new_id = int(INIT_REQ_ID) new_id_str = INIT_REQ_ID else: - max_id = max(list(map( lambda path : path.split("/")[-1].split(".")[0] , glob.glob("./test/[0-9]*ident*")))) + max_id = max(list(map( lambda path : path.split("/")[-1].split(".")[0] , glob.glob(str(ACCOUNT_DIR) + "[0-9]*ident*")))) + # max_id = max(list(map( lambda path : path.split("/")[-1].split(".")[0] , glob.glob("./test/[0-9]*ident*")))) zpad = len(max_id) new_id = int(max_id)+1 new_id_str = str(new_id).zfill(zpad) diff --git a/perl-script/create-user.pl b/perl-script/create-user.pl index 637c3fe..06fcf31 100644 --- a/perl-script/create-user.pl +++ b/perl-script/create-user.pl @@ -5,7 +5,7 @@ use strict; use JSON; my $WORKING_DIR = "/home/gashapwn/lyadmin/"; -my $ACCOUNT_DIR = "test/"; +my $ACCOUNT_DIR = "req/"; my $FULL_PATH = "$WORKING_DIR$ACCOUNT_DIR"; my $CONF_PATH = $WORKING_DIR."lyadmin.conf.json"; diff --git a/req/00000.ident.done b/req/00000.ident.done new file mode 100644 index 0000000..6336bce --- /dev/null +++ b/req/00000.ident.done @@ -0,0 +1,4 @@ +testuser1234 +asdfasdfas +SHELL_BASH +sdasdfasdfasdfasd