Skip to content

Commit cfaa1a1

Browse files
netkillernetkiller
committed
php.daemon
1 parent 3bcba45 commit cfaa1a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+479
-238
lines changed

‎home/about.html‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@
5050
<p>2014-9-8 在淘宝上买了一架电钢琴 Casio Privia PX-5S pro 开始陪女儿学习钢琴，由于这家钢琴是合成器电钢，里面有打击乐，我有对键盘鼓产生了兴趣。</p>
5151
<p>2014-10-2号罗浮山两日游，对中国道教文化与音乐产生了兴趣，10月5号用了半天时间学会了简谱。10月8号入Canon 5D Mark III + Canon Speedlite 600EX-RT香港过关被查。</p>
5252
<p>2014-12-20号对乐谱制作产生兴趣（https://github.com/SheetMusic/Piano），给女儿做了几首钢琴伴奏曲，并计划将小汤，大汤，巴斯蒂安，拜厄，车尔尼...制谱然后生成MIDI与WAV文件。</p>
53-
<p>2014职业生涯路上继续打怪升级</p>
53+
<p>2015-09-01 晚饭后拿起爵士鼓基础教程尝试在Casio Privia PX-5S pro演练，经过反复琢磨加上之前学钢琴的乐理知识，终于在02号晚上，打出了简单的基本节奏，迈出了第一步。</p>
54+
<p>2015职业生涯路上继续打怪升级</p>
5455
</div>
5556

5657
<div class="sidebar"><a name="contact"></a><div class="titlepage"><div><div><p class="title"><b>联系作者</b></p></div></div></div>
5758

5859
<p><a class="ulink" href="http://netkiller.github.io/" target="_top">http://netkiller.github.io/</a></p>
5960
<p><a class="ulink" href="http://netkiller.sourceforge.net/" target="_top">http://netkiller.sourceforge.net/</a></p>
6061
<p>Mobile: +86 13113668890</p>
61-
<p>Tel: +86 755 2981-2080</p>
62+
6263
<p>Callsign: BG7NYT QTH: Shenzhen, China</p>
63-
<p>注：请不要问我安装问题！</p>
6464

6565
<p>Email: netkiller@msn.com</p>
6666
<p>MSN: netkiller@msn.com</p>
@@ -73,6 +73,7 @@
7373
<br>
7474
<br>
7575
</p></div>
76+
<p>注：请不要问我安装问题！</p>
7677
</div>
7778

7879
<div class="sidebar"><div class="titlepage"><div><div><p class="title"><b>CQ CQ CQ DE BG7NYT</b></p></div></div></div>
@@ -88,14 +89,16 @@
8889
<div class="sidebar"><div class="titlepage"><div><div><p class="title"><b>Blogger</b></p></div></div></div>
8990

9091
<p>LinkedIn: <a class="ulink" href="http://cn.linkedin.com/in/netkiller" target="_top">http://cn.linkedin.com/in/netkiller</a></p>
92+
<p>OSChina: <a class="ulink" href="http://my.oschina.net/neochen/" target="_top">http://my.oschina.net/neochen/</a></p>
93+
<p>ITEYE: <a class="ulink" href="http://netkiller-github-com.iteye.com" target="_top">http://netkiller-github-com.iteye.com</a></p>
94+
9195
<p>Flickr: <a class="ulink" href="http://www.flickr.com/photos/bg7nyt/" target="_top">http://www.flickr.com/photos/bg7nyt/</a></p>
9296
<p>Twitter: <a class="ulink" href="http://twitter.com/bg7nyt" target="_top">http://twitter.com/bg7nyt</a></p>
9397
<p>Digg: <a class="ulink" href="http://www.digg.com/netkiller" target="_top">http://www.digg.com/netkiller</a></p>
9498
<p>Facebook: <a class="ulink" href="https://www.facebook.com/bg7nyt" target="_top">https://www.facebook.com/bg7nyt</a></p>
9599
<p>Disqus: <a class="ulink" href="http://disqus.com/netkiller/" target="_top">http://disqus.com/netkiller/</a></p>
96100
<p>solidot: <a class="ulink" href="http://solidot.org/~netkiller/" target="_top">http://solidot.org/~netkiller/</a></p>
97-
<p>ITEYE: <a class="ulink" href="http://netkiller-github-com.iteye.com" target="_top">http://netkiller-github-com.iteye.com</a></p>
98-
<p>OSChina: <a class="ulink" href="http://my.oschina.net/neochen/" target="_top">http://my.oschina.net/neochen/</a></p>
101+
99102
<p>51CTO: <a class="ulink" href="http://bg7nyt.blog.51cto.com/" target="_top">http://bg7nyt.blog.51cto.com/</a>|<a class="ulink" href="http://g.51cto.com/netkiller" target="_top">http://g.51cto.com/netkiller</a></p>
100103
<p>pengyou: <a class="ulink" href="http://www.pengyou.com/netkiller" target="_top">http://www.pengyou.com/netkiller</a></p>
101104
<p>weibo: <a class="ulink" href="http://weibo.com/bg7nyt" target="_top">http://weibo.com/bg7nyt</a></p>

