From 01155ef076e1e3c41047fe6578de3b0a6590d840 Mon Sep 17 00:00:00 2001
From: trevorbryant <trevorbryant@gmail.com>
Date: Mon, 1 Apr 2019 21:53:53 -0400
Subject: [PATCH] stuff changed

---
 README.md                                |  4 ++--
 playbook_apt.yml => playbook_apt-sec.yml | 15 --------------
 playbook_apt-utils.yml                   | 26 ++++++++++++++++++++++++
 playbook_pip.yml => playbook_pip-sec.yml |  1 -
 playbook_pip3-sec.yml                    | 14 +++++++++++++
 5 files changed, 42 insertions(+), 18 deletions(-)
 rename playbook_apt.yml => playbook_apt-sec.yml (77%)
 create mode 100644 playbook_apt-utils.yml
 rename playbook_pip.yml => playbook_pip-sec.yml (92%)
 create mode 100644 playbook_pip3-sec.yml

diff --git a/README.md b/README.md
index ed23a41..5b133ed 100644
--- a/README.md
+++ b/README.md
@@ -25,10 +25,10 @@ $ apt -y install python-apt
 Perform a dry run:
 
 ```bash
-$ sudo ansible-playbook playbooks/playbook_apt_bionic.yml --check
+$ sudo ansible-playbook playbook_apt-utils.yml --check
 ```
 Run playbook and install tools to localhost:
 
 ```bash
-$ sudo ansible-playbook playbooks/playbook_apt_bionic.yml
+$ sudo ansible-playbook playbook_apt-utils.yml
 ```
diff --git a/playbook_apt.yml b/playbook_apt-sec.yml
similarity index 77%
rename from playbook_apt.yml
rename to playbook_apt-sec.yml
index fb8cc9e..b5f7817 100644
--- a/playbook_apt.yml
+++ b/playbook_apt-sec.yml
@@ -3,31 +3,16 @@
   become: true
   vars:
     packages:
-      - git
-      - ftp
-      - jq
-      - telnet
-      - netcat
-      - socat
-      - rdesktop
       - nbtscan
       - samba-common-bin
       - smbclient
       - polenum
       - ldap-utils
-      - tmux
-      - vim
-      - golang-go
-      - python
-      - python-pip
-      - python3
-      - python3-pip
       - samba
       - cifs-utils
       - python-scapy
       - python3-scapy
       - scanssh
-      - nmap
       - zenmap
       - sqlmap
       - dnsrecon
diff --git a/playbook_apt-utils.yml b/playbook_apt-utils.yml
new file mode 100644
index 0000000..01eabf8
--- /dev/null
+++ b/playbook_apt-utils.yml
@@ -0,0 +1,26 @@
+- hosts: localhost
+  connection: local
+  become: true
+  vars:
+    packages:
+      - git
+      - ftp
+      - jq
+      - telnet
+      - netcat
+      - socat
+      - rdesktop
+      - tmux
+      - vim
+      - golang-go
+      - python
+      - python-pip
+      - python3
+      - python3-pip
+      - nmap
+  tasks:
+    - name: install deb packages
+      apt:
+        name: "{{ item }}"
+        state: present
+      loop: "{{ packages }}"
diff --git a/playbook_pip.yml b/playbook_pip-sec.yml
similarity index 92%
rename from playbook_pip.yml
rename to playbook_pip-sec.yml
index f09edcf..147be6c 100644
--- a/playbook_pip.yml
+++ b/playbook_pip-sec.yml
@@ -4,7 +4,6 @@
   vars:
     packages:
       - impacket
-        #      - pshtt
       - dirhunt
       - crackmapexec 
   tasks:
diff --git a/playbook_pip3-sec.yml b/playbook_pip3-sec.yml
new file mode 100644
index 0000000..8a32f08
--- /dev/null
+++ b/playbook_pip3-sec.yml
@@ -0,0 +1,14 @@
+- hosts: localhost
+  connection: local
+  become: true
+  vars:
+    packages:
+      - pshtt 
+  tasks:
+    - name: install pip3 packages
+      pip:
+        name: "{{ item }}"
+        executable: pip3
+        state: present
+        extra_args: --upgrade
+      loop: "{{ packages }}"