From 3f40c0b7b32fadcab245989dd419d2e6b5180a51 Mon Sep 17 00:00:00 2001 From: jayofelony Date: Thu, 6 Jun 2024 14:36:33 +0200 Subject: [PATCH] Switch to bettercap lite Signed-off-by: jayofelony --- builder/raspberrypi32.yml | 30 ++++-------------------------- builder/raspberrypi64.yml | 20 ++++---------------- 2 files changed, 8 insertions(+), 42 deletions(-) diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml index 9f743d79..c5efdeda 100644 --- a/builder/raspberrypi32.yml +++ b/builder/raspberrypi32.yml @@ -26,9 +26,10 @@ packages: caplets: source: "https://github.com/jayofelony/caplets.git" + branch: "lite" # or master bettercap: source: "https://github.com/jayofelony/bettercap.git" - ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip" + branch: "lite" # or master pwngrid: source: "https://github.com/jayofelony/pwngrid.git" url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.7/pwngrid-1.10.7-armhf.zip" @@ -405,6 +406,7 @@ - name: download bettercap git: repo: "{{ packages.bettercap.source }}" + version: "{{ packages.bettercap.branch }} " dest: /usr/local/src/bettercap - name: install bettercap 2.32.4 @@ -418,19 +420,10 @@ state: absent path: /usr/local/src/bettercap - #- name: download and install bettercap - # unarchive: - # src: "{{ packages.bettercap.url }}" - # dest: /usr/local/bin - # remote_src: yes - # exclude: - # - README.md - # - LICENSE.md - # mode: 0755 - - name: clone bettercap caplets git: repo: "{{ packages.caplets.source }}" + version: "{{ packages.caplets.branch }}" dest: /tmp/caplets register: capletsgit @@ -440,21 +433,6 @@ target: install when: capletsgit.changed - - name: download and install bettercap ui - unarchive: - src: "{{ packages.bettercap.ui }}" - dest: /usr/local/share/bettercap/ - remote_src: yes - mode: 0755 - - # to always have the bettercap webui available (because why not?) - - name: copy pwnagotchi-manual over pwnagotchi-auto caplet - ansible.builtin.copy: - src: /usr/local/share/bettercap/caplets/pwnagotchi-manual.cap - dest: /usr/local/share/bettercap/caplets/pwnagotchi-auto.cap - force: true - ignore_errors: true - - name: create /etc/pwnagotchi folder file: path: /etc/pwnagotchi diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml index 75d50b21..e5609b52 100644 --- a/builder/raspberrypi64.yml +++ b/builder/raspberrypi64.yml @@ -27,10 +27,11 @@ packages: caplets: source: "https://github.com/jayofelony/caplets.git" + branch: "lite" # or master bettercap: source: "https://github.com/jayofelony/bettercap.git" url: "https://github.com/jayofelony/bettercap/releases/download/2.32.4/bettercap-2.32.4.zip" - ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip" + branch: "lite" # or master pwngrid: source: "https://github.com/jayofelony/pwngrid.git" url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.5/pwngrid-1.10.5-aarch64.zip" @@ -472,6 +473,7 @@ - name: download bettercap git: repo: "{{ packages.bettercap.source }}" + version: "{{ packages.bettercap.branch }}" dest: /usr/local/src/bettercap - name: install bettercap 2.32.4 @@ -498,6 +500,7 @@ - name: clone bettercap caplets git: repo: "{{ packages.caplets.source }}" + version: "{{ packages.caplets.branch }}" dest: /tmp/caplets register: capletsgit @@ -507,21 +510,6 @@ target: install when: capletsgit.changed - - name: download and install bettercap ui - unarchive: - src: "{{ packages.bettercap.ui }}" - dest: /usr/local/share/bettercap/ - remote_src: yes - mode: 0755 - - # to always have the bettercap webui available (because why not?) - - name: copy pwnagotchi-manual over pwnagotchi-auto caplet - ansible.builtin.copy: - src: /usr/local/share/bettercap/caplets/pwnagotchi-manual.cap - dest: /usr/local/share/bettercap/caplets/pwnagotchi-auto.cap - force: true - ignore_errors: true - - name: create /etc/pwnagotchi folder file: path: /etc/pwnagotchi