Merge branch 'master' of github.com:huifenqi/arch

Author: zhangbin

decisions/0037-use-proxy-for-white-list.md

@@ -57,17 +57,25 @@ server {
 	* 对 iptables 配置有要求；
 	* 目标域名对应的 ip 地址改变，需要更新配置。
 
+最终我们通过 aliyun slb 的4层负载接两台部署了 ss5 的机器提供高可用的代理服务
+
+* 4层（TCP协议）服务中，当前不支持添加进后端云服务器池的ECS既作为Real Server，又作为客户端向所在的负载均衡实例发送请求。
+* ss5 启动于内网地址即可
+* ss5 配置需关注 AUTHENTICATION 和 AUTHORIZATION
+
 ## Consequences
 
 Refs:
 
 1. 云服务器 ECS Linux 系统通过 Squid 配置实现代理上网 [https://help.aliyun.com/knowledge\_detail/41342.html][1]
 2. 正向代理与反向代理的区别 [http://www.jianshu.com/p/208c02c9dd1d][2]
 3. 设置 iptables 使用linux做代理服务器 [https://www.l68.net/493.html][3]
+4. SS5 [http://ss5.sourceforge.net/project.htm][4]
 
 [1]:	https://help.aliyun.com/knowledge_detail/41342.html
 [2]:	http://www.jianshu.com/p/208c02c9dd1d
 [3]:	https://www.l68.net/493.html
+[4]:	http://ss5.sourceforge.net/project.htm
 
 [image-1]:	files/proxy.jpg
 [image-2]:	files/reverse-proxy.jpg

decisions/0042-agile-retrospective-meeting.md

@@ -9,7 +9,8 @@ Accepted
 ## Context
 
 1. Team members know little about last iteration and don’t know which part is good, bad or need improve;
-2. New team members know nothing about the team’s history and don’t know the best practices for this team.
+2. New team members know nothing about the team’s history and don’t know the best practices for this team;
+3. We need learn from what we done.
 
 ## Decision
 
@@ -23,6 +24,7 @@ The idea is to spend quality time and get the most value out of this meeting, th
 
 * The SM marks the current iteration as finished, moving all the unfinished tasks to the new iteration;
 * Check the dashboard and analyze our metrics for the last finished iteration. Find out all problematic tasks with `low Flow Efficiency` or `low Quality Score`;
+* Safety check;
 * The SM remind team members in team channel at least 10 minutes before starting the meeting;
 	* Everyone is available;
 	* Everyone is encouraged to prepared the `Good`,`Bad` and `Need improve` cards;
@@ -33,20 +35,23 @@ The idea is to spend quality time and get the most value out of this meeting, th
 
 ### Process
 
-* Starts on time and all the team members must participate;
 * Discuss problematic tasks that have bad metrics, in order to understand how we can improve;
 	* Identify the root cause of the problem;
 	* Come up with ideas about how we could have done it better, so that we can learn from our mistakes;
-* The SM prioritizes the topics, based on team member's votes(optional);
-* Each topic is time-boxed. However after the 5min timer expires, if everyone agrees we need further discussion, we restart the timer one more time.
-* Follow up on the previous iteration's discussion;
+* The SM prioritizes the topics, based on team member's votes (optional);
+* Follow up on the previous iteration's discussion (optional);
 * Follow up on existing action items;
-* Discuss the accumulated cards in our Backlog, 5 minutes/card - with possibility to extend, if everyone agrees;
-* Anybody can stop the current discussion if it's clear we're going nowhere;
 * During the meeting the SM records the outcomes and action items in our retrospective board;
-* At the end of the meeting we should save 10 min for a brief overview of the past iteration(s) (recently completed features, features in progress, planed features, velocity graphs and user story vs bugs graphs)
+* At the end of the meeting we should save 10 min for a brief overview of the past iteration(recently completed features, features in progress, planed features, velocity graphs and user story vs bugs graphs)
+
+### Notice
+
+* Starts on time and all the team members must participate;
+* Discuss the accumulated cards in our Backlog, 5 minutes/card;
+* Each topic is time-boxed. However after the 5min timer expires, if everyone agrees we need further discussion, we restart the timer one more time.
+* Anybody can stop the current discussion if it's clear we're going nowhere;
 * We keep the retrospective meetings within 1 hour.
 
 ## Consequences
 
-Everyone will learn from history, and not make same error twice.
+Everyone will learn from history, and not make same error twice.