Merge pull request #14 from vyloy/master

fix doSitemap bug

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Eiblog Changelog
 
-## v1.4.2 (2018-02-09)
+## v1.4.4 (2018-05-07)
+* 修复基础评论分钟数计算错误
+* let's encrypt v2证书内嵌ct，故移除有关ct内容
+
+## v1.4.3 (2018-02-09)
 * 修复博客初始化后，about 页面不能够评论 #6
 * 修复编辑专题，按钮显示“添加专题”错误
 * 优化“添加文章”从同步改为异步推送：feed，es，disqus。速度显著提升
@@ -8,6 +12,9 @@
 * docker-compose.yml mongodb 去掉端口映射，防止用户将端口暴露至外网
 * session key 每次重启随机生成等一些细节的修复
 
+## v1.4.2 (2018-01-25)
+* fix archive page bug
+
 ## v1.4.1 (2018-01-14)
 * 修复创建新文章，disqus 不收录bug
 * 修复创建新文章，归档页面不刷新bug

Makefile

@@ -26,7 +26,7 @@ dist:
 gencert:makedir
 	@if [ ! -n "$(sans)" ]; then \
 		printf "Need one argument [sans=params]\n"; \
-		printf "example: sans=\"-d domain -d domain\"\n"; \
+		printf "example: sans=\"-d domain -d *.domain\"\n"; \
 		exit 1; \
 	fi; \
 	if [ ! -n "$(cn)" ]; then \
@@ -39,22 +39,18 @@ gencert:makedir
 	fi
 
 	@echo "generate rsa cert..."
-	@$(acme.sh) --force --issue --dns dns_ali $(sans) --log \
-		--renew-hook "ct-submit ctlog-gen2.api.venafi.com < $(config)/ssl/domain.rsa.pem > $(config)/scts/rsa/venafi.sct \
-		&& ct-submit ctlog.wosign.com < $(config)/ssl/domain.rsa.pem > $(config)/scts/rsa/wosign.sct"
-	@$(acme.sh) --install-cert -d $(cn) \
-		--key-file       $(config)/ssl/domain.rsa.key \
-		--fullchain-file $(config)/ssl/domain.rsa.pem \
-		--reloadcmd      "service nginx force-reload"
+	@$(acme.sh) --force --issue --dns dns_ali $(sans) \
+		--renew-hook "$(acme.sh) --install-cert -d $(cn) \
+			--key-file       $(config)/ssl/domain.rsa.key \
+			--fullchain-file $(config)/ssl/domain.rsa.pem \
+			--reloadcmd      \"service nginx force-reload\""
 
 	@echo "generate ecc cert..."
-	@$(acme.sh) --force --issue --dns dns_ali $(sans) -k ec-256 --log \
-		--renew-hook "ct-submit ctlog-gen2.api.venafi.com < $(config)/ssl/domain.ecc.pem > $(config)/scts/ecc/venafi.sct \
-		&& ct-submit ctlog.wosign.com < $(config)/ssl/domain.ecc.pem > $(config)/scts/ecc/wosign.sct"
-	@$(acme.sh) --install-cert -d $(cn) --ecc \
-		--key-file       $(config)/ssl/domain.ecc.key \
-		--fullchain-file $(config)/ssl/domain.ecc.pem \
-		--reloadcmd      "service nginx force-reload"
+	@$(acme.sh) --force --issue --dns dns_ali $(sans) -k ec-256 \
+		--renew-hook "$(acme.sh) --install-cert -d $(cn) --ecc \
+			--key-file       $(config)/ssl/domain.ecc.key \
+			--fullchain-file $(config)/ssl/domain.ecc.pem \
+			--reloadcmd      \"service nginx force-reload\""
 
 dhparams:
 	@openssl dhparam -out $(config)/ssl/dhparams.pem 2048
@@ -63,7 +59,7 @@ ssticket:
 	@openssl rand 48 > $(config)/ssl/session_ticket.key
 
 makedir:
-	@mkdir -p $(config)/ssl $(config)/scts/rsa $(config)/scts/ecc
+	@mkdir -p $(config)/ssl
 
 clean:
 

README.md

@@ -86,6 +86,6 @@
 
 ### 成功搭建者博客
 
