🏅 Sync 2026-06-21 00:00:08

This commit is contained in:
github-actions[bot] committed 2026-06-21 00:00:08 +08:00
1 parent 9ff3bb86e7
commit bfbb67fdfb
9 files changed
+44 -30

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gecoosac
PKG_VERSION:=2.2.20251015
PKG_RELEASE:=10
PKG_RELEASE:=11
ifeq ($(ARCH),aarch64)
PKG_ARCH:=ac_linux_arm64
+3 -3
View File
@@ -6,9 +6,9 @@ config gecoosac 'config'
option https '0'
option crt_file '/etc/gecoosac/tls/gecoosac.crt'
option key_file '/etc/gecoosac/tls/gecoosac.key'
option upload_dir '/tmp/gecoosac/upload/'
option db_dir '/etc/gecoosac/'
option piddir '/var/run/'
option upload_dir '/tmp/gecoosac/upload'
option db_dir '/etc/gecoosac'
option piddir '/var/run'
option lang 'zh'
option debug '0'
option showtip '0'
+6 -6
View File
@@ -10,11 +10,11 @@ START=90
STOP=10
PROG=/usr/bin/gecoosac
DEFAULT_DB_DIR=/etc/gecoosac/
DEFAULT_UPLOAD_DIR=/tmp/gecoosac/upload/
DEFAULT_DB_DIR=/etc/gecoosac
DEFAULT_UPLOAD_DIR=/tmp/gecoosac/upload
DEFAULT_CRT_FILE=/etc/gecoosac/tls/gecoosac.crt
DEFAULT_KEY_FILE=/etc/gecoosac/tls/gecoosac.key
DEFAULT_PID_DIR=/var/run/
DEFAULT_PID_DIR=/var/run
DEFAULT_LANG=zh
CERT_TIMEOUT=60
@@ -282,19 +282,19 @@ generate_default_cert() {
normalize_conf() {
if is_safe_upload_dir "$upload_dir"; then
upload_dir="$(normalize_path "$upload_dir")/"
upload_dir="$(normalize_path "$upload_dir")"
else
upload_dir="$DEFAULT_UPLOAD_DIR"
fi
if is_safe_db_dir "$db_dir" "$upload_dir"; then
db_dir="$(normalize_path "$db_dir")/"
db_dir="$(normalize_path "$db_dir")"
else
db_dir="$DEFAULT_DB_DIR"
fi
is_abs_path "$crt_file" || crt_file="$DEFAULT_CRT_FILE"
is_abs_path "$key_file" || key_file="$DEFAULT_KEY_FILE"
if is_safe_pid_dir "$piddir" "$upload_dir"; then
piddir="$(normalize_path "$piddir")/"
piddir="$(normalize_path "$piddir")"
else
piddir="$DEFAULT_PID_DIR"
fi
+5 -5
View File
@@ -1,11 +1,11 @@
#!/bin/sh
changed=0
DEFAULT_DB_DIR=/etc/gecoosac/
DEFAULT_UPLOAD_DIR=/tmp/gecoosac/upload/
DEFAULT_DB_DIR=/etc/gecoosac
DEFAULT_UPLOAD_DIR=/tmp/gecoosac/upload
DEFAULT_CRT_FILE=/etc/gecoosac/tls/gecoosac.crt
DEFAULT_KEY_FILE=/etc/gecoosac/tls/gecoosac.key
DEFAULT_PID_DIR=/var/run/
DEFAULT_PID_DIR=/var/run
OLD_CRT_FILE=/etc/gecoosac/tls/1.crt
OLD_KEY_FILE=/etc/gecoosac/tls/1.key
@@ -132,7 +132,7 @@ normalize_upload_dir() {
[ -n "$upload_dir" ] || return 0
if is_safe_upload_dir "$upload_dir"; then
normalized="$(normalize_path "$upload_dir")/"
normalized="$(normalize_path "$upload_dir")"
else
normalized="$DEFAULT_UPLOAD_DIR"
fi
@@ -154,7 +154,7 @@ normalize_dir_option() {
[ -n "$upload_dir" ] || upload_dir="$DEFAULT_UPLOAD_DIR"
if "$validator" "$value" "$upload_dir"; then
normalized="$(normalize_path "$value")/"
normalized="$(normalize_path "$value")"
else
normalized="$default"
fi