‎home/database.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
ga('create', 'UA-11694057-1', 'netkiller.github.io');
1313
ga('send', 'pageview');
1414

15-
</script></head><body class="tabular" bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="webpage"><a name="database"></a><table border="0" cellpadding="0" cellspacing="0" width="100%" summary="Navigation"><tr><td valign="top" align="left" bgcolor="#4080FF"><img src="../graphics/spacer.gif" alt=" " width="1" height="1"></td><td></td><td rowspan="2" valign="top" align="left" bgcolor=""><h1>Database</h1><hr><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp41985264"></a>数据库系列手扎</h2></div></div></div>
15+
</script></head><body class="tabular" bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="webpage"><a name="database"></a><table border="0" cellpadding="0" cellspacing="0" width="100%" summary="Navigation"><tr><td valign="top" align="left" bgcolor="#4080FF"><img src="../graphics/spacer.gif" alt=" " width="1" height="1"></td><td></td><td rowspan="2" valign="top" align="left" bgcolor=""><h1>Database</h1><hr><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp70339152"></a>数据库系列手扎</h2></div></div></div>
1616

1717
<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
1818
<a class="ulink" href="../database/index.html" target="_top">Netkiller Database 手札</a>

‎home/deployment.git.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
ga('create', 'UA-11694057-1', 'netkiller.github.io');
1212
ga('send', 'pageview');
1313

14-
</script></head><body class="tabular" bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="webpage"><a name="deployment.git"></a><table border="0" cellpadding="0" cellspacing="0" width="100%" summary="Navigation"><tr><td valign="top" align="left" bgcolor="#4080FF"><img src="../graphics/spacer.gif" alt=" " width="1" height="1"></td><td></td><td rowspan="2" valign="top" align="left" bgcolor=""><h1>Deployment GIT</h1><hr><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp46368304"></a>Installation</h2></div></div></div>
14+
</script></head><body class="tabular" bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="webpage"><a name="deployment.git"></a><table border="0" cellpadding="0" cellspacing="0" width="100%" summary="Navigation"><tr><td valign="top" align="left" bgcolor="#4080FF"><img src="../graphics/spacer.gif" alt=" " width="1" height="1"></td><td></td><td rowspan="2" valign="top" align="left" bgcolor=""><h1>Deployment GIT</h1><hr><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp74612848"></a>Installation</h2></div></div></div>
1515

1616
<a class="ulink" href="https://github.com/netkiller/deployment.git" target="_top">https://github.com/netkiller/deployment.git</a>
1717
<pre class="screen">
@@ -27,7 +27,7 @@
2727
$ cd deployment/
2828
$ ln -s bin/deploy.git run
2929
</pre>
30-
</div><hr><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp46551472"></a>使用说明</h2></div></div></div>
30+
</div><hr><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp74616432"></a>使用说明</h2></div></div></div>
3131

3232
<pre class="screen">
3333

@@ -56,7 +56,7 @@
5656
cron edit
5757

5858
</pre>
59-
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp46242912"></a>模拟演示</h2></div></div></div>
59+
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp74617648"></a>模拟演示</h2></div></div></div>
6060

6161
<div class="orderedlist"><p class="title"><b>环境说明</b></p><ol class="orderedlist" type="1"><li class="listitem">
6262
<p>development 开发环境</p>
@@ -66,9 +66,9 @@
6666
<p>production 生产环境，当testing环境通过测试后，将testing 合并到 主干 即成为生产环境的代码 </p>
6767
<p>另外我们可以通过release功能将主干的代码复制到tags中，命名采用版本号</p>
6868
</li></ol></div>
69-
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp46177040"></a>创建配置文件</h2></div></div></div>
69+
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp74624144"></a>创建配置文件</h2></div></div></div>
7070

71-
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp46158960"></a>development</h3></div></div></div>
71+
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp74624816"></a>development</h3></div></div></div>
7272

7373
<p>部署开发代码到开发环境</p>
7474
<p>cat deployment/conf/development/mydomain.com/www.conf </p>
@@ -85,7 +85,7 @@
8585
eF9nJCcGKJPsiqZsfjGXxwfF41cLibTo
8686
</pre>
8787
</div>
88-
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp45463072"></a>testing</h3></div></div></div>
88+
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp74628080"></a>testing</h3></div></div></div>
8989

9090
<p>部署测试分支到测试环境</p>
9191
<p>cat deployment/conf/testing/mydomain.com/www.conf </p>
@@ -102,7 +102,7 @@
102102
eF9nJCcGKJPsiqZsfjGXxwfF41cLibTo
103103
</pre>
104104
</div>
105-
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp45466336"></a>production</h3></div></div></div>
105+
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp74631392"></a>production</h3></div></div></div>
106106

