From 966126a98692b0a0c25fc6c284d33836ec267d3c Mon Sep 17 00:00:00 2001 From: jayofelony Date: Tue, 27 Feb 2024 10:10:06 +0100 Subject: [PATCH] Update build --- Makefile | 4 ++-- .../etc/systemd/system/pwngrid-peer.service | 2 +- ...son.pkr.hcl => raspberrypi32.json.pkr.hcl} | 2 +- .../{pwnagotchi.yml => raspberrypi32.yml} | 0 .../etc/systemd/system/bluetooth.service | 20 +++++++++++++++++++ .../etc/systemd/system/pwngrid-peer.service | 2 +- ...son.pkr.hcl => raspberrypi64.json.pkr.hcl} | 0 pwnagotchi/defaults.toml | 4 ++-- 8 files changed, 27 insertions(+), 7 deletions(-) rename builder/data/32bit/{pwnagotchi.json.pkr.hcl => raspberrypi32.json.pkr.hcl} (98%) rename builder/data/32bit/{pwnagotchi.yml => raspberrypi32.yml} (100%) create mode 100644 builder/data/64bit/etc/systemd/system/bluetooth.service rename builder/data/64bit/{pwnagotchi.json.pkr.hcl => raspberrypi64.json.pkr.hcl} (100%) diff --git a/Makefile b/Makefile index 469956a0..86303078 100644 --- a/Makefile +++ b/Makefile @@ -49,11 +49,11 @@ image: clean packer cd builder && sudo /usr/bin/packer init combined.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" combined.json.pkr.hcl bullseye: clean packer - cd builder && sudo /usr/bin/packer init data/32bit/pwnagotchi.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/32bit/pwnagotchi.json.pkr.hcl + cd builder && sudo /usr/bin/packer init data/32bit/raspberrypi32.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/32bit/raspberrypi32.json.pkr.hcl sudo pishrink -vaZ pwnagotchi-32bit.img bookworm: clean packer - cd builder && sudo /usr/bin/packer init data/64bit/pwnagotchi.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/64bit/pwnagotchi.json.pkr.hcl + cd builder && sudo /usr/bin/packer init data/64bit/raspberrypi64.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/64bit/raspberrypi64.json.pkr.hcl sudo pishrink -vaZ pwnagotchi-64bit.img clean: diff --git a/builder/data/32bit/etc/systemd/system/pwngrid-peer.service b/builder/data/32bit/etc/systemd/system/pwngrid-peer.service index 74fb3a17..9a55eb3f 100644 --- a/builder/data/32bit/etc/systemd/system/pwngrid-peer.service +++ b/builder/data/32bit/etc/systemd/system/pwngrid-peer.service @@ -8,7 +8,7 @@ After=bettercap.service Environment=LD_PRELOAD=/usr/local/lib/libpcap.so.1 Environment=LD_LIBRARY_PATH=/usr/local/lib Type=simple -ExecStart=/usr/local/bin/pwngrid -keys /etc/pwnagotchi -peers /root/peers -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /var/log/pwngrid-peer.log -iface wlan0mon +ExecStart=/usr/local/bin/pwngrid -keys /etc/pwnagotchi -peers /root/peers -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /etc/pwnagotchi/log/pwngrid-peer.log -iface wlan0mon Restart=always RestartSec=30 diff --git a/builder/data/32bit/pwnagotchi.json.pkr.hcl b/builder/data/32bit/raspberrypi32.json.pkr.hcl similarity index 98% rename from builder/data/32bit/pwnagotchi.json.pkr.hcl rename to builder/data/32bit/raspberrypi32.json.pkr.hcl index 0fc0aabe..a20e747f 100644 --- a/builder/data/32bit/pwnagotchi.json.pkr.hcl +++ b/builder/data/32bit/raspberrypi32.json.pkr.hcl @@ -89,6 +89,6 @@ build { command = "ANSIBLE_FORCE_COLOR=1 PYTHONUNBUFFERED=1 PWN_VERSION=${var.pwn_version} PWN_HOSTNAME=${var.pwn_hostname} ansible-playbook" extra_arguments = ["--extra-vars \"ansible_python_interpreter=/usr/bin/python3\""] playbook_dir = "data/32bit/extras/" - playbook_file = "data/32bit/pwnagotchi.yml" + playbook_file = "data/32bit/raspberrypi32.yml" } } \ No newline at end of file diff --git a/builder/data/32bit/pwnagotchi.yml b/builder/data/32bit/raspberrypi32.yml similarity index 100% rename from builder/data/32bit/pwnagotchi.yml rename to builder/data/32bit/raspberrypi32.yml diff --git a/builder/data/64bit/etc/systemd/system/bluetooth.service b/builder/data/64bit/etc/systemd/system/bluetooth.service new file mode 100644 index 00000000..6780e4b8 --- /dev/null +++ b/builder/data/64bit/etc/systemd/system/bluetooth.service @@ -0,0 +1,20 @@ +[Unit] +Description=Bluetooth service +Documentation=man:bluetoothd(8) +ConditionPathIsDirectory=/sys/class/bluetooth + +[Service] +Type=dbus +BusName=org.bluez +ExecStart=/usr/libexec/bluetooth/bluetoothd --noplugin=sap,a2dp +NotifyAccess=main +#WatchdogSec=10 +#Restart=on-failure +CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE +LimitNPROC=1 +ProtectHome=true +ProtectSystem=full + +[Install] +WantedBy=bluetooth.target +Alias=dbus-org.bluez.service diff --git a/builder/data/64bit/etc/systemd/system/pwngrid-peer.service b/builder/data/64bit/etc/systemd/system/pwngrid-peer.service index 0ea07f92..9a55eb3f 100644 --- a/builder/data/64bit/etc/systemd/system/pwngrid-peer.service +++ b/builder/data/64bit/etc/systemd/system/pwngrid-peer.service @@ -8,7 +8,7 @@ After=bettercap.service Environment=LD_PRELOAD=/usr/local/lib/libpcap.so.1 Environment=LD_LIBRARY_PATH=/usr/local/lib Type=simple -ExecStart=/usr/local/bin/pwngrid -keys /etc/pwnagotchi -peers /root/peers -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /home/pi/logs/pwngrid-peer.log -iface wlan0mon +ExecStart=/usr/local/bin/pwngrid -keys /etc/pwnagotchi -peers /root/peers -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /etc/pwnagotchi/log/pwngrid-peer.log -iface wlan0mon Restart=always RestartSec=30 diff --git a/builder/data/64bit/pwnagotchi.json.pkr.hcl b/builder/data/64bit/raspberrypi64.json.pkr.hcl similarity index 100% rename from builder/data/64bit/pwnagotchi.json.pkr.hcl rename to builder/data/64bit/raspberrypi64.json.pkr.hcl diff --git a/pwnagotchi/defaults.toml b/pwnagotchi/defaults.toml index 809f573e..ddfcc9e0 100644 --- a/pwnagotchi/defaults.toml +++ b/pwnagotchi/defaults.toml @@ -114,7 +114,7 @@ main.no_restart = false main.filter = "" -main.log.path = "/var/log/pwnagotchi.log" +main.log.path = "/etc/pwnagotchi/log/pwnagotchi.log" main.log.rotation.enabled = true main.log.rotation.size = "10M" @@ -217,7 +217,7 @@ bettercap.silence = [ fs.memory.enabled = true fs.memory.mounts.log.enabled = true -fs.memory.mounts.log.mount = "/var/log/" +fs.memory.mounts.log.mount = "/etc/pwnagotchi/log/" fs.memory.mounts.log.size = "50M" fs.memory.mounts.log.sync = 60 fs.memory.mounts.log.zram = true