diff --git a/harden b/harden index dc7f83c..4341e70 100755 --- a/harden +++ b/harden @@ -700,6 +700,7 @@ sudo systemctl restart cron # It will also pass any arguments passed to the script to the dockerInit function. # Then it will output a message to the user and reboot the system in 2 minutes. function main { + printf "\x1B[01;93m========== SecDep ==========\n\x1B[0m" printf "%s\n" "=> $SCRIPT_NAME script started <=" check_dependencies || exit 1 # Check dependencies and exit if it fails printf "%s\n" "=> Dependencies installed <=" @@ -724,8 +725,8 @@ function main { # If the username is not secdep, delete the remaining users [[ "$USER" != "secdep" ]] && deleteRemainingUsers || exit 1 # Delete possible remaining users printf "%s\n" "=> Any unnecessary users deleted <=" - printf "%s\n" "=> $SCRIPT_NAME script finished <=" # Output message to the user - printf "%s\n" "=> System will reboot momentarily <=" # Output message to the user + printf "%s\n" "=> $SCRIPT_NAME script finished <=" + printf "%s\n" "=> System will reboot momentarily <=" # Reboot the system in 3 minutes with the shutdown command so that login before the reboot is not possible # If the username is not secdep, reboot the system in 1 minute # We reboot just in case there are any updates that need to be applied diff --git a/secdep.py b/secdep.py index dca0164..55a33d6 100755 --- a/secdep.py +++ b/secdep.py @@ -1044,9 +1044,6 @@ def create_node(provider, name=None, location=None, size=None, image=None, confi node = driver.deploy_node(name=name, image=image, size=size, location=location, ex_service_accounts=sa_scopes, ex_metadata=metadata, deploy=msd, ssh_key=SECDEP_SSH_PRIVATE_KEY, ssh_username="secdep") else: node = driver.deploy_node(name=name, image=image, size=size, location=location, ex_service_accounts=sa_scopes, ex_metadata=metadata, deploy=actualDeployScript, ssh_key=SECDEP_SSH_PRIVATE_KEY, ssh_username="secdep") - # console.print('[bold white]harden stdout: %s[/bold white]' % (sendDockerCompose.stdout)) - # console.print('[bold red]harden stderr: %s[/bold red]' % (sendDockerCompose.stderr)) - # console.print('[bold white]harden exit_code: %s[/bold white]' % (sendDockerCompose.exit_status)) console.print('[bold white]harden stdout: %s[/bold white]' % (actualDeployScript.stdout)) console.print('[bold red]harden stderr: %s[/bold red]' % (actualDeployScript.stderr)) console.print('[bold white]harden exit_code: %s[/bold white]' % (actualDeployScript.exit_status)) @@ -1111,9 +1108,6 @@ def create_node(provider, name=None, location=None, size=None, image=None, confi node = driver.deploy_node(name=name, size=size, image=image, location=location, auth=auth, ex_user_name="secdep", ex_resource_group=res_group.name, ex_use_managed_disks=True, ex_nic=newnic, ex_os_disk_delete=True, deploy=msd, ssh_key=SECDEP_SSH_PRIVATE_KEY, ssh_username="secdep") else: node = driver.deploy_node(name=name, size=size, image=image, location=location, auth=auth, ex_user_name="secdep", ex_resource_group=res_group.name, ex_use_managed_disks=True, ex_nic=newnic, ex_os_disk_delete=True, deploy=actualDeployScript, ssh_key=SECDEP_SSH_PRIVATE_KEY, ssh_username="secdep") - # console.print('[bold white]harden stdout: %s[/bold white]' % (sendDockerCompose.stdout)) - # console.print('[bold red]harden stderr: %s[/bold red]' % (sendDockerCompose.stderr)) - # console.print('[bold white]harden exit_code: %s[/bold white]' % (sendDockerCompose.exit_status)) console.print('[bold white]harden stdout: %s[/bold white]' % (actualDeployScript.stdout)) console.print('[bold red]harden stderr: %s[/bold red]' % (actualDeployScript.stderr)) console.print('[bold white]harden exit_code: %s[/bold white]' % (actualDeployScript.exit_status)) @@ -1161,9 +1155,6 @@ def create_node(provider, name=None, location=None, size=None, image=None, confi console.print('[bold white]deploy stdout: %s[/bold white]' % (deploy.stdout)) console.print('[bold red]deploy stderr: %s[/bold red]' % (deploy.stderr)) console.print('[bold white]deploy exit_code: %s[/bold white]' % (deploy.exit_status)) - # console.print('[bold white]harden stdout: %s[/bold white]' % (sendDockerCompose.stdout)) - # console.print('[bold red]harden stderr: %s[/bold red]' % (sendDockerCompose.stderr)) - # console.print('[bold white]harden exit_code: %s[/bold white]' % (sendDockerCompose.exit_status)) console.print('[bold white]harden stdout: %s[/bold white]' % (actualDeployScript.stdout)) console.print('[bold red]harden stderr: %s[/bold red]' % (actualDeployScript.stderr)) console.print('[bold white]harden exit_code: %s[/bold white]' % (actualDeployScript.exit_status)) @@ -1200,9 +1191,6 @@ def create_node(provider, name=None, location=None, size=None, image=None, confi node = driver.deploy_node(name=name, image=image, size=size, location=location, ex_service_accounts=sa_scopes, ex_metadata=metadata, deploy=msd, ssh_key=SECDEP_SSH_PRIVATE_KEY, ssh_username="secdep") else: node = driver.deploy_node(name=name, image=image, size=size, location=location, ex_service_accounts=sa_scopes, ex_metadata=metadata, deploy=actualDeployScript, ssh_key=SECDEP_SSH_PRIVATE_KEY, ssh_username="secdep") - # console.print('[bold white]harden stdout: %s[/bold white]' % (sendDockerCompose.stdout)) - # console.print('[bold red]harden stderr: %s[/bold red]' % (sendDockerCompose.stderr)) - # console.print('[bold white]harden exit_code: %s[/bold white]' % (sendDockerCompose.exit_status)) console.print('[bold white]harden stdout: %s[/bold white]' % (actualDeployScript.stdout)) console.print('[bold red]harden stderr: %s[/bold red]' % (actualDeployScript.stderr)) console.print('[bold white]harden exit_code: %s[/bold white]' % (actualDeployScript.exit_status)) @@ -1267,9 +1255,6 @@ def create_node(provider, name=None, location=None, size=None, image=None, confi node = driver.deploy_node(name=name, size=size, image=image, location=location, auth=auth, ex_user_name="secdep", ex_resource_group=res_group.name, ex_use_managed_disks=True, ex_nic=newnic, ex_os_disk_delete=True, deploy=msd, ssh_key=SECDEP_SSH_PRIVATE_KEY, ssh_username="secdep") else: node = driver.deploy_node(name=name, size=size, image=image, location=location, auth=auth, ex_user_name="secdep", ex_resource_group=res_group.name, ex_use_managed_disks=True, ex_nic=newnic, ex_os_disk_delete=True, deploy=actualDeployScript, ssh_key=SECDEP_SSH_PRIVATE_KEY, ssh_username="secdep") - # console.print('[bold white]harden stdout: %s[/bold white]' % (sendDockerCompose.stdout)) - # console.print('[bold red]harden stderr: %s[/bold red]' % (sendDockerCompose.stderr)) - # console.print('[bold white]harden exit_code: %s[/bold white]' % (sendDockerCompose.exit_status)) console.print('[bold white]harden stdout: %s[/bold white]' % (actualDeployScript.stdout)) console.print('[bold red]harden stderr: %s[/bold red]' % (actualDeployScript.stderr)) console.print('[bold white]harden exit_code: %s[/bold white]' % (actualDeployScript.exit_status)) @@ -1317,9 +1302,6 @@ def create_node(provider, name=None, location=None, size=None, image=None, confi console.print('[bold white]deploy stdout: %s[/bold white]' % (deploy.stdout)) console.print('[bold red]deploy stderr: %s[/bold red]' % (deploy.stderr)) console.print('[bold white]deploy exit_code: %s[/bold white]' % (deploy.exit_status)) - # console.print('[bold white]harden stdout: %s[/bold white]' % (sendDockerCompose.stdout)) - # console.print('[bold red]harden stderr: %s[/bold red]' % (sendDockerCompose.stderr)) - # console.print('[bold white]harden exit_code: %s[/bold white]' % (sendDockerCompose.exit_status)) console.print('[bold white]harden stdout: %s[/bold white]' % (actualDeployScript.stdout)) console.print('[bold red]harden stderr: %s[/bold red]' % (actualDeployScript.stderr)) console.print('[bold white]harden exit_code: %s[/bold white]' % (actualDeployScript.exit_status))