Fixed ParrotOS Integration. Now works again.

3 files changed, 76 insertions, 58 deletions

diff --git a/README.md b/README.md
index 946b465..4b9b4a5 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ If you just started up a new instance of **Kali**, to get it to a "proper workin
 
 `curl -sL https://raw.github.com/AgroDan/FreshInstall/master/setup-kali.sh | sudo bash`
 
-I also dabble a bit in **Parrot OS**. I've since created a similar bootstrap for it as well. **NOTE**: I have not used Parrot in a while so this may not work anymore. Feel free to try it out, but probably better to contribute yourself!:
+I also dabble a bit in **Parrot OS**. I've since created a similar bootstrap for it as well:
 
 `curl -sL https://raw.github.com/AgroDan/FreshInstall/master/setup-parrot.sh | sudo bash`
 
diff --git a/parrot.yml b/parrot.yml
index a770b86..c7802a8 100644
--- a/parrot.yml
+++ b/parrot.yml
@@ -4,62 +4,69 @@
     vars:
       docker_repo_key: "https://download.docker.com/linux/debian/gpg"
       docker_repo: "deb [arch=amd64] https://download.docker.com/linux/debian buster stable"
-      good_repo:
-        - "deb https://mirror.clarkson.edu/parrot/ rolling main contrib non-free"
-        - "deb-src https://mirror.clarkson.edu/parrot/ rolling main contrib non-free"
-      bad_repo:
-        - "deb https://deb.parrot.sh/parrot/ rolling main contrib non-free"
-        - "deb-src https://deb.parrot.sh/parrot/ rolling main contrib non-free"
+      sublime_repo_key: "https://download.sublimetext.com/sublimehq-pub.gpg"
+      sublime_repo: "deb https://download.sublimetext.com/ apt/stable/"
+      # good_repo:
+      #   - "deb https://mirror.clarkson.edu/parrot/ rolling main contrib non-free"
+      #   - "deb-src https://mirror.clarkson.edu/parrot/ rolling main contrib non-free"
+      # bad_repo:
+      #   - "deb https://deb.parrot.sh/parrot/ rolling main contrib non-free"
+      #   - "deb-src https://deb.parrot.sh/parrot/ rolling main contrib non-free"
     tasks:
-    - name: Add docker repo key
-      apt_key:
+    - name: Add Docker Repo Key
+      ansible.builtin.apt_key:
         url: "{{ docker_repo_key }}"
         state: present
     
-    - name: Add docker repo
-      apt_repository:
+    - name: Add Docker Repo
+      ansible.builtin.apt_repository:
         repo: "{{ docker_repo }}"
         state: present
+
+    - name: Add Sublime Text Repo Key
+      ansible.builtin.apt-key:
+        url: "{{ sublime_repo_key }}"
+        state: present
+
+    - name: Add Sublime Text Repo
+      ansible.builtin.apt_repository:
+        repo: "{{ sublime_repo }}"
+        state: present
     
-    - name: Not using auto-repo (this may work for you, but not for me)
-      apt_repository:
-        repo: "{{ item }}"
-        state: absent
-      loop: "{{ bad_repo }}"
+    # - name: Not using auto-repo (this may work for you, but not for me)
+    #   apt_repository:
+    #     repo: "{{ item }}"
+    #     state: absent
+    #   loop: "{{ bad_repo }}"
     
-    - name: Specifying a better repo
-      apt_repository:
-        repo: "{{ item }}"
-        state: present
-      loop: "{{ good_repo }}"
+    # - name: Specifying a better repo
+    #   apt_repository:
+    #     repo: "{{ item }}"
+    #     state: present
+    #   loop: "{{ good_repo }}"
     
     - name: Ensuring all packages are up to date
-      apt:
+      ansible.builtin.apt:
         update_cache: yes
         upgrade: dist
     
     - name: Get this neovim crap outta here (╯°□°)╯︵ ┻━┻
-      apt:
+      ansible.builtin.apt:
         name: neovim
         state: absent
 
     - name: Installing one-off packages from package manager
-      apt:
+      ansible.builtin.apt:
         update_cache: yes
         name:
         - vim
         - gawk
         - terminator
-        - jxplorer
         - gobuster
-        - python3
         - python3-dev
         - python3-pip
-        - crackmapexec
+        - pipx
         - neo4j
-        - openjdk-13-jre
-        - openjdk-13-jdk
-        - openjdk-14-jdk
         - rlwrap
         - eog
         - xclip
@@ -83,104 +90,109 @@
         - open-vm-tools
         - open-vm-tools-desktop
         - remmina
+        - sublime-text
         state: latest
         force_apt_get: yes
     
+    - name: Install CrackMapExec
+      community.general.pipx:
+        name: crackmapexec
+
     - name: Install ShellUp!
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/AgroDan/shellup.git'
         dest: /opt/shellup
     
     - name: Install Seclists (Kali has this in the repos)
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/danielmiessler/SecLists.git'
         dest: /opt/seclists
     
     - name: Install pwntools
-      pip:
+      ansible.builtin.pip:
         name: git+https://github.com/Gallopsled/pwntools.git@dev
 
     - name: Clone Invoke-Obfuscation (•_•) ( •_•)>⌐■-■ (⌐■_■)
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/danielbohannon/Invoke-Obfuscation'
         dest: /opt/Invoke-Obfuscation
 
     - name: Clone JumboJohn
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/magnumripper/JohnTheRipper'
         dest: /opt/JohnTheRipper
     
     - name: Compiling JumboJohn, hold onto yer butts...
