diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 56fdcbb..2d19d95 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,7 +19,7 @@ updates: - '*' - package-ecosystem: docker - directory: /nginx-core + directory: /nginx reviewers: - AliMD schedule: diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index dc2354b..0bdb153 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -29,6 +29,7 @@ jobs: max-parallel: 1 matrix: include: + - path: nginx - path: nginx-core - path: nginx-pwa - path: nginx-ws diff --git a/nginx-core/.dockerignore b/nginx-core/.dockerignore index 8a02ce7..41d1e72 100644 --- a/nginx-core/.dockerignore +++ b/nginx-core/.dockerignore @@ -1,3 +1,3 @@ * -!conf/ -!www/ +!etc/nginx/ +!var/www/ diff --git a/nginx-core/Dockerfile b/nginx-core/Dockerfile index e318852..9fe2c08 100644 --- a/nginx-core/Dockerfile +++ b/nginx-core/Dockerfile @@ -1,16 +1,14 @@ -FROM docker.io/library/nginx:1.25.3-alpine3.18 +FROM ghcr.io/alwatr/nginx:1.1.0 RUN apk add --no-cache curl HEALTHCHECK --interval=30s --timeout=3s --start-period=1s --retries=3 CMD curl -fso /dev/null http://localhost/server-info || exit 1 -RUN rm -rfv /etc/nginx/conf.d/* -COPY conf/ /etc/nginx/ -COPY www/ /var/www/ -RUN chmod a+rx /etc/nginx/entrypoint.sh /etc/nginx/entrypoint.d/*.sh +COPY etc/nginx/ /etc/nginx/ +COPY var/www/ /var/www/ +RUN ls -RlAhF /etc/nginx/ # Default environment for nginx template -# ENV NGINX_ACCESS_LOG="/var/log/nginx/access.log json" -ENV NGINX_ACCESS_LOG=off \ +ENV NGINX_ACCESS_LOG="/var/log/nginx/access.log json" \ NGINX_ERROR_LOG_LEVEL=notice \ NGINX_WORKER_CONNECTIONS=2048 \ NGINX_CLIENT_MAX_BODY_SIZE=10m \ @@ -37,18 +35,13 @@ ENV NGINX_ACCESS_LOG=off \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=1 \ NGINX_ENTRYPOINT_QUIET_LOGS="" -EXPOSE 80 -WORKDIR /var/www/html/ -ENTRYPOINT ["/etc/nginx/entrypoint.sh"] -CMD ["nginx", "-g", "daemon off;"] - ARG BUILD_REV ARG BUILD_DATE LABEL org.opencontainers.image.title="alwatr/nginx-core" \ org.opencontainers.image.description="High-performance, accelerated NGINX, optimized for serving static content. Enhanced and accelerated by Alwatr." \ - org.opencontainers.image.base.name="docker.io/library/nginx:1.25.3-alpine3.18" \ - org.opencontainers.image.version="1.0.0" \ - org.opencontainers.image.ref.name="1.0.0-nginx1.25.3-alpine" \ + org.opencontainers.image.base.name="ghcr.io/alwatr/nginx:1.1.0" \ + org.opencontainers.image.version="1.1.0-n1.25.3" \ + org.opencontainers.image.ref.name="1.1.0-n1.25.3-a3.18-slim" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REV} \ diff --git a/nginx-core/conf/entrypoint.d/30-cleanup-conf.sh b/nginx-core/etc/nginx/entrypoint.d/30-cleanup-conf.sh similarity index 100% rename from nginx-core/conf/entrypoint.d/30-cleanup-conf.sh rename to nginx-core/etc/nginx/entrypoint.d/30-cleanup-conf.sh diff --git a/nginx-core/conf/nginx.conf b/nginx-core/etc/nginx/nginx.conf similarity index 100% rename from nginx-core/conf/nginx.conf rename to nginx-core/etc/nginx/nginx.conf diff --git a/nginx-core/conf/templates/00-main.conf.template b/nginx-core/etc/nginx/templates/00-main.conf.template similarity index 100% rename from nginx-core/conf/templates/00-main.conf.template rename to nginx-core/etc/nginx/templates/00-main.conf.template diff --git a/nginx-core/conf/templates/10-event.conf.template b/nginx-core/etc/nginx/templates/10-event.conf.template similarity index 100% rename from nginx-core/conf/templates/10-event.conf.template rename to nginx-core/etc/nginx/templates/10-event.conf.template diff --git a/nginx-core/conf/templates/20-http-include.conf.template b/nginx-core/etc/nginx/templates/20-http-include.conf.template similarity index 100% rename from nginx-core/conf/templates/20-http-include.conf.template rename to nginx-core/etc/nginx/templates/20-http-include.conf.template diff --git a/nginx-core/conf/templates/http.d/00-main.conf.template b/nginx-core/etc/nginx/templates/http.d/00-main.conf.template similarity index 100% rename from nginx-core/conf/templates/http.d/00-main.conf.template rename to nginx-core/etc/nginx/templates/http.d/00-main.conf.template diff --git a/nginx-core/conf/templates/http.d/10-real-ip.conf.template b/nginx-core/etc/nginx/templates/http.d/10-real-ip.conf.template similarity index 100% rename from nginx-core/conf/templates/http.d/10-real-ip.conf.template rename to nginx-core/etc/nginx/templates/http.d/10-real-ip.conf.template diff --git a/nginx-core/conf/templates/http.d/20-log.conf.template b/nginx-core/etc/nginx/templates/http.d/20-log.conf.template similarity index 100% rename from nginx-core/conf/templates/http.d/20-log.conf.template rename to nginx-core/etc/nginx/templates/http.d/20-log.conf.template diff --git a/nginx-core/conf/templates/http.d/30-mime-types.conf.template b/nginx-core/etc/nginx/templates/http.d/30-mime-types.conf.template similarity index 100% rename from nginx-core/conf/templates/http.d/30-mime-types.conf.template rename to nginx-core/etc/nginx/templates/http.d/30-mime-types.conf.template diff --git a/nginx-core/conf/templates/http.d/40-map-expire.conf.template b/nginx-core/etc/nginx/templates/http.d/40-map-expire.conf.template similarity index 100% rename from nginx-core/conf/templates/http.d/40-map-expire.conf.template rename to nginx-core/etc/nginx/templates/http.d/40-map-expire.conf.template diff --git a/nginx-core/conf/templates/http.d/41-map-status-text.conf.template b/nginx-core/etc/nginx/templates/http.d/41-map-status-text.conf.template similarity index 100% rename from nginx-core/conf/templates/http.d/41-map-status-text.conf.template rename to nginx-core/etc/nginx/templates/http.d/41-map-status-text.conf.template diff --git a/nginx-core/conf/templates/http.d/50-temp-path.conf.template b/nginx-core/etc/nginx/templates/http.d/50-temp-path.conf.template similarity index 100% rename from nginx-core/conf/templates/http.d/50-temp-path.conf.template rename to nginx-core/etc/nginx/templates/http.d/50-temp-path.conf.template diff --git a/nginx-core/conf/templates/http.d/60-performance.conf.template b/nginx-core/etc/nginx/templates/http.d/60-performance.conf.template similarity index 100% rename from nginx-core/conf/templates/http.d/60-performance.conf.template rename to nginx-core/etc/nginx/templates/http.d/60-performance.conf.template diff --git a/nginx-core/conf/templates/http.d/70-request-limit.conf.template b/nginx-core/etc/nginx/templates/http.d/70-request-limit.conf.template similarity index 100% rename from nginx-core/conf/templates/http.d/70-request-limit.conf.template rename to nginx-core/etc/nginx/templates/http.d/70-request-limit.conf.template diff --git a/nginx-core/conf/templates/http.d/80-header.conf.template b/nginx-core/etc/nginx/templates/http.d/80-header.conf.template similarity index 100% rename from nginx-core/conf/templates/http.d/80-header.conf.template rename to nginx-core/etc/nginx/templates/http.d/80-header.conf.template diff --git a/nginx-core/conf/templates/location.d/10-error-page.conf.template b/nginx-core/etc/nginx/templates/location.d/10-error-page.conf.template similarity index 100% rename from nginx-core/conf/templates/location.d/10-error-page.conf.template rename to nginx-core/etc/nginx/templates/location.d/10-error-page.conf.template diff --git a/nginx-core/conf/templates/location.d/20-server-info.conf.template b/nginx-core/etc/nginx/templates/location.d/20-server-info.conf.template similarity index 100% rename from nginx-core/conf/templates/location.d/20-server-info.conf.template rename to nginx-core/etc/nginx/templates/location.d/20-server-info.conf.template diff --git a/nginx-core/conf/templates/location.d/30-secure.conf.template b/nginx-core/etc/nginx/templates/location.d/30-secure.conf.template similarity index 100% rename from nginx-core/conf/templates/location.d/30-secure.conf.template rename to nginx-core/etc/nginx/templates/location.d/30-secure.conf.template diff --git a/nginx-core/conf/templates/location.d/31-secure-wp.conf.skiped b/nginx-core/etc/nginx/templates/location.d/31-secure-wp.conf.skiped similarity index 100% rename from nginx-core/conf/templates/location.d/31-secure-wp.conf.skiped rename to nginx-core/etc/nginx/templates/location.d/31-secure-wp.conf.skiped diff --git a/nginx-core/conf/templates/location.d/40-force-domain.conf.template b/nginx-core/etc/nginx/templates/location.d/40-force-domain.conf.template similarity index 100% rename from nginx-core/conf/templates/location.d/40-force-domain.conf.template rename to nginx-core/etc/nginx/templates/location.d/40-force-domain.conf.template diff --git a/nginx-core/conf/templates/server/00-default.conf.template b/nginx-core/etc/nginx/templates/server/00-default.conf.template similarity index 100% rename from nginx-core/conf/templates/server/00-default.conf.template rename to nginx-core/etc/nginx/templates/server/00-default.conf.template diff --git a/nginx-core/www/_error.html b/nginx-core/var/www/_error.html similarity index 100% rename from nginx-core/www/_error.html rename to nginx-core/var/www/_error.html diff --git a/nginx-core/www/html/index.html b/nginx-core/var/www/html/index.html similarity index 100% rename from nginx-core/www/html/index.html rename to nginx-core/var/www/html/index.html diff --git a/nginx/.dockerignore b/nginx/.dockerignore new file mode 100644 index 0000000..33ce011 --- /dev/null +++ b/nginx/.dockerignore @@ -0,0 +1,2 @@ +* +!etc/nginx/ diff --git a/nginx/Dockerfile b/nginx/Dockerfile new file mode 100644 index 0000000..b9d6421 --- /dev/null +++ b/nginx/Dockerfile @@ -0,0 +1,28 @@ +FROM docker.io/library/nginx:1.25.3-alpine3.18-slim + +RUN rm -rfv /docker-entrypoint* /etc/nginx/conf.d/* /etc/nginx/nginx.conf /var/www/html /usr/share/nginx/html +COPY etc/nginx/ /etc/nginx/ +RUN chmod a+rx /etc/nginx/entrypoint.sh /etc/nginx/entrypoint.d/*.sh +RUN ls -RlAhF /etc/nginx/ + +EXPOSE 80 +STOPSIGNAL SIGQUIT +WORKDIR /var/www/html/ +ENTRYPOINT ["/etc/nginx/entrypoint.sh"] +CMD ["nginx", "-g", "daemon off;"] + +ARG BUILD_REV +ARG BUILD_DATE +LABEL org.opencontainers.image.title="alwatr/nginx" \ + org.opencontainers.image.description="NGINX web server slim (light), packaged by Alwatr." \ + org.opencontainers.image.base.name="docker.io/library/nginx:1.25.3-alpine3.18-slim" \ + org.opencontainers.image.version="1.1.0-n1.25.3" \ + org.opencontainers.image.ref.name="1.1.0-n1.25.3-a3.18-slim" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REV} \ + org.opencontainers.image.vendor="Alwatr" \ + org.opencontainers.image.source="https://github.com/Alwatr/nginx" \ + org.opencontainers.image.url="https://github.com/Alwatr/nginx" \ + org.opencontainers.image.documentation="https://github.com/Alwatr/nginx" \ + org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/nginx-core/conf/entrypoint.d/10-envsubst-on-templates.sh b/nginx/etc/nginx/entrypoint.d/10-envsubst-on-templates.sh similarity index 97% rename from nginx-core/conf/entrypoint.d/10-envsubst-on-templates.sh rename to nginx/etc/nginx/entrypoint.d/10-envsubst-on-templates.sh index d32b4c0..d88b86b 100755 --- a/nginx-core/conf/entrypoint.d/10-envsubst-on-templates.sh +++ b/nginx/etc/nginx/entrypoint.d/10-envsubst-on-templates.sh @@ -1,5 +1,4 @@ #!/bin/sh -# vim:sw=2:ts=2:sts=2:et set -e diff --git a/nginx-core/conf/entrypoint.d/20-tune-worker-processes.sh b/nginx/etc/nginx/entrypoint.d/20-tune-worker-processes.sh similarity index 100% rename from nginx-core/conf/entrypoint.d/20-tune-worker-processes.sh rename to nginx/etc/nginx/entrypoint.d/20-tune-worker-processes.sh diff --git a/nginx-core/conf/entrypoint.sh b/nginx/etc/nginx/entrypoint.sh similarity index 99% rename from nginx-core/conf/entrypoint.sh rename to nginx/etc/nginx/entrypoint.sh index d3be9d0..849a98b 100755 --- a/nginx-core/conf/entrypoint.sh +++ b/nginx/etc/nginx/entrypoint.sh @@ -2,7 +2,6 @@ set -e - entrypoint_log() { if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then echo "$@" diff --git a/original.bk/etc/init.d/nginx b/original.bk/etc/init.d/nginx new file mode 100755 index 0000000..524ae83 --- /dev/null +++ b/original.bk/etc/init.d/nginx @@ -0,0 +1,70 @@ +#!/sbin/openrc-run + +description="Nginx http and reverse proxy server" +extra_commands="checkconfig" +extra_started_commands="reload reopen upgrade" + +cfgfile=${cfgfile:-/etc/nginx/nginx.conf} +pidfile=/var/run/nginx.pid +command=/usr/sbin/nginx +command_args="-c $cfgfile" +required_files="$cfgfile" + +depend() { + need net + use dns logger netmount +} + +start_pre() { + $command $command_args -t -q +} + +checkconfig() { + ebegin "Checking $RC_SVCNAME configuration" + start_pre + eend $? +} + +reload() { + ebegin "Reloading $RC_SVCNAME configuration" + start_pre && start-stop-daemon --signal HUP --pidfile $pidfile + eend $? +} + +reopen() { + ebegin "Reopening $RC_SVCNAME log files" + start-stop-daemon --signal USR1 --pidfile $pidfile + eend $? +} + +upgrade() { + start_pre || return 1 + + ebegin "Upgrading $RC_SVCNAME binary" + + einfo "Sending USR2 to old binary" + start-stop-daemon --signal USR2 --pidfile $pidfile + + einfo "Sleeping 3 seconds before pid-files checking" + sleep 3 + + if [ ! -f $pidfile.oldbin ]; then + eerror "File with old pid ($pidfile.oldbin) not found" + return 1 + fi + + if [ ! -f $pidfile ]; then + eerror "New binary failed to start" + return 1 + fi + + einfo "Sleeping 3 seconds before WINCH" + sleep 3 ; start-stop-daemon --signal 28 --pidfile $pidfile.oldbin + + einfo "Sending QUIT to old binary" + start-stop-daemon --signal QUIT --pidfile $pidfile.oldbin + + einfo "Upgrade completed" + + eend $? "Upgrade failed" +} diff --git a/original.bk/etc/init.d/nginx-debug b/original.bk/etc/init.d/nginx-debug new file mode 100755 index 0000000..01d856c --- /dev/null +++ b/original.bk/etc/init.d/nginx-debug @@ -0,0 +1,70 @@ +#!/sbin/openrc-run + +description="Nginx http and reverse proxy server" +extra_commands="checkconfig" +extra_started_commands="reload reopen upgrade" + +cfgfile=${cfgfile:-/etc/nginx/nginx.conf} +pidfile=/var/run/nginx.pid +command=/usr/sbin/nginx-debug +command_args="-c $cfgfile" +required_files="$cfgfile" + +depend() { + need net + use dns logger netmount +} + +start_pre() { + $command $command_args -t -q +} + +checkconfig() { + ebegin "Checking $RC_SVCNAME configuration" + start_pre + eend $? +} + +reload() { + ebegin "Reloading $RC_SVCNAME configuration" + start_pre && start-stop-daemon --signal HUP --pidfile $pidfile + eend $? +} + +reopen() { + ebegin "Reopening $RC_SVCNAME log files" + start-stop-daemon --signal USR1 --pidfile $pidfile + eend $? +} + +upgrade() { + start_pre || return 1 + + ebegin "Upgrading $RC_SVCNAME binary" + + einfo "Sending USR2 to old binary" + start-stop-daemon --signal USR2 --pidfile $pidfile + + einfo "Sleeping 3 seconds before pid-files checking" + sleep 3 + + if [ ! -f $pidfile.oldbin ]; then + eerror "File with old pid ($pidfile.oldbin) not found" + return 1 + fi + + if [ ! -f $pidfile ]; then + eerror "New binary failed to start" + return 1 + fi + + einfo "Sleeping 3 seconds before WINCH" + sleep 3 ; start-stop-daemon --signal 28 --pidfile $pidfile.oldbin + + einfo "Sending QUIT to old binary" + start-stop-daemon --signal QUIT --pidfile $pidfile.oldbin + + einfo "Upgrade completed" + + eend $? "Upgrade failed" +} diff --git a/original.bk/etc/logrotate.d/nginx b/original.bk/etc/logrotate.d/nginx new file mode 100644 index 0000000..584335a --- /dev/null +++ b/original.bk/etc/logrotate.d/nginx @@ -0,0 +1,15 @@ +/var/log/nginx/*.log { + daily + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 nginx adm + sharedscripts + postrotate + if [ -f /var/run/nginx.pid ]; then + kill -USR1 `cat /var/run/nginx.pid` + fi + endscript +} diff --git a/original.bk/etc/nginx/conf.d/default.conf b/original.bk/etc/nginx/conf.d/default.conf new file mode 100644 index 0000000..ff2ced6 --- /dev/null +++ b/original.bk/etc/nginx/conf.d/default.conf @@ -0,0 +1,44 @@ +server { + listen 80; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} + diff --git a/original.bk/etc/nginx/fastcgi.conf b/original.bk/etc/nginx/fastcgi.conf new file mode 100644 index 0000000..091738c --- /dev/null +++ b/original.bk/etc/nginx/fastcgi.conf @@ -0,0 +1,26 @@ + +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/original.bk/etc/nginx/fastcgi_params b/original.bk/etc/nginx/fastcgi_params new file mode 100644 index 0000000..28decb9 --- /dev/null +++ b/original.bk/etc/nginx/fastcgi_params @@ -0,0 +1,25 @@ + +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/original.bk/etc/nginx/mime.types b/original.bk/etc/nginx/mime.types new file mode 100644 index 0000000..1c00d70 --- /dev/null +++ b/original.bk/etc/nginx/mime.types @@ -0,0 +1,99 @@ + +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/original.bk/etc/nginx/nginx.conf b/original.bk/etc/nginx/nginx.conf new file mode 100644 index 0000000..5e076aa --- /dev/null +++ b/original.bk/etc/nginx/nginx.conf @@ -0,0 +1,32 @@ + +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + 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 /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} diff --git a/original.bk/etc/nginx/scgi_params b/original.bk/etc/nginx/scgi_params new file mode 100644 index 0000000..6d4ce4f --- /dev/null +++ b/original.bk/etc/nginx/scgi_params @@ -0,0 +1,17 @@ + +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/original.bk/etc/nginx/uwsgi_params b/original.bk/etc/nginx/uwsgi_params new file mode 100644 index 0000000..09c732c --- /dev/null +++ b/original.bk/etc/nginx/uwsgi_params @@ -0,0 +1,17 @@ + +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;