Skip to content

Commit 7f7050d

Browse files
chemwolf6922chemwolf6922
authored
0.1.8 changes (#12)
* Update tui-app to 0.2.0 * Update tui-server to 0.2.0 * Replace libwebsockets with tiny-websocket * Replace openssl with wolfssl * Remove unused binaries in final build * Remove unused features in nginx
1 parent d98c0c2 commit 7f7050d

13 files changed

Lines changed: 140 additions & 37 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
# 0.1.8
2+
3+
## What's new
4+
5+
## Fixes
6+
7+
## Changes
8+
9+
* Update tui-app to 0.2.0
10+
* Update tui-server to 0.2.0
11+
* Replace libwebsockets with tiny-websocket
12+
* Replace openssl with wolfssl
13+
* Remove unused binaries in final build
14+
* Remove unused features in nginx
15+
116
# 0.1.7
217

318
## What's new

‎external/Config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ source "$BR2_EXTERNAL_TINY_WEBUI_PATH/package/libsodium-new/Config.in"
55
source "$BR2_EXTERNAL_TINY_WEBUI_PATH/package/tev-cpp/Config.in"
66
source "$BR2_EXTERNAL_TINY_WEBUI_PATH/package/tui-app/Config.in"
77
source "$BR2_EXTERNAL_TINY_WEBUI_PATH/package/tui-server/Config.in"
8+
source "$BR2_EXTERNAL_TINY_WEBUI_PATH/package/tiny-websocket/Config.in"
89

910
endmenu

‎external/configs/tiny-webui-arm64_defconfig‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,29 @@ BR2_INIT_NONE=y
1010
BR2_ROOTFS_MERGED_USR=y
1111
BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
1212
BR2_TARGET_TZ_INFO=y
13+
BR2_TARGET_TZ_ZONELIST="etcetera"
1314
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_TINY_WEBUI_PATH)/overlay"
1415
BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_TINY_WEBUI_PATH)/scripts/post-build.sh"
1516
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_TINY_WEBUI_PATH)/configs/busybox-fragment.config"
1617
BR2_PACKAGE_CA_CERTIFICATES=y
17-
BR2_PACKAGE_OPENSSL=y
18-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2 is not set
19-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 is not set
20-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2 is not set
21-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 is not set
22-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2 is not set
23-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_IDEA is not set
24-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_SEED is not set
25-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_DES is not set
26-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 is not set
27-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_WEAK_SSL is not set
28-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST is not set
29-
# BR2_PACKAGE_LIBOPENSSL_UNSECURE is not set
30-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_CMP is not set
18+
BR2_PACKAGE_WOLFSSL=y
19+
BR2_PACKAGE_LIBATOMIC_OPS=y
3120
BR2_PACKAGE_NGINX=y
32-
BR2_PACKAGE_NGINX_HTTP_GZIP_STATIC_MODULE=y
33-
BR2_PACKAGE_URANDOM_SCRIPTS=y
21+
# BR2_PACKAGE_NGINX_HTTP_SSI_MODULE is not set
22+
# BR2_PACKAGE_NGINX_HTTP_USERID_MODULE is not set
23+
# BR2_PACKAGE_NGINX_HTTP_AUTH_BASIC_MODULE is not set
24+
# BR2_PACKAGE_NGINX_HTTP_AUTOINDEX_MODULE is not set
25+
# BR2_PACKAGE_NGINX_HTTP_GEO_MODULE is not set
26+
# BR2_PACKAGE_NGINX_HTTP_SPLIT_CLIENTS_MODULE is not set
27+
# BR2_PACKAGE_NGINX_HTTP_REFERER_MODULE is not set
28+
# BR2_PACKAGE_NGINX_HTTP_FASTCGI_MODULE is not set
29+
# BR2_PACKAGE_NGINX_HTTP_UWSGI_MODULE is not set
30+
# BR2_PACKAGE_NGINX_HTTP_SCGI_MODULE is not set
31+
# BR2_PACKAGE_NGINX_HTTP_MEMCACHED_MODULE is not set
32+
# BR2_PACKAGE_NGINX_HTTP_EMPTY_GIF_MODULE is not set
33+
# BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE is not set
34+
# BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE is not set
35+
# BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE is not set
36+
# BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE is not set
37+
# BR2_PACKAGE_NGINX_HTTP_UPSTREAM_ZONE_MODULE is not set
3438
BR2_PACKAGE_S6=y

