fix that damn sign!!!

This commit is contained in:
2023-08-09 15:52:44 +03:00
parent 7cbae4d58f
commit 6be027cf68
2 changed files with 126 additions and 66 deletions

View File

@@ -1127,6 +1127,9 @@ def create_node(provider, name=None, location=None, size=None, image=None, confi
sudo chown secdep:secdep /home/secdep -R
sudo chmod 700 /home/secdep /home/secdep/.ssh
sudo chmod 600 /home/secdep/.ssh/authorized_keys'''
## Last two lines don't work
## sudo printf "%s\n" "secdep ALL=(ALL) NOPASSWD:ALL" > "/etc/sudoers.d/secdepRules"
## sudo chmod 0440 "/etc/sudoers.d/secdepRules"'''
deploy = ScriptDeployment(script=SCRIPT, name="initialization.sh", delete=True)
if args.deploy:
actualDeployScript = ScriptFileDeployment(script_file=SECDEP_DEPLOY_SCRIPT, args=args.deploy, name="harden", delete=True)
@@ -1268,6 +1271,9 @@ def create_node(provider, name=None, location=None, size=None, image=None, confi
sudo chown secdep:secdep /home/secdep -R
sudo chmod 700 /home/secdep /home/secdep/.ssh
sudo chmod 600 /home/secdep/.ssh/authorized_keys'''
## Last two lines don't work
## sudo printf "%s\n" "secdep ALL=(ALL) NOPASSWD:ALL" > "/etc/sudoers.d/secdepRules"
## sudo chmod 0440 "/etc/sudoers.d/secdepRules"'''
deploy = ScriptDeployment(script=SCRIPT, name="initialization.sh", delete=True)
if args.deploy:
actualDeployScript = ScriptFileDeployment(script_file=SECDEP_DEPLOY_SCRIPT, args=args.deploy, name="harden", delete=True)
@@ -1324,7 +1330,10 @@ def list_all_nodes(provider, filterIn=None, awsRegion=None):
if len(azureNodes) > 0:
for node in azureNodes:
nodes.append(node)
console.print("[bold white]Loading %s%%...[/bold white]" % (int((2/providers_quantity)*100)))
if providers_quantity < 3:
console.print("[bold white]Loading %s%%...[/bold white]" % (int(((2/providers_quantity)/2)*100)))
else:
console.print("[bold white]Loading %s%%...[/bold white]" % (int((2/providers_quantity)*100)))
else:
console.print("Skipping azure", style="bold red")
if SECDEP_AWS_ACCESS_KEY != "":
@@ -1338,7 +1347,10 @@ def list_all_nodes(provider, filterIn=None, awsRegion=None):
if len(awsNodes) > 0:
for node in awsNodes:
nodes.append(node)
console.print("[bold white]Loading %s%%...[/bold white]" % (int((3/providers_quantity)*100)))
if providers_quantity < 3:
console.print("[bold white]Loading %s%%...[/bold white]" % (int((providers_quantity/providers_quantity)*100)))
else:
console.print("[bold white]Loading %s%%...[/bold white]" % (int((3/providers_quantity)*100)))
else:
console.print("Skipping aws", style="bold red")
status.stop()
@@ -1350,7 +1362,7 @@ def list_all_nodes(provider, filterIn=None, awsRegion=None):
if len(gceNodes) > 0:
for node in gceNodes:
nodes.append(node)
console.print("[bold white]Loading %s%%...[/bold white]" % (int((1/providers_quantity)*100)))
console.print("[bold white]Loading 100%...[/bold white]")
else:
console.print("Skipping gce", style="bold red")
status.stop()
@@ -1362,7 +1374,7 @@ def list_all_nodes(provider, filterIn=None, awsRegion=None):
if len(azureNodes) > 0:
for node in azureNodes:
nodes.append(node)
console.print("[bold white]Loading %s%%...[/bold white]" % (int((2/providers_quantity)*100)))
console.print("[bold white]Loading 100%...[/bold white]")
else:
console.print("Skipping azure", style="bold red")
status.stop()
@@ -1390,7 +1402,7 @@ def list_all_nodes(provider, filterIn=None, awsRegion=None):
if len(awsNodes) > 0:
for node in awsNodes:
nodes.append(node)
console.print("[bold white]Loading %s%%...[/bold white]" % (int((3/providers_quantity)*100)))
console.print("[bold white]Loading 100%...[/bold white]")
else:
console.print("Skipping aws", style="bold red")
status.stop()