update nginx
This commit is contained in:
@@ -79,13 +79,12 @@ require_regular_file() {
|
||||
|
||||
require_stack_files() {
|
||||
require_regular_file compose.yaml
|
||||
require_regular_file deploy/nginx/templates/bootstrap.conf.template
|
||||
require_regular_file deploy/nginx/templates/http.conf.template
|
||||
require_regular_file deploy/nginx/templates/tls.conf.template
|
||||
if [[ "$SSL_MODE" == "none" ]]; then
|
||||
require_regular_file compose.http.yaml
|
||||
require_regular_file deploy/nginx/templates/http.conf.template
|
||||
else
|
||||
require_regular_file compose.tls.yaml
|
||||
require_regular_file deploy/nginx/templates/tls.conf.template
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -198,7 +197,6 @@ prepare() {
|
||||
config/gitea/config \
|
||||
config/letsencrypt \
|
||||
config/letsencrypt/archive \
|
||||
config/nginx/sites \
|
||||
config/ssl \
|
||||
config/certbot-webroot \
|
||||
config/backups
|
||||
@@ -206,16 +204,6 @@ prepare() {
|
||||
if [[ "$(id -u)" == 0 ]]; then
|
||||
chown -R 1000:1000 config/broker config/gitea
|
||||
fi
|
||||
for template_name in bootstrap http tls; do
|
||||
if [[ -e "config/nginx/${template_name}.conf.template" ]]; then
|
||||
[[ -f "config/nginx/${template_name}.conf.template" ]] ||
|
||||
fail "config/nginx/${template_name}.conf.template must be a regular file"
|
||||
else
|
||||
install -m 0644 \
|
||||
"deploy/nginx/templates/${template_name}.conf.template" \
|
||||
"config/nginx/${template_name}.conf.template"
|
||||
fi
|
||||
done
|
||||
docker network inspect tapm-edge >/dev/null 2>&1 ||
|
||||
docker network create tapm-edge >/dev/null
|
||||
}
|
||||
@@ -392,13 +380,6 @@ renew)
|
||||
docker compose --profile tools run --rm certbot renew --quiet
|
||||
compose_stack exec nginx nginx -s reload
|
||||
;;
|
||||
reload-nginx)
|
||||
require_env
|
||||
prepare
|
||||
compose_stack up -d --force-recreate nginx
|
||||
compose_stack exec nginx nginx -t
|
||||
printf 'Nginx configuration was recreated and validated.\n'
|
||||
;;
|
||||
backup)
|
||||
require_env
|
||||
prepare
|
||||
@@ -439,7 +420,7 @@ broker-logs)
|
||||
compose_stack logs --tail=100 broker
|
||||
;;
|
||||
*)
|
||||
printf 'Usage: %s {prepare|bootstrap|configure-broker|rotate-cookie-secret|set-ssl|start|start-direct|create-admin|renew|reload-nginx|backup|status|diagnostics}\n' "$0"
|
||||
printf 'Usage: %s {prepare|bootstrap|configure-broker|rotate-cookie-secret|set-ssl|start|start-direct|create-admin|renew|backup|status|diagnostics}\n' "$0"
|
||||
exit 2
|
||||
;;
|
||||
esac
|
||||
|
||||
Reference in New Issue
Block a user