-      command: chdir=/opt/JohnTheRipper/src {{ item }}
+      ansible.builtin.command: chdir=/opt/JohnTheRipper/src {{ item }}
       with_items:
       - ./configure
       - make
       - make install
     
     - name: Clone Nishang
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/samratashok/nishang'
         dest: /opt/nishang
     
     - name: Clone Chisel
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/jpillora/chisel'
         dest: /opt/chisel
     
     - name: Clone LinEnum
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/rebootuser/LinEnum'
         dest: /opt/LinEnum
     
     - name: Clone PEASS
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/carlospolop/privilege-escalation-awesome-scripts-suite'
         dest: /opt/privilege-escalation-awesome-scripts-suite
     
     - name: Clone PowerSploit
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/PowerShellMafia/PowerSploit'
         dest: /opt/PowerSploit
     
     - name: Clone Impacket
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/SecureAuthCorp/impacket'
         dest: /opt/impacket
     
     - name: Clone Bloodhound
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/BloodHoundAD/BloodHound'
         dest: /opt/BloodHound
 
     - name: Clone Gef
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/hugsy/gef.git'
         dest: /opt/gef
     
     - name: Clone Static Binaries
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/andrew-d/static-binaries'
         dest: /opt/static-binaries
     
     - name: Clone Ysoserial
-      git:
+      ansible.builtin.git:
         repo: 'https://github.com/frohoff/ysoserial'
         dest: /opt/ysoserial
     
     - name: Downloading Ysoserial JAR file
-      get_url:
+      ansible.builtin.get_url:
         url: https://jitpack.io/com/github/frohoff/ysoserial/master-SNAPSHOT/ysoserial-master-SNAPSHOT.jar
         dest: /opt/ysoserial/ysoserial-master-SNAPSHOT.jar
         mode: '0644'
     
     - name: Get Evil-WinRM via gem installer
-      gem:
+      ansible.builtin.gem:
         name: evil-winrm
         state: latest
         user_install: no
     
     - name: Disable mouse interactivity in vim (╯°□°)╯︵ ┻━┻
-      blockinfile:
+      ansible.builtin.blockinfile:
         path: /etc/vim/vimrc
         marker: "\" {mark} ANSIBLE MANAGED BLOCK"
         insertafter: EOF
@@ -190,16 +202,16 @@
           set ttymouse=
     
     - name: Getting all interactive users <<hack hack hack>>
-      shell: "awk -F: '{ if (($3 >= 1000 && $3 != 65534) || $3 == 0) print $1}' /etc/passwd"
+      ansible.builtin.shell: "awk -F: '{ if (($3 >= 1000 && $3 != 65534) || $3 == 0) print $1}' /etc/passwd"
       register: users
     
     - name: Initialize Gef for all users
-      script: /opt/gef/scripts/gef.sh
+      ansible.builtin.script: /opt/gef/scripts/gef.sh
       become_user: "{{ item }}"
       loop: "{{ users.stdout_lines }}"
     
     - name: Copying over bashrc file to all users
-      copy:
+      ansible.builtin.copy:
         src: /tmp/master-bashrc
         dest: "~{{ item }}/.bashrc"
         owner: "{{ item }}"
@@ -208,7 +220,7 @@
       loop: "{{ users.stdout_lines }}"
 
     - name: Copying over bash functions file for all users
-      copy:
+      ansible.builtin.copy:
         src: /tmp/master-bash_functions
         dest: "~{{ item }}/.bash_functions"
         owner: "{{ item }}"
@@ -217,7 +229,7 @@
       loop: "{{ users.stdout_lines }}"
 
     - name: Copying over tmux config to all users
-      copy:
+      ansible.builtin.copy:
         src: /tmp/master-tmux_conf
         dest: "~{{ item }}/.tmux.conf"
         owner: "{{ item }}"
@@ -226,13 +238,13 @@
       loop: "{{ users.stdout_lines }}"
 
     - name: Create /srv/smb/ directory for payload population
-      file:
+      ansible.builtin.file:
         path: /srv/smb
         state: directory
         mode: '0755'
         
     - name: Creating IWR share in samba config
-      blockinfile:
+      ansible.builtin.blockinfile:
         path: /etc/samba/smb.conf
         insertafter: EOF
         state: present
@@ -246,7 +258,7 @@
             directory mask = 0755
 
     - name: Ensure that samba doesn't start on boot
-      systemd:
+      ansible.builtin.systemd:
         name: smbd
         enabled: no
         state: stopped
diff --git a/setup-parrot.sh b/setup-parrot.sh
index 7759b4e..70c13d1 100644
--- a/setup-parrot.sh
+++ b/setup-parrot.sh
@@ -25,6 +25,12 @@ echo "***********************************"
 pip install ansible
 
 echo "***********************************"
+echo "*  Installing Ansible Collection  *"
+echo "***********************************"
+
+ansible-galaxy collection install community.general
+
+echo "***********************************"
 echo "*      Pulling master bashrc      *"
 echo "***********************************"
 
@@ -60,4 +66,4 @@ echo "***********************************"
 echo "*             Done!               *"
 echo "***********************************"
 
-echo "You should be set up. Check above for any errors."
\ No newline at end of file
+echo "You should be set up. Check above for any errors."