diff --git a/Dockerfile b/Dockerfile index 69b4079..601f91e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ MAINTAINER deepzz RUN apk update RUN apk add ca-certificates +RUN echo "Asia/Shanghai" > /etc/timezone COPY . /eiblog EXPOSE 9000 diff --git a/conf/es/plugins/ik1.10.0/commons-codec-1.9.jar b/conf/es/plugins/ik1.10.1/commons-codec-1.9.jar similarity index 100% rename from conf/es/plugins/ik1.10.0/commons-codec-1.9.jar rename to conf/es/plugins/ik1.10.1/commons-codec-1.9.jar diff --git a/conf/es/plugins/ik1.10.0/commons-logging-1.2.jar b/conf/es/plugins/ik1.10.1/commons-logging-1.2.jar similarity index 100% rename from conf/es/plugins/ik1.10.0/commons-logging-1.2.jar rename to conf/es/plugins/ik1.10.1/commons-logging-1.2.jar diff --git a/conf/es/plugins/ik1.10.0/config/IKAnalyzer.cfg.xml b/conf/es/plugins/ik1.10.1/config/IKAnalyzer.cfg.xml similarity index 100% rename from conf/es/plugins/ik1.10.0/config/IKAnalyzer.cfg.xml rename to conf/es/plugins/ik1.10.1/config/IKAnalyzer.cfg.xml diff --git a/conf/es/plugins/ik1.10.0/config/custom/ext_stopword.dic b/conf/es/plugins/ik1.10.1/config/custom/ext_stopword.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/custom/ext_stopword.dic rename to conf/es/plugins/ik1.10.1/config/custom/ext_stopword.dic diff --git a/conf/es/plugins/ik1.10.0/config/custom/mydict.dic b/conf/es/plugins/ik1.10.1/config/custom/mydict.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/custom/mydict.dic rename to conf/es/plugins/ik1.10.1/config/custom/mydict.dic diff --git a/conf/es/plugins/ik1.10.0/config/custom/single_word.dic b/conf/es/plugins/ik1.10.1/config/custom/single_word.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/custom/single_word.dic rename to conf/es/plugins/ik1.10.1/config/custom/single_word.dic diff --git a/conf/es/plugins/ik1.10.0/config/custom/single_word_full.dic b/conf/es/plugins/ik1.10.1/config/custom/single_word_full.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/custom/single_word_full.dic rename to conf/es/plugins/ik1.10.1/config/custom/single_word_full.dic diff --git a/conf/es/plugins/ik1.10.0/config/custom/single_word_low_freq.dic b/conf/es/plugins/ik1.10.1/config/custom/single_word_low_freq.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/custom/single_word_low_freq.dic rename to conf/es/plugins/ik1.10.1/config/custom/single_word_low_freq.dic diff --git a/conf/es/plugins/ik1.10.0/config/custom/sougou.dic b/conf/es/plugins/ik1.10.1/config/custom/sougou.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/custom/sougou.dic rename to conf/es/plugins/ik1.10.1/config/custom/sougou.dic diff --git a/conf/es/plugins/ik1.10.0/config/main.dic b/conf/es/plugins/ik1.10.1/config/main.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/main.dic rename to conf/es/plugins/ik1.10.1/config/main.dic diff --git a/conf/es/plugins/ik1.10.0/config/preposition.dic b/conf/es/plugins/ik1.10.1/config/preposition.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/preposition.dic rename to conf/es/plugins/ik1.10.1/config/preposition.dic diff --git a/conf/es/plugins/ik1.10.0/config/quantifier.dic b/conf/es/plugins/ik1.10.1/config/quantifier.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/quantifier.dic rename to conf/es/plugins/ik1.10.1/config/quantifier.dic diff --git a/conf/es/plugins/ik1.10.0/config/stopword.dic b/conf/es/plugins/ik1.10.1/config/stopword.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/stopword.dic rename to conf/es/plugins/ik1.10.1/config/stopword.dic diff --git a/conf/es/plugins/ik1.10.0/config/suffix.dic b/conf/es/plugins/ik1.10.1/config/suffix.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/suffix.dic rename to conf/es/plugins/ik1.10.1/config/suffix.dic diff --git a/conf/es/plugins/ik1.10.0/config/surname.dic b/conf/es/plugins/ik1.10.1/config/surname.dic similarity index 100% rename from conf/es/plugins/ik1.10.0/config/surname.dic rename to conf/es/plugins/ik1.10.1/config/surname.dic diff --git a/conf/es/plugins/ik1.10.0/elasticsearch-analysis-ik-1.10.0.jar b/conf/es/plugins/ik1.10.1/elasticsearch-analysis-ik-1.10.1.jar similarity index 85% rename from conf/es/plugins/ik1.10.0/elasticsearch-analysis-ik-1.10.0.jar rename to conf/es/plugins/ik1.10.1/elasticsearch-analysis-ik-1.10.1.jar index bbc5c32..70e9759 100644 Binary files a/conf/es/plugins/ik1.10.0/elasticsearch-analysis-ik-1.10.0.jar and b/conf/es/plugins/ik1.10.1/elasticsearch-analysis-ik-1.10.1.jar differ diff --git a/conf/es/plugins/ik1.10.0/httpclient-4.5.2.jar b/conf/es/plugins/ik1.10.1/httpclient-4.5.2.jar similarity index 100% rename from conf/es/plugins/ik1.10.0/httpclient-4.5.2.jar rename to conf/es/plugins/ik1.10.1/httpclient-4.5.2.jar diff --git a/conf/es/plugins/ik1.10.0/httpcore-4.4.4.jar b/conf/es/plugins/ik1.10.1/httpcore-4.4.4.jar similarity index 100% rename from conf/es/plugins/ik1.10.0/httpcore-4.4.4.jar rename to conf/es/plugins/ik1.10.1/httpcore-4.4.4.jar diff --git a/conf/es/plugins/ik1.10.0/plugin-descriptor.properties b/conf/es/plugins/ik1.10.1/plugin-descriptor.properties similarity index 98% rename from conf/es/plugins/ik1.10.0/plugin-descriptor.properties rename to conf/es/plugins/ik1.10.1/plugin-descriptor.properties index 9d2696d..eb710e5 100644 --- a/conf/es/plugins/ik1.10.0/plugin-descriptor.properties +++ b/conf/es/plugins/ik1.10.1/plugin-descriptor.properties @@ -34,7 +34,7 @@ description=IK Analyzer for Elasticsearch # # 'version': plugin's version -version=1.10.0 +version=1.10.1 # # 'name': the plugin name name=analysis-ik @@ -68,7 +68,7 @@ java.version=1.7 # elasticsearch release. This version is checked when the plugin # is loaded so Elasticsearch will refuse to start in the presence of # plugins with the incorrect elasticsearch.version. -elasticsearch.version=2.4.0 +elasticsearch.version=2.4.1 # ### deprecated elements for jvm plugins : # diff --git a/conf/nginx/domain/deepzz.conf b/conf/nginx/domain/deepzz.conf index f4a0429..3f5b893 100644 --- a/conf/nginx/domain/deepzz.conf +++ b/conf/nginx/domain/deepzz.conf @@ -103,7 +103,7 @@ server { proxy_set_header Host deepzz.com; proxy_set_header X-Real_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-XSS-Protection 1; mode=block; + proxy_set_header X-XSS-Protection "1; mode=block"; proxy_pass http://127.0.0.1:9000; }