From b9470fa14cdd9b1ba7080027746182aabd326884 Mon Sep 17 00:00:00 2001
From: deepzz0 <deepzz.qi@gmail.com>
Date: Sun, 9 Jul 2017 01:18:07 +0800
Subject: [PATCH] fix and update config

---
 .dockerignore                 | 1 +
 Dockerfile                    | 2 +-
 conf/nginx/domain/eiblog.conf | 2 +-
 docker-compose.yml            | 1 -
 front.go                      | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 662551b..3fa776d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,6 +4,7 @@ vendor
 setting
 docs
 static/*.*
+!static/favicon.ico
 **/.DS_Store
 Dockerfile
 glide.yaml
diff --git a/Dockerfile b/Dockerfile
index fa8b898..a420055 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,4 +7,4 @@ ADD static/tzdata/Shanghai /etc/localtime
 COPY . /eiblog
 EXPOSE 9000
 WORKDIR /eiblog
-ENTRYPOINT ["./eiblog"]
+CMD ["./eiblog"]
diff --git a/conf/nginx/domain/eiblog.conf b/conf/nginx/domain/eiblog.conf
index 4949f46..d9b7044 100644
--- a/conf/nginx/domain/eiblog.conf
+++ b/conf/nginx/domain/eiblog.conf
@@ -60,7 +60,7 @@ server {
     }
 
     # webmaster 站点验证相关
-    location ~* (robots\.txt|favicon\.ico|crossdomain\.xml|google4c90d18e696bdcf8\.html|BingSiteAuth\.xml)$ {
+    location ~* (google4c90d18e696bdcf8\.html|BingSiteAuth\.xml)$ {
         root                     /data/eiblog/static;
         expires                  1d;
     }
diff --git a/docker-compose.yml b/docker-compose.yml
index e0a6951..9e3a698 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,6 @@ services:
     volumes:
       - /data/eiblog/logdata:/eiblog/logdata
       - /data/eiblog/conf:/eiblog/conf
-      - /data/eiblog/static:/eiblog/static
     links:
       - elasticsearch
       - mongodb
diff --git a/front.go b/front.go
index dd7f9ea..e6c02a6 100644
--- a/front.go
+++ b/front.go
@@ -48,7 +48,6 @@ func BlackFilter(c *gin.Context) bool {
 
 // 重定向
 func Redirect(c *gin.Context) bool {
-	fmt.Println("scheme=======", c.Request.URL.Scheme)
 	if setting.Conf.Mode.EnableHttps && c.Request.ProtoMajor == 1 {
 		var port string
 		if strings.Contains(c.Request.Host, ":") {