feat: use emissary v2023.6.23-4217850

feat: use emissary v2023.6.23-4a58847
feat: use emissary v2023.6.23-4255940
2023-06-23 16:42:43 +00:00 · 2023-06-23 12:46:15 +00:00 · 2023-06-23 12:30:35 +00:00 · 2023-06-22 15:09:27 +00:00 · 2023-06-22 15:05:47 +00:00 · 2023-05-26 13:56:56 +00:00
4 changed files with 51 additions and 18 deletions
--- a/emissary_release.txt
+++ b/emissary_release.txt
@ -1 +1 @@
-v2023.4.21-541d30d
+v2023.6.23-4217850
--- a/misc/turris/omnia/uci-defaults/98-turris-omnia-uci-custom.sh
+++ b/misc/turris/omnia/uci-defaults/98-turris-omnia-uci-custom.sh
@ -0,0 +1,37 @@
+#/bin/sh
+
+set -e
+
+main() {
+    # Update default firewall ruleset
+    uci add firewall rule
+    uci set firewall.@rule[-1].name='Allow SSH on WAN'
+    uci set firewall.@rule[-1].src='wan'
+    uci set firewall.@rule[-1].proto='tcp'
+    uci set firewall.@rule[-1].dest_port='22'
+    uci set firewall.@rule[-1].target='ACCEPT'
+
+    uci add firewall rule
+    uci set firewall.@rule[-1].name='Allow HTTP on WAN'
+    uci set firewall.@rule[-1].src='wan'
+    uci set firewall.@rule[-1].proto='tcp'
+    uci set firewall.@rule[-1].dest_port='80'
+    uci set firewall.@rule[-1].target='ACCEPT'
+
+    uci add firewall rule
+    uci set firewall.@rule[-1].name='Allow HTTPS on WAN'
+    uci set firewall.@rule[-1].src='wan'
+    uci set firewall.@rule[-1].proto='tcp'
+    uci set firewall.@rule[-1].dest_port='443'
+    uci set firewall.@rule[-1].target='ACCEPT'
+
+    uci commit firewall
+    
+    # Disable DNS-rebind protection
+    uci set dhcp.@dnsmasq[0].rebind_protection='0'
+    uci commit dhcp
+
+    reload_config
+}
+
+main
--- a/misc/turris/omnia/uci-defaults/99-resize-disk.sh
+++ b/misc/turris/omnia/uci-defaults/99-resize-disk.sh
@ -1,25 +1,21 @@
 #!/bin/sh

-# set -eo pipefail
+set -eo pipefail

-# FLAG_FILE=/root/.disk_resized
+block info

-# if [ -f "$FLAG_FILE" ]; then
-#     exit
-# fi
+DISK=/dev/mmcblk0
+PARTITION="${DISK}p2"

-# DISK=/dev/mmcblk0
-# PARTITION="${DISK}p2"
+parted -s -a opt "$DISK" "resizepart 2 100%"

-# parted -s -a opt "$DISK" "resizepart 2 100%"
+FS_SIZE="$(unsquashfs -s "$PARTITION" | grep -o 'Filesystem size [0-9]* bytes' | grep -o '[0-9][0-9]*')"
+FS_OFFSET="$(expr '(' "$FS_SIZE" + 65535 ')' / 65536 '*' 65536)"
+LOOP_DEVICE="$(losetup -f --show -o "$FS_OFFSET" "$PARTITION")"

-# FS_SIZE="$(unsquashfs -s "$PARTITION" | grep -o 'Filesystem size [0-9]* bytes' | grep -o '[0-9][0-9]*')"
-# FS_OFFSET="$(expr '(' "$FS_SIZE" + 65535 ')' / 65536 '*' 65536)"
-# LOOP_DEVICE="$(losetup -f --show -o "$FS_OFFSET" "$PARTITION")"
+e2fsck -y -f "$LOOP_DEVICE"
+resize2fs "$LOOP_DEVICE"

-# e2fsck -y -f "$LOOP_DEVICE"
-# resize2fs "$LOOP_DEVICE"
+rm -f /etc/uci-defaults/99-resize-disk.sh

-# touch "$FLAG_FILE"
-
-# reboot
+reboot
--- a/targets/turris.mk
+++ b/targets/turris.mk
@ -5,7 +5,7 @@ turris: omnia
 omnia:
 	$(MAKE) \
 		ADDITIONAL_INSTALL="install-turris-omnia-uci-defaults" \
-		ADDITIONAL_OPENWRT_PACKAGES="losetup squashfs-tools-unsquashfs resize2fs e2fsprogs parted" \
+		ADDITIONAL_OPENWRT_PACKAGES="losetup squashfs-tools-unsquashfs resize2fs e2fsprogs parted block-mount" \
 		OPENWRT_TARGET="mvebu/cortexa9" \
 		EMISSARY_ARCH="armv7" \
 		OPENWRT_PROFILE="cznic_turris-omnia" \
Author	SHA1	Message	Date
Jenkins	3b981873cc	feat: use emissary v2023.6.23-4217850 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-06-23 16:42:43 +00:00
Jenkins	c7465dba27	feat: use emissary v2023.6.23-4a58847 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-06-23 12:46:15 +00:00
Jenkins	4a4232e358	feat: use emissary v2023.6.23-4255940 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-06-23 12:30:35 +00:00
Jenkins	250bf06367	feat: use emissary v2023.6.22-a5fbe3e Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-06-22 15:09:27 +00:00
Jenkins	3ca90a54a9	feat: use emissary v2023.6.22-8b5a97d Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-06-22 15:05:47 +00:00
Jenkins	58d1ffc9a2	feat: use emissary v2023.5.26-d73e027 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-26 13:56:56 +00:00
Jenkins	a7f3f2faea	feat: use emissary v2023.5.25-054744e Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-25 19:27:45 +00:00
Jenkins	6d0e693fc4	feat: use emissary v2023.5.24-58ef3b0 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-24 08:19:36 +00:00
Jenkins	68a1de079e	feat: use emissary v2023.5.24-e568092 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-24 08:01:26 +00:00
Jenkins	7f1472f21b	feat: use emissary v2023.5.23-ece97ef Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-23 18:48:19 +00:00
Jenkins	291ad94b15	feat: use emissary v2023.5.23-4311cf6 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-23 12:53:02 +00:00
Jenkins	4b181ec9e1	feat: use emissary v2023.4.26-6a976c0 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-26 14:00:14 +00:00
William Petit	81360c3fda	feat(turris,omnia): re-enable disk resizing Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-26 15:55:13 +02:00
William Petit	2cf46ed9a5	feat(turris,omnia): customize uci config All checks were successful arcad/emissary-firmware/pipeline/head This commit looks good Details	2023-04-25 14:04:38 +02:00
William Petit	df763ef49a	feat(turris,omnia): add uci-defaults scripts	2023-04-25 14:04:38 +02:00
Jenkins	9e153e38cb	feat: use emissary v2023.4.25-d188af8 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-25 11:57:47 +00:00
Jenkins	9214c097b3	feat: use emissary v2023.4.24-e975381 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-24 11:55:12 +00:00
Jenkins	2339bc3aa6	feat: use emissary v2023.4.24-0d03a70 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-24 10:27:28 +00:00
Jenkins	908a36896e	feat: use emissary v2023.4.21-64ea0e0 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-21 18:09:10 +00:00