updates+caido

README.md

@@ -38,8 +38,7 @@ ssh -i id_rsa $RDPUSER@<vm_pip>
 ### \# ansible part
 
 ```
-cd ansible/
-- add <vm_pip> >> ./inventory/hosts.ini
+add <vm_pip> >> ./inventory/hosts.ini
 
 ansible-playbook \
 --extra-vars RDP_USER=$RDPUSER \
@@ -58,4 +57,10 @@ After you connect you can **cancel** this:
 
 **Firefox** you can find in `Applications / Internet`:
 
-![fx](./img/firefox.png)
+![fx1](./img/fx1.png)
+![fx2](./img/fx2.png)
+
+**Caido** you can find in `Applications / Development`:
+
+![c1](./img/c1.png)
+![c2](./img/c2.png)

roles/apply/tasks/caido.yml

@@ -0,0 +1,9 @@
+---
+- name: install caido
+  # https://github.com/caido/caido/releases
+  shell: |
+    wget https://storage.googleapis.com/caido-releases/"{{ caido_version }}"/caido-desktop-"{{ caido_version }}"-linux-x86_64.deb
+    sudo dpkg -i caido-desktop-"{{ caido_version }}"-linux-x86_64.deb
+  register: caido
+- debug:
+    msg: "{{ caido.stdout }}"

roles/apply/tasks/firefox.yml

@@ -0,0 +1,6 @@
+---
+- name: install firefox
+  command: sudo snap install firefox
+  register: firefox
+- debug:
+    msg: "{{ firefox.stdout }}"

roles/apply/tasks/main.yml

@@ -1,32 +1,5 @@
 ---
-- name: install and configure xfce4
-  shell: |
-    sudo apt-get update
-    sudo DEBIAN_FRONTEND=noninteractive apt-get -y install xfce4
-    sudo apt install xfce4-session
-    echo xfce4-session >~/.xsession
-  register: xfce4
-- debug:
-    msg: "{{ xfce4.stdout }}"
-
-- name: install and configure xrdp
-  shell: |
-    sudo apt-get -y install {{ xrdp_package }}
-    sudo systemctl enable {{ xrdp_package }}
-    sudo systemctl restart {{ xrdp_package }}
-  register: xrdp
-- debug:
-    msg: "{{ xrdp.stdout }}"
-
-- name: install firefox
-  command: sudo snap install firefox
-  register: firefox
-- debug:
-    msg: "{{ firefox.stdout }}"
-
-- name: change user password
-  shell: |
-    echo "{{ rdp_user }}:{{ rdp_pass }}" | sudo chpasswd
-  register: rdp_user
-- debug:
-    msg: "{{ rdp_user.stdout }}"
+- include_tasks: xrdp.yml
+- include_tasks: firefox.yml
+- include_tasks: caido.yml
+- include_tasks: pass.yml

roles/apply/tasks/pass.yml

@@ -0,0 +1,7 @@
+---
+- name: change user password
+  shell: |
+    echo "{{ rdp_user }}:{{ rdp_pass }}" | sudo chpasswd
+  register: rdp_user
+- debug:
+    msg: "{{ rdp_user.stdout }}"

roles/apply/tasks/xrdp.yml

@@ -0,0 +1,19 @@
+---
+- name: install and configure xfce4
+  shell: |
+    sudo apt-get update
+    sudo DEBIAN_FRONTEND=noninteractive apt-get -y install xfce4
+    sudo apt install xfce4-session
+    echo xfce4-session >~/.xsession
+  register: xfce4
+- debug:
+    msg: "{{ xfce4.stdout }}"
+
+- name: install and configure xrdp
+  shell: |
+    sudo apt-get -y install {{ xrdp_package }}
+    sudo systemctl enable {{ xrdp_package }}
+    sudo systemctl restart {{ xrdp_package }}
+  register: xrdp
+- debug:
+    msg: "{{ xrdp.stdout }}"

setup.yml

@@ -5,5 +5,6 @@
   vars:
     rdp_user: "{{ RDP_USER }}"
     rdp_pass: "{{ RDP_PASS }}"
+    caido_version: "v0.33.0"
   roles:
     - role: apply