From 32f5ae5d5e1034fbfe2905c990fe8a6ddc59b323 Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 19 Nov 2024 12:41:15 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile .env.scripts rootfs/root/docker/setup/03-files.sh rootfs/root/docker/setup/05-custom.sh rootfs/tmp/etc/nginx/fastcgi_params rootfs/tmp/etc/nginx/mime.types rootfs/tmp/etc/nginx/nginx.conf rootfs/tmp/etc/nginx/nginx.ssl.conf rootfs/tmp/etc/nginx/scgi_params rootfs/tmp/etc/nginx/uwsgi_params rootfs/tmp/etc/nginx/vhosts.d/default.conf.sample rootfs/tmp/etc/nginx/vhosts.d/default.ssl.sample --- .env.scripts | 24 ++--- Dockerfile | 25 +++-- rootfs/root/docker/setup/03-files.sh | 1 - rootfs/root/docker/setup/05-custom.sh | 1 + rootfs/tmp/etc/nginx/fastcgi_params | 26 ----- rootfs/tmp/etc/nginx/mime.types | 99 ------------------- rootfs/tmp/etc/nginx/nginx.conf | 88 ----------------- rootfs/tmp/etc/nginx/nginx.ssl.conf | 89 ----------------- rootfs/tmp/etc/nginx/scgi_params | 17 ---- rootfs/tmp/etc/nginx/uwsgi_params | 17 ---- .../etc/nginx/vhosts.d/default.conf.sample | 13 --- .../tmp/etc/nginx/vhosts.d/default.ssl.sample | 18 ---- 12 files changed, 21 insertions(+), 397 deletions(-) delete mode 100644 rootfs/tmp/etc/nginx/fastcgi_params delete mode 100644 rootfs/tmp/etc/nginx/mime.types delete mode 100644 rootfs/tmp/etc/nginx/nginx.conf delete mode 100644 rootfs/tmp/etc/nginx/nginx.ssl.conf delete mode 100644 rootfs/tmp/etc/nginx/scgi_params delete mode 100644 rootfs/tmp/etc/nginx/uwsgi_params delete mode 100644 rootfs/tmp/etc/nginx/vhosts.d/default.conf.sample delete mode 100644 rootfs/tmp/etc/nginx/vhosts.d/default.ssl.sample diff --git a/.env.scripts b/.env.scripts index 5568bf8..7cd4f53 100644 --- a/.env.scripts +++ b/.env.scripts @@ -10,7 +10,7 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Dockerfile info ENV_DOCKERFILE="Dockerfile" -ENV_IMAGE_NAME="pastebin" +ENV_IMAGE_NAME="stikked" ENV_USE_TEMPLATE="alpine" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Maintainer info @@ -20,16 +20,16 @@ ENV_AUTHOR="CasjaysDev" ENV_MAINTAINER="CasjaysDev " # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # REPO info -ENV_GIT_REPO_URL="https://github.com/casjaysdevdocker/pastebin" -ENV_REGISTRY_URL="https://hub.docker.com/r/casjaysdevdocker/pastebin" +ENV_GIT_REPO_URL="https://github.com/casjaysdevdocker/stikked" +ENV_REGISTRY_URL="https://hub.docker.com/r/casjaysdevdocker/stikked" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Push image info -ENV_IMAGE_PUSH="casjaysdevdocker/pastebin" +ENV_IMAGE_PUSH="casjaysdevdocker/stikked" ENV_IMAGE_TAG="latest" -ENV_ADD_TAGS="" +ENV_ADD_TAGS="USE_DATE" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Pull image info -ENV_PULL_URL="casjaysdev/alpine" +ENV_PULL_URL="casjaysdevdocker/nginx" ENV_DISTRO_TAG="${IMAGE_VERSION}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Env @@ -37,7 +37,7 @@ SERVICE_PORT="80" EXPOSE_PORTS="" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Versions -PHP_VERSION="php83" +PHP_VERSION="system" NODE_VERSION="system" NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -48,15 +48,7 @@ DEFAULT_DATA_DIR="/usr/local/share/template-files/data" DEFAULT_CONF_DIR="/usr/local/share/template-files/config" DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ENV_PACKAGES="\${PHP_VERSION}-bcmath \${PHP_VERSION}-bz2 \${PHP_VERSION}-calendar \${PHP_VERSION}-cgi \${PHP_VERSION}-common \${PHP_VERSION}-ctype \${PHP_VERSION}-curl \${PHP_VERSION}-dba \${PHP_VERSION}-dev \\ -\${PHP_VERSION}-doc \${PHP_VERSION}-dom \${PHP_VERSION}-embed \${PHP_VERSION}-enchant \${PHP_VERSION}-exif \${PHP_VERSION}-ffi \${PHP_VERSION}-fileinfo \${PHP_VERSION}-fpm \${PHP_VERSION}-ftp \${PHP_VERSION}-gd \${PHP_VERSION}-gettext \\ -\${PHP_VERSION}-gmp \${PHP_VERSION}-iconv \${PHP_VERSION}-imap \${PHP_VERSION}-intl \${PHP_VERSION}-ldap \${PHP_VERSION}-litespeed \${PHP_VERSION}-mbstring \${PHP_VERSION}-mysqli \${PHP_VERSION}-mysqlnd \${PHP_VERSION}-odbc \${PHP_VERSION}-opcache \\ -\${PHP_VERSION}-openssl \${PHP_VERSION}-pcntl \${PHP_VERSION}-pdo \${PHP_VERSION}-pdo_dblib \${PHP_VERSION}-pdo_mysql \${PHP_VERSION}-pdo_odbc \${PHP_VERSION}-pdo_pgsql \${PHP_VERSION}-pdo_sqlite \${PHP_VERSION}-pear \${PHP_VERSION}-pgsql \${PHP_VERSION}-phar\\ -\${PHP_VERSION}-phpdbg \${PHP_VERSION}-posix \${PHP_VERSION}-pspell \${PHP_VERSION}-session \${PHP_VERSION}-shmop \${PHP_VERSION}-simplexml \${PHP_VERSION}-snmp \${PHP_VERSION}-soap \${PHP_VERSION}-sockets \${PHP_VERSION}-sodium \${PHP_VERSION}-sqlite3 \${PHP_VERSION}-sysvmsg \\ -\${PHP_VERSION}-sysvsem \${PHP_VERSION}-sysvshm \${PHP_VERSION}-tidy \${PHP_VERSION}-tokenizer \${PHP_VERSION}-xml \${PHP_VERSION}-xmlreader \${PHP_VERSION}-xmlwriter \${PHP_VERSION}-xsl \${PHP_VERSION}-zip \${PHP_VERSION}-pecl-memcached \${PHP_VERSION}-pecl-mcrypt\\ -\${PHP_VERSION}-pecl-mongodb \${PHP_VERSION}-pecl-redis composer nginx nginx-mod-http-brotli nginx-mod-http-cache-purge nginx-mod-http-dav-ext nginx-mod-http-echo nginx-mod-http-encrypted-session nginx-mod-http-fancyindex nginx-mod-http-geoip nginx-mod-http-geoip2 \\ -nginx-mod-http-headers-more nginx-mod-http-image-filter nginx-mod-http-js nginx-mod-http-lua nginx-mod-http-perl nginx-mod-http-redis2 nginx-mod-http-set-misc nginx-mod-http-shibboleth nginx-mod-http-untar nginx-mod-http-upload-progress \\ -nginx-mod-http-upstream-fair nginx-mod-http-xslt-filter nginx-mod-http-zip" +ENV_PACKAGES="" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Other Variables ENV_ENTRYPOINT_HEALTH_APPS="" diff --git a/Dockerfile b/Dockerfile index d5d6683..8a41b9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ -# syntax=docker/dockerfile:1 -# Docker image for pastebin using the alpine template -ARG IMAGE_NAME="pastebin" -ARG PHP_SERVER="pastebin" +# Docker image for stikked using the alpine template +ARG IMAGE_NAME="stikked" +ARG PHP_SERVER="stikked" ARG BUILD_DATE="202408151738" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" @@ -16,15 +15,15 @@ ARG SHELL_OPTS="set -e -o pipefail" ARG SERVICE_PORT="80" ARG EXPOSE_PORTS="" -ARG PHP_VERSION="php82" +ARG PHP_VERSION="system" ARG NODE_VERSION="system" ARG NODE_MANAGER="system" -ARG IMAGE_REPO="casjaysdevdocker/pastebin" +ARG IMAGE_REPO="casjaysdevdocker/stikked" ARG IMAGE_VERSION="latest" -ARG CONTAINER_VERSION="" +ARG CONTAINER_VERSION="USE_DATE" -ARG PULL_URL="casjaysdevdocker/php" +ARG PULL_URL="casjaysdevdocker/nginx" ARG DISTRO_VERSION="8" ARG BUILD_VERSION="${BUILD_DATE}" @@ -61,7 +60,7 @@ ENV TZ="${TIMEZONE}" ENV TIMEZONE="${TZ}" ENV LANG="${LANGUAGE}" ENV TERM="xterm-256color" -ENV HOSTNAME="casjaysdevdocker-pastebin" +ENV HOSTNAME="casjaysdevdocker-stikked" USER ${USER} WORKDIR /root @@ -214,12 +213,12 @@ LABEL org.opencontainers.image.license="${LICENSE}" LABEL org.opencontainers.image.build-date="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/pastebin" -LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/pastebin" +LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/stikked" +LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/stikked" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}" -LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/pastebin" -LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/pastebin" +LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/stikked" +LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/stikked" LABEL com.github.containers.toolbox="false" ENV ENV=~/.bashrc diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh index a3e742a..8ada8dc 100755 --- a/rootfs/root/docker/setup/03-files.sh +++ b/rootfs/root/docker/setup/03-files.sh @@ -27,7 +27,6 @@ exitCode=0 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Predifined actions -rm -Rf /etc/php*/php-fpm* if [ -d "/tmp/bin" ]; then echo "Installing /tmp/bin to /usr/local/bin" chmod -Rf +x "/tmp/bin" diff --git a/rootfs/root/docker/setup/05-custom.sh b/rootfs/root/docker/setup/05-custom.sh index 95f7fb4..eb0dc67 100755 --- a/rootfs/root/docker/setup/05-custom.sh +++ b/rootfs/root/docker/setup/05-custom.sh @@ -30,6 +30,7 @@ WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Main script +[ -d "/etc/stikked" ] || mkdir -p "/etc/stikked" [ -d "$WWW_ROOT_DIR" ] || mkdir -p "$WWW_ROOT_DIR" git clone https://github.com/casjaydns/casjay.cc /tmp/stikked cp -Rf "/tmp/stikked/htdocs/." "$WWW_ROOT_DIR/" diff --git a/rootfs/tmp/etc/nginx/fastcgi_params b/rootfs/tmp/etc/nginx/fastcgi_params deleted file mode 100644 index aa8e19d..0000000 --- a/rootfs/tmp/etc/nginx/fastcgi_params +++ /dev/null @@ -1,26 +0,0 @@ -# Params for fastcgi -fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; -fastcgi_param QUERY_STRING $query_string; -fastcgi_param REQUEST_METHOD $request_method; -fastcgi_param CONTENT_TYPE $content_type; -fastcgi_param CONTENT_LENGTH $content_length; - -fastcgi_param SCRIPT_NAME $fastcgi_script_name; -fastcgi_param REQUEST_URI $request_uri; -fastcgi_param DOCUMENT_URI $document_uri; -fastcgi_param DOCUMENT_ROOT $document_root; -fastcgi_param SERVER_PROTOCOL $server_protocol; -fastcgi_param REQUEST_SCHEME $scheme; -fastcgi_param HTTPS $https if_not_empty; - -fastcgi_param GATEWAY_INTERFACE CGI/1.1; -fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; - -fastcgi_param REMOTE_ADDR $remote_addr; -fastcgi_param REMOTE_PORT $remote_port; -fastcgi_param SERVER_ADDR $server_addr; -fastcgi_param SERVER_PORT $server_port; -fastcgi_param SERVER_NAME $server_name; - -# PHP only, required if PHP was built with --enable-force-cgi-redirect -fastcgi_param REDIRECT_STATUS 200; diff --git a/rootfs/tmp/etc/nginx/mime.types b/rootfs/tmp/etc/nginx/mime.types deleted file mode 100644 index 1c00d70..0000000 --- a/rootfs/tmp/etc/nginx/mime.types +++ /dev/null @@ -1,99 +0,0 @@ - -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/avif avif; - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/wasm wasm; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/rootfs/tmp/etc/nginx/nginx.conf b/rootfs/tmp/etc/nginx/nginx.conf deleted file mode 100644 index 7361a11..0000000 --- a/rootfs/tmp/etc/nginx/nginx.conf +++ /dev/null @@ -1,88 +0,0 @@ -# Default nginx configuration docker containers - -user REPLACE_WWW_USER; -worker_processes auto; -daemon on; -error_log REPLACE_LOG_DIR/nginx.log warn; -pid REPLACE_RUN_DIR/nginx.pid; -events { worker_connections 1024; } - -http { - include REPLACE_ETC_DIR/mime.types; - default_type "text/html"; - sendfile on; - keepalive_timeout 65; - gzip on; - map $http_upgrade $connection_upgrade { default upgrade; '' close; } - disable_symlinks off; - access_log REPLACE_LOG_DIR/access.log combined; - - server { - listen 0.0.0.0:80 default_server; - server_name REPLACE_SERVER_NAME; - client_max_body_size 0; - proxy_intercept_errors off; - add_header X-Frame-Options "SAMEORIGIN" always; - add_header X-XSS-Protection "1; mode=block" always; - add_header X-Content-Type-Options "nosniff" always; - add_header Referrer-Policy "no-referrer-when-downgrade" always; - add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' 'unsafe-eval' *; frame-src 'self' *; object-src 'self'" always; - index index.php index.cgi index.pl index.aspx index.txt index.json index.html index.unknown.php index.default.php; - root /var/lib/nginx/html; - - location /health { - default_type text/plain; - return 200 'ok'; - access_log off; - log_not_found on; - } - location /health/text { - default_type text/plain; - return 200 'ok'; - access_log off; - log_not_found on; - } - location /health/json { - default_type application/json; - return 200 '{"status":"ok","message":"running"}'; - access_log off; - log_not_found on; - } - - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_param HTTP_PROXY ""; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_param SCRIPT_NAME $fastcgi_script_name; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param REQUEST_URI $request_uri; - fastcgi_param DOCUMENT_URI $document_uri; - fastcgi_param DOCUMENT_ROOT $document_root; - fastcgi_param SERVER_PROTOCOL $server_protocol; - fastcgi_param REQUEST_SCHEME $scheme; - fastcgi_param HTTPS $https if_not_empty; - fastcgi_param GATEWAY_INTERFACE CGI/1.1; - fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; - fastcgi_param REMOTE_ADDR $remote_addr; - fastcgi_param REMOTE_PORT $remote_port; - fastcgi_param SERVER_ADDR $server_addr; - fastcgi_param SERVER_PORT $server_port; - fastcgi_param SERVER_NAME $server_name; - fastcgi_param REDIRECT_STATUS 200; - } - - location / { - root REPLACE_SERVER_WWW_DIR; - access_log on; - log_not_found on; - } - } -} diff --git a/rootfs/tmp/etc/nginx/nginx.ssl.conf b/rootfs/tmp/etc/nginx/nginx.ssl.conf deleted file mode 100644 index 014e9db..0000000 --- a/rootfs/tmp/etc/nginx/nginx.ssl.conf +++ /dev/null @@ -1,89 +0,0 @@ -# nginx configuration for proxying - -user REPLACE_WWW_USER; -worker_processes auto; -daemon on; -error_log REPLACE_LOG_DIR/nginx.log warn; -pid REPLACE_RUN_DIR/nginx.pid; -events { worker_connections 1024; } - -http { - include REPLACE_ETC_DIR/mime.types; - default_type "text/html"; - sendfile on; - keepalive_timeout 65; - gzip on; - map $http_upgrade $connection_upgrade { default upgrade; '' close; } - disable_symlinks off; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log REPLACE_LOG_DIR/access.log main; - - server { - listen 0.0.0.0:80 default_server; - server_name REPLACE_SERVER_NAME; - client_max_body_size 0; - proxy_intercept_errors off; - add_header X-Frame-Options "SAMEORIGIN" always; - add_header X-XSS-Protection "1; mode=block" always; - add_header X-Content-Type-Options "nosniff" always; - add_header Referrer-Policy "no-referrer-when-downgrade" always; - add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' 'unsafe-eval' *; frame-src 'self' *; object-src 'self'" always; - index index.php index.cgi index.pl index.aspx index.txt index.json index.html index.unknown.php index.default.php; - root /var/lib/nginx/html; - - location /health { - default_type text/plain; - return 200 'ok'; - } - location /health/text { - default_type text/plain; - return 200 'ok'; - } - location /health/json { - default_type application/json; - return 200 '{"status":"ok","message":"running"}'; - } - - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - if (!-f $document_root$fastcgi_script_name) { return 404; } - fastcgi_param HTTP_PROXY ""; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_param SCRIPT_NAME $fastcgi_script_name; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param REQUEST_URI $request_uri; - fastcgi_param DOCUMENT_URI $document_uri; - fastcgi_param DOCUMENT_ROOT $document_root; - fastcgi_param SERVER_PROTOCOL $server_protocol; - fastcgi_param REQUEST_SCHEME $scheme; - fastcgi_param HTTPS $https if_not_empty; - fastcgi_param GATEWAY_INTERFACE CGI/1.1; - fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; - fastcgi_param REMOTE_ADDR $remote_addr; - fastcgi_param REMOTE_PORT $remote_port; - fastcgi_param SERVER_ADDR $server_addr; - fastcgi_param SERVER_PORT $server_port; - fastcgi_param SERVER_NAME $server_name; - fastcgi_param REDIRECT_STATUS 200; - } - - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - 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; -} diff --git a/rootfs/tmp/etc/nginx/scgi_params b/rootfs/tmp/etc/nginx/scgi_params deleted file mode 100644 index a602e48..0000000 --- a/rootfs/tmp/etc/nginx/scgi_params +++ /dev/null @@ -1,17 +0,0 @@ -# Params for scgi -scgi_param REQUEST_METHOD $request_method; -scgi_param REQUEST_URI $request_uri; -scgi_param QUERY_STRING $query_string; -scgi_param CONTENT_TYPE $content_type; - -scgi_param DOCUMENT_URI $document_uri; -scgi_param DOCUMENT_ROOT $document_root; -scgi_param SCGI 1; -scgi_param SERVER_PROTOCOL $server_protocol; -scgi_param REQUEST_SCHEME $scheme; -scgi_param HTTPS $https if_not_empty; - -scgi_param REMOTE_ADDR $remote_addr; -scgi_param REMOTE_PORT $remote_port; -scgi_param SERVER_PORT $server_port; -scgi_param SERVER_NAME $server_name; diff --git a/rootfs/tmp/etc/nginx/uwsgi_params b/rootfs/tmp/etc/nginx/uwsgi_params deleted file mode 100644 index 86401d6..0000000 --- a/rootfs/tmp/etc/nginx/uwsgi_params +++ /dev/null @@ -1,17 +0,0 @@ -# Params for uwsgi -uwsgi_param QUERY_STRING $query_string; -uwsgi_param REQUEST_METHOD $request_method; -uwsgi_param CONTENT_TYPE $content_type; -uwsgi_param CONTENT_LENGTH $content_length; - -uwsgi_param REQUEST_URI $request_uri; -uwsgi_param PATH_INFO $document_uri; -uwsgi_param DOCUMENT_ROOT $document_root; -uwsgi_param SERVER_PROTOCOL $server_protocol; -uwsgi_param REQUEST_SCHEME $scheme; -uwsgi_param HTTPS $https if_not_empty; - -uwsgi_param REMOTE_ADDR $remote_addr; -uwsgi_param REMOTE_PORT $remote_port; -uwsgi_param SERVER_PORT $server_port; -uwsgi_param SERVER_NAME $server_name; diff --git a/rootfs/tmp/etc/nginx/vhosts.d/default.conf.sample b/rootfs/tmp/etc/nginx/vhosts.d/default.conf.sample deleted file mode 100644 index 8a36c35..0000000 --- a/rootfs/tmp/etc/nginx/vhosts.d/default.conf.sample +++ /dev/null @@ -1,13 +0,0 @@ - server { - listen REPLACE_SERVER_PORT default_server; - server_name REPLACE_SERVER_NAME; - root REPLACE_SERVER_WWW_DIR; - index index.php index.cgi index.pl index.aspx index.txt index.json index.html index.unknown.php index.default.php; - proxy_intercept_errors off; - add_header X-Frame-Options "SAMEORIGIN" always; - add_header X-XSS-Protection "1; mode=block" always; - add_header X-Content-Type-Options "nosniff" always; - add_header Referrer-Policy "no-referrer-when-downgrade" always; - add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; - add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' 'unsafe-eval' *; frame-src 'self' *; object-src 'self'" always; - } diff --git a/rootfs/tmp/etc/nginx/vhosts.d/default.ssl.sample b/rootfs/tmp/etc/nginx/vhosts.d/default.ssl.sample deleted file mode 100644 index d33262f..0000000 --- a/rootfs/tmp/etc/nginx/vhosts.d/default.ssl.sample +++ /dev/null @@ -1,18 +0,0 @@ - server { - listen ssl http2 REPLACE_SERVER_PORT; - server_name REPLACE_SERVER_NAME; - root REPLACE_SERVER_WWW_DIR; - index index.php index.cgi index.pl index.aspx awstats.pl index.txt index.json index.html index.unknown.php index.default.php; - proxy_intercept_errors off; - add_header X-Frame-Options "SAMEORIGIN" always; - add_header X-XSS-Protection "1; mode=block" always; - add_header X-Content-Type-Options "nosniff" always; - add_header Referrer-Policy "no-referrer-when-downgrade" always; - add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; - add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' 'unsafe-eval' *; frame-src 'self' *; object-src 'self'" always; - ssl_protocols TLSv1.2 TLSv1.3; - ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; - ssl_prefer_server_ciphers off; - ssl_certificate REPLACE_SSL_DIR/localhost.crt; - ssl_certificate_key REPLACE_SSL_DIR/localhost.key; - }