diff --git a/openresty-manager/data/logs/.gitkeep b/openresty-manager/data/logs/.gitkeep new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/openresty-manager/data/logs/.gitkeep @@ -0,0 +1 @@ + diff --git a/openresty-manager/docker-compose.yml b/openresty-manager/docker-compose.yml index d87b1d4b..51e4f951 100644 --- a/openresty-manager/docker-compose.yml +++ b/openresty-manager/docker-compose.yml @@ -7,7 +7,7 @@ services: APP_PORT: 34567 web: - image: uusec/openresty-manager:1.6.2@sha256:855228289dc816e63aaf1bc3b7895dfa7dedd0baa1add75544e41f37da75b072 + image: uusec/openresty-manager:1.7.2@sha256:19e583563d66dc7facba8a66de52d378ecf0acf1fc79dbe3723f4a30cea2e89e hostname: openresty-manager_web_1 restart: on-failure ports: @@ -15,11 +15,12 @@ services: - 3443:443 volumes: - /etc/localtime:/etc/localtime:ro - - /var/run/docker.sock:/var/run/docker.sock - ${APP_DATA_DIR}/data/acme:/opt/om/acme - ${APP_DATA_DIR}/data/data:/opt/om/data - ${APP_DATA_DIR}/data/conf:/opt/om/nginx/conf + - ${APP_DATA_DIR}/data/logs:/opt/om/nginx/logs environment: + - OM_USE_HTTPS=no - NGINX_RESOLVER=resolver 127.0.0.11 valid=30s ipv6=off local=on; - PUID=1000 - PGID=1000 diff --git a/openresty-manager/hooks/pre-start b/openresty-manager/hooks/pre-start new file mode 100755 index 00000000..facf90bd --- /dev/null +++ b/openresty-manager/hooks/pre-start @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +set -euo pipefail + +APP_DATA_DIR="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)" + +# Ensure the new logs directory exists for apps updating from the old version that didn't have it +LOG_DATA_DIR="${APP_DATA_DIR}/data/logs" +[ ! -d "${LOG_DATA_DIR}" ] && mkdir -p "${LOG_DATA_DIR}" && chown 1000:1000 "${LOG_DATA_DIR}" + +exit 0 diff --git a/openresty-manager/umbrel-app.yml b/openresty-manager/umbrel-app.yml index 5a288f21..47afeed3 100644 --- a/openresty-manager/umbrel-app.yml +++ b/openresty-manager/umbrel-app.yml @@ -1,9 +1,9 @@ -manifestVersion: 1 +manifestVersion: 1.1 id: openresty-manager name: OpenResty Manager tagline: Expose your services easily and securely category: networking -version: "1.6.2" +version: "1.7.2" port: 34567 description: >- Expose your apps to the internet easily and securely. @@ -21,10 +21,9 @@ description: >- - Provide a beautiful, powerful, and easy-to-use web management UI - Free SSL support both for HTTP-01 and DNS-01 challenge or provide your own SSL certificates - - Provide some powerful security function, such as Access Control, HTTP Flood Protection, etc - - Easily create reverse proxy for your websites without knowing anything about OpenResty - - Advanced OpenResty configuration available for super users - - Support and inherit all powerful features of OpenResty + - Powerful security features, such as access control, denial-of-service attack protection, identity authentication + - Simplify host management, include UI frendly terminal and file manager for users + - Support application store, greatly reducing the difficulty of website building and container management developer: UUSEC website: https://om.uusec.com/ submitter: UUSEC @@ -37,16 +36,11 @@ gallery: - 3.jpg releaseNotes: >- New features and improvements in this release: - - Added new static webpage service and URL redirection functionality - - Added scheduled task feature to replace crontab for task management - - Added interface language customization supporting Chinese/English switching - - Upgraded geo-location database - - Enhanced CAPTCHA verification with additional image options - - Improved user interface and upgrading experience - - Added support for docker stack management - - Introduced an appstore for dockered applications - - Added web UI based host terminal and file manager - - Improved IPv6 compatibility and host version download speed + - Added authentication capabilities supporting OIDC and Basic Auth + - Implemented domain-based access control and rate limiting configurations + - Added access control function, supporting restrictions by geographic location or IP + - Implemented HTTP flood protection with human-machine verification + - Added support for Cache, GZIP, WebSocket, and SSE config for nginx sub-location Full release notes: https://github.com/Safe3/openresty-manager/releases