From: Adam A.G. Shamblin <adam@vexingworkshop.com>
Date: Mon, 13 Jan 2020 01:30:06 +0000 (-0700)
Subject: Remove nginx.conf, no need
X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=0708a189fdbbe95f83626f36e253de95dba52497;p=letters.git

Remove nginx.conf, no need
---

diff --git a/Dockerfile b/Dockerfile
index 41f8358..53d498c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,5 +6,4 @@ RUN pelican content -s publishconf.py
 
 FROM nginx
 COPY --from=0 /build/output/ /usr/share/nginx/html/
-COPY conf/nginx.conf /etc/nginx/nginx.conf
 COPY conf/default.conf /etc/nginx/conf.d/default.conf
diff --git a/conf/nginx.conf b/conf/nginx.conf
deleted file mode 100644
index e4bad8d..0000000
--- a/conf/nginx.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-
-user  nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-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;
-}