-* [https://razeen.me](https://razeen.me) - Razeen's Blog
+* [https://blog.netcj.com](https://blog.netcj.com) - Razeen's Blog
 
 如果你的博客使用`Eiblog`搭建，你可以在 [这里](https://github.com/eiblog/eiblog/issues/1) 提交网址。

conf/nginx/domain/eiblog.conf

@@ -9,9 +9,11 @@ server {
     # ip 黑名单
     include                      /data/eiblog/conf/nginx/ip.blacklist;
 
-    # 现在一般证书是内置的。letsencrypt 暂未
+    # letsencrypt v2已内置
     # https://imququ.com/post/certificate-transparency.html#toc-2
-    ssl_ct                       on;
+    #ssl_ct                       on;
+    #ssl_ct_static_scts           /data/eiblog/conf/scts/rsa/;
+    #ssl_ct_static_scts           /data/eiblog/conf/scts/ecc/;
 
     # 中间证书 + 根证书
     # https://imququ.com/post/why-can-not-turn-on-ocsp-stapling.html
@@ -20,10 +22,8 @@ server {
     # 站点证书 + 中间证书，私钥
     ssl_certificate              /data/eiblog/conf/ssl/domain.rsa.pem;
     ssl_certificate_key          /data/eiblog/conf/ssl/domain.rsa.key;
-    ssl_ct_static_scts           /data/eiblog/conf/scts/rsa/;
     # ssl_certificate              /data/eiblog/conf/ssl/domain.ecc.pem;
     # ssl_certificate_key          /data/eiblog/conf/ssl/domain.ecc.key;
-    # ssl_ct_static_scts           /data/eiblog/conf/scts/ecc/;
 
     # openssl dhparam -out dhparams.pem 2048
     # https://weakdh.org/sysadmin.html
@@ -105,7 +105,7 @@ server {
 
         proxy_set_header         Connection       "";
         proxy_set_header         Host             deepzz.com;
-        proxy_set_header         X-Real_IP        $remote_addr;
+        proxy_set_header         X-Real-IP        $remote_addr;
         proxy_set_header         X-Forwarded-For  $proxy_add_x_forwarded_for;
 
         proxy_pass               http://127.0.0.1:9000;

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

helper.go

@@ -125,7 +125,7 @@ func ConvertStr(str string) string {
 	} else if h := d*24 + h2 - h1; h > 1 || (h == 1 && mi2-mi1 >= 0) {
 		return fmt.Sprintf(HOURS_AGO, h)
 	} else if mi := h*60 + mi2 - mi1; mi > 1 || (mi == 1 && s2-s1 >= 0) {
-		return fmt.Sprintf(MINUTES_AGO, m)
+		return fmt.Sprintf(MINUTES_AGO, mi)
 	}
 	return JUST_NOW
 }

helper_test.go

@@ -44,15 +44,21 @@ func TestPickFirstImage(t *testing.T) {
 }
 
 func TestCovertStr(t *testing.T) {
+	now := time.Now().UTC()
 	testStr := []string{
-		time.Now().Format("2006-01-02T15:04:05"),
+		now.Format("2006-01-02T15:04:05"),
+		now.Add(-time.Second * 20).Format("2006-01-02T15:04:05"),
+		now.Add(-time.Minute).Format("2006-01-02T15:04:05"),
+		now.Add(-time.Minute * 2).Format("2006-01-02T15:04:05"),
+		now.Add(-time.Minute * 20).Format("2006-01-02T15:04:05"),
+		now.Add(-time.Hour).Format("2006-01-02T15:04:05"),
+		now.Add(-time.Hour * 2).Format("2006-01-02T15:04:05"),
+		now.Add(-time.Hour * 24).Format("2006-01-02T15:04:05"),
 	}
 
-	expectStr := []string{
-		JUST_NOW,
-	}
-
-	for i, v := range testStr {
-		assert.Equal(t, expectStr[i], ConvertStr(v))
+	time.Sleep(time.Second)
+	t.Log(now.Format("2006-01-02T15:04:05"))
+	for _, v := range testStr {
+		t.Log(v, ConvertStr(v))
 	}
 }

xml.go

@@ -83,7 +83,7 @@ func doSitemap() {
 		logd.Error(err)
 		return
 	}
-	time.AfterFunc(time.Hour*24, doFeed)
+	time.AfterFunc(time.Hour*24, doSitemap)
 }
 
 // 渲染 opensearch