107107
<p>部署主干代码到远程主机</p>
108108
<p>cat deployment/conf/production/mydomain.com/www.conf </p>
@@ -120,7 +120,7 @@
120120
</pre>
121121
</div>
122122

123-
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp45892320"></a>配置排出列表</h3></div></div></div>
123+
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp74634736"></a>配置排出列表</h3></div></div></div>
124124

125125
<p>有时我们不希望某些文件被上传到服务器上。我们可以通过排除列表来排除上传</p>
126126
<pre class="screen">
@@ -130,7 +130,7 @@
130130
/backup/*.sql
131131
</pre>
132132
</div>
133-
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp45894000"></a>配置文件管理</h3></div></div></div>
133+
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp75315568"></a>配置文件管理</h3></div></div></div>
134134

135135
<p>生产环境的安全问题，例如数据库联接信息，开发环境与测试环境的数据库是可以供发人员和测试人员随意操作的，损坏之后恢复即可，但生产环境的数据库是不能随便操作的，除运维人员其他人是不应该有权限的， 我们希望部署到生产环境的时候使用另一个配置文件，并且这个配置文件只有运维人员才能编辑。</p>
136136
<p>config/database.php 将覆盖原有的配置文件，然后上传到生产环境</p>
@@ -141,7 +141,7 @@
141141
...
142142
</pre>
143143
</div>
144-
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp45897120"></a>部署前/后脚本</h3></div></div></div>
144+
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp75318656"></a>部署前/后脚本</h3></div></div></div>
145145

146146
<p>部署前需要做什么</p>
147147
<pre class="screen">
@@ -158,7 +158,7 @@
158158
ssh www@192.168.1.1 "chown 777 -R /www/mydomain.com/www.mydomain.com/images/upload"
159159
</pre>
160160
</div>
161-
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp45901280"></a>配置部署节点</h2></div></div></div>
161+
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp75322656"></a>配置部署节点</h2></div></div></div>
162162

163163
<p>在需要部署的节点上安装rsync</p>
164164
<pre class="screen">
@@ -229,7 +229,7 @@
229229
EOD
230230

231231
</pre>
232-
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp45907056"></a>部署代码</h2></div></div></div>
232+
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp75328320"></a>部署代码</h2></div></div></div>
233233

234234
<div class="tip"><table border="0" summary="Tip"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../graphics/tip.gif"></td><th align="left">Tip</th></tr><tr><td align="left" valign="top">
235235
<p>development | testing 建议使用分支管理， 而production是用master分支</p>
@@ -255,7 +255,7 @@
255255
</pre>
256256
<p>每次部署都会在服务器 /www/mydomain.com/backup/ 下备份更改的文件</p>
257257

258-
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp46671584"></a>回撤操作</h3></div></div></div>
258+
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp75334368"></a>回撤操作</h3></div></div></div>
259259

260260
<p>当程序升级失败需要立即回撤到指定版本时使用</p>
261261
<pre class="screen">
@@ -270,14 +270,14 @@
270270
./run revert production mydomain www 29dd5c3de6559e2ea6749f5a146ee36cbae750a7
271271
</pre>
272272
</div>
273-
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp46674400"></a>发行一个版本</h3></div></div></div>
273+
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp75337184"></a>发行一个版本</h3></div></div></div>
274274

275275
<p>release 升级你的版本</p>
276276
<pre class="screen">
277277
$ ~/deployment/run release mydomain.com www stable-2.0
278278
</pre>
279279
</div>
280-
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp46676192"></a>分支管理</h2></div></div></div>
280+
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp75338976"></a>分支管理</h2></div></div></div>
281281

282282
<p>查看当前分支</p>
283283
<pre class="screen">
@@ -297,13 +297,13 @@
297297
* development
298298
master
299299
</pre>
300-
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp46680320"></a>备份操作</h2></div></div></div>
300+
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp75343104"></a>备份操作</h2></div></div></div>
301301

302302
<p>将生产环境备份至本地</p>
303303
<pre class="screen">
304304
$ ~/deployment/run backup mydomain.com www /backup/2012-06-12/
305305
</pre>
306-
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp46682000"></a>日志</h2></div></div></div>
306+
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp75344784"></a>日志</h2></div></div></div>
307307

308308
<p>部署日志 deploy.YYYY-MM-DD.log, 记录部署时间与动态</p>
309309
<pre class="screen">
@@ -346,7 +346,7 @@
346346
--------------------------------------------------
347347

348348
</pre>
349-
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp46685952"></a>debug</h2></div></div></div>
349+
</div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp75348736"></a>debug</h2></div></div></div>
350350

351351
<p>启用调试模式</p>
352352
<pre class="screen">

0 commit comments

Comments
 (0)