‎external/configs/tiny-webui-x64_defconfig‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,29 @@ BR2_INIT_NONE=y
1010
BR2_ROOTFS_MERGED_USR=y
1111
BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
1212
BR2_TARGET_TZ_INFO=y
13+
BR2_TARGET_TZ_ZONELIST="etcetera"
1314
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_TINY_WEBUI_PATH)/overlay"
1415
BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_TINY_WEBUI_PATH)/scripts/post-build.sh"
1516
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_TINY_WEBUI_PATH)/configs/busybox-fragment.config"
1617
BR2_PACKAGE_CA_CERTIFICATES=y
17-
BR2_PACKAGE_OPENSSL=y
18-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2 is not set
19-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 is not set
20-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2 is not set
21-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 is not set
22-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2 is not set
23-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_IDEA is not set
24-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_SEED is not set
25-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_DES is not set
26-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 is not set
27-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_WEAK_SSL is not set
28-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST is not set
29-
# BR2_PACKAGE_LIBOPENSSL_UNSECURE is not set
30-
# BR2_PACKAGE_LIBOPENSSL_ENABLE_CMP is not set
18+
BR2_PACKAGE_WOLFSSL=y
19+
BR2_PACKAGE_LIBATOMIC_OPS=y
3120
BR2_PACKAGE_NGINX=y
32-
BR2_PACKAGE_NGINX_HTTP_GZIP_STATIC_MODULE=y
33-
BR2_PACKAGE_URANDOM_SCRIPTS=y
21+
# BR2_PACKAGE_NGINX_HTTP_SSI_MODULE is not set
22+
# BR2_PACKAGE_NGINX_HTTP_USERID_MODULE is not set
23+
# BR2_PACKAGE_NGINX_HTTP_AUTH_BASIC_MODULE is not set
24+
# BR2_PACKAGE_NGINX_HTTP_AUTOINDEX_MODULE is not set
25+
# BR2_PACKAGE_NGINX_HTTP_GEO_MODULE is not set
26+
# BR2_PACKAGE_NGINX_HTTP_SPLIT_CLIENTS_MODULE is not set
27+
# BR2_PACKAGE_NGINX_HTTP_REFERER_MODULE is not set
28+
# BR2_PACKAGE_NGINX_HTTP_FASTCGI_MODULE is not set
29+
# BR2_PACKAGE_NGINX_HTTP_UWSGI_MODULE is not set
30+
# BR2_PACKAGE_NGINX_HTTP_SCGI_MODULE is not set
31+
# BR2_PACKAGE_NGINX_HTTP_MEMCACHED_MODULE is not set
32+
# BR2_PACKAGE_NGINX_HTTP_EMPTY_GIF_MODULE is not set
33+
# BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE is not set
34+
# BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE is not set
35+
# BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE is not set
36+
# BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE is not set
37+
# BR2_PACKAGE_NGINX_HTTP_UPSTREAM_ZONE_MODULE is not set
3438
BR2_PACKAGE_S6=y

‎external/overlay/etc/nginx/nginx.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ http {
4545
access_log syslog:server=unix:/dev/log,facility=local7,tag=nginx;
4646

4747
location /api {
48-
proxy_pass http://unix:/tmp/tui-server.sock:;
48+
proxy_pass http://unix:/tmp/tui-server.sock:/;
4949
proxy_http_version 1.1;
5050
proxy_set_header Upgrade $http_upgrade;
5151
proxy_set_header Connection "Upgrade";

‎external/overlay/etc/s6/nginx/run‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,11 @@ rm -f /var/cache/nginx
55
mkdir -p /var/cache
66
ln -s /tmp/nginx /var/cache/nginx
77

8+
# Wait for syslog socket to be ready
9+
while [ ! -S /dev/log ]; do
10+
sleep 0.1
11+
done
12+
13+
logger -t nginx "Starting nginx..."
14+
815
exec /sbin/nginx -c /etc/nginx/nginx.conf

‎external/overlay/etc/s6/tui-server/run‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/bin/sh
22

3+
# Wait for syslog socket to be ready
4+
while [ ! -S /dev/log ]; do
5+
sleep 0.1
6+
done
7+
8+
logger -t tui-server "Starting tui-server..."
9+
310
mkdir -p /root/data
411
rm -f /tmp/tui-server.sock
512
exec /bin/tui-server -d /root/data/tui.db -u /tmp/tui-server.sock

‎external/package/tiny-websocket/Config.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
config BR2_PACKAGE_TINY_WEBSOCKET
2+
bool "tiny-websocket"
3+
help
4+
Tiny WebSocket library

‎external/package/tiny-websocket/tiny-websocket.mk‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
################################################################################
2+
#
3+
# tiny-websocket
4+
#
5+
################################################################################
6+
7+
8+
TINY_WEBSOCKET_VERSION = 1.1.1
9+
TINY_WEBSOCKET_SITE = https://github.com/chemwolf6922/tiny-websocket
10+
TINY_WEBSOCKET_SITE_METHOD = git
11+
TINY_WEBSOCKET_GIT_SUBMODULES = YES
12+
TINY_WEBSOCKET_INSTALL_STAGING = YES
13+
TINY_WEBSOCKET_INSTALL_TARGET = YES
14+
15+
$(eval $(cmake-package))

‎external/package/tui-app/tui-app.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
TUI_APP_VERSION = 0.1.7
7+
TUI_APP_VERSION = 0.2.0
88
TUI_APP_SITE = https://github.com/tiny-webui/webapp.git
99
TUI_APP_SITE_METHOD = git
1010
TUI_APP_GIT_SUBMODULES = YES

0 commit comments

Comments
 (0)