From fc7d9bacacfb4b5a4837395d3c4c7573da2f409f Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 7 Apr 2024 21:57:31 +0200 Subject: [PATCH] board/common: enable ttyd, web console app Signed-off-by: Joachim Wiberg --- board/common/nginx.conf | 10 ++++++++++ board/common/rootfs/etc/finit.d/available/ttyd.conf | 1 + board/common/rootfs/etc/finit.d/enabled/ttyd.conf | 1 + configs/aarch64_defconfig | 1 + configs/r2s_defconfig | 1 + configs/x86_64_defconfig | 1 + 6 files changed, 15 insertions(+) create mode 100644 board/common/rootfs/etc/finit.d/available/ttyd.conf create mode 120000 board/common/rootfs/etc/finit.d/enabled/ttyd.conf diff --git a/board/common/nginx.conf b/board/common/nginx.conf index 169ad179..c2759be5 100644 --- a/board/common/nginx.conf +++ b/board/common/nginx.conf @@ -41,6 +41,16 @@ http { root html; index index.html index.htm; } + + location ~ ^/console(.*)$ { + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_pass http://127.0.0.1:7681/$1; + } } server { diff --git a/board/common/rootfs/etc/finit.d/available/ttyd.conf b/board/common/rootfs/etc/finit.d/available/ttyd.conf new file mode 100644 index 00000000..da12f0ed --- /dev/null +++ b/board/common/rootfs/etc/finit.d/available/ttyd.conf @@ -0,0 +1 @@ +service [2345] ttyd login -- Web terminal daemon (ttyd) diff --git a/board/common/rootfs/etc/finit.d/enabled/ttyd.conf b/board/common/rootfs/etc/finit.d/enabled/ttyd.conf new file mode 120000 index 00000000..9d29291b --- /dev/null +++ b/board/common/rootfs/etc/finit.d/enabled/ttyd.conf @@ -0,0 +1 @@ +../available/ttyd.conf \ No newline at end of file diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index b60ca2d8..5c36c907 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -96,6 +96,7 @@ BR2_PACKAGE_TRACEROUTE=y BR2_PACKAGE_ULOGD=y BR2_PACKAGE_BASH_COMPLETION=y BR2_PACKAGE_SUDO=y +BR2_PACKAGE_TTYD=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_IRQBALANCE=y BR2_PACKAGE_KMOD_TOOLS=y diff --git a/configs/r2s_defconfig b/configs/r2s_defconfig index f5ebf9f9..da4a9258 100644 --- a/configs/r2s_defconfig +++ b/configs/r2s_defconfig @@ -108,6 +108,7 @@ BR2_PACKAGE_TRACEROUTE=y BR2_PACKAGE_ULOGD=y BR2_PACKAGE_BASH_COMPLETION=y BR2_PACKAGE_SUDO=y +BR2_PACKAGE_TTYD=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_IRQBALANCE=y BR2_PACKAGE_KMOD_TOOLS=y diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig index a944b94d..fa650477 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -91,6 +91,7 @@ BR2_PACKAGE_TRACEROUTE=y BR2_PACKAGE_ULOGD=y BR2_PACKAGE_BASH_COMPLETION=y BR2_PACKAGE_SUDO=y +BR2_PACKAGE_TTYD=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_IRQBALANCE=y BR2_PACKAGE_KMOD_TOOLS=y