🗃️ Committing everything that changed 🗃️

rootfs/tmp/etc/nginx/nginx.conf
rootfs/usr/local/bin/entrypoint.sh
rootfs/usr/local/etc/docker/init.d/99-nginx.sh
This commit is contained in:
casjay 2024-08-17 19:41:26 -04:00
parent 28d3b28cb3
commit 43a85f16ca
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145
3 changed files with 12 additions and 15 deletions

View File

@ -33,14 +33,20 @@ http {
location /health { location /health {
default_type text/plain; default_type text/plain;
return 200 'ok'; return 200 'ok';
access_log off;
log_not_found on;
} }
location /health/text { location /health/text {
default_type text/plain; default_type text/plain;
return 200 'ok'; return 200 'ok';
access_log off;
log_not_found on;
} }
location /health/json { location /health/json {
default_type application/json; default_type application/json;
return 200 '{"status":"ok","message":"running"}'; return 200 '{"status":"ok","message":"running"}';
access_log off;
log_not_found on;
} }
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
@ -74,18 +80,9 @@ http {
} }
location / { location / {
proxy_set_header Host $host; root REPLACE_SERVER_WWW_DIR;
proxy_set_header X-Real-IP $remote_addr; access_log on;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; log_not_found on;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_pass http://127.0.0.1:8000/;
} }
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
include /etc/nginx/vhosts.d/*.conf;
} }
} }

View File

@ -88,8 +88,8 @@ WEB_SERVER_PORT="" # port : 80,443
SERVER_PORTS="" # specifiy other ports SERVER_PORTS="" # specifiy other ports
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Server directories # Server directories
WWW_ROOT_DIR="" # set default web dir WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}" # set default web dir
DATABASE_DIR="" # set database dir DATABASE_DIR="${DATABASE_DIR:-/data/db/${DBTYPE:-sqlite}}" # set database dir
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Healthcheck variables # Healthcheck variables
HEALTH_ENABLED="yes" # enable healthcheck [yes/no] HEALTH_ENABLED="yes" # enable healthcheck [yes/no]

View File

@ -73,7 +73,7 @@ DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}"
DATABASE_DIR="${DATABASE_DIR_NGINX:-$DATABASE_BASE_DIR/sqlite}" DATABASE_DIR="${DATABASE_DIR_NGINX:-$DATABASE_BASE_DIR/sqlite}"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Set webroot # Set webroot
WWW_ROOT_DIR="/usr/share/httpd/stikked" WWW_ROOT_DIR="/usr/share/httpd/default"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Default predefined variables # Default predefined variables
DATA_DIR="/data/nginx" # set data directory DATA_DIR="/data/nginx" # set data directory