Skip to content

Commit 54ae21c

Browse files
author
w3h
committed
feilt
1 parent 2c7d44d commit 54ae21c

File tree

649 files changed

+37487
-25
lines changed

Some content is hidden

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

649 files changed

+37487
-25
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.DS_Store

‎CNAME

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
icsmaster.com
1+
www.icsmaster.com

‎Makefile

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
PY=python
2+
PELICAN=pelican
3+
PELICANOPTS=
4+
5+
BASEDIR=$(CURDIR)
6+
INPUTDIR=$(BASEDIR)/content
7+
OUTPUTDIR=$(BASEDIR)/output
8+
CONFFILE=$(BASEDIR)/pelicanconf.py
9+
PUBLISHCONF=$(BASEDIR)/publishconf.py
10+
11+
FTP_HOST=localhost
12+
FTP_USER=anonymous
13+
FTP_TARGET_DIR=/
14+
15+
SSH_HOST=localhost
16+
SSH_PORT=22
17+
SSH_USER=root
18+
SSH_TARGET_DIR=/var/www
19+
20+
S3_BUCKET=my_s3_bucket
21+
22+
CLOUDFILES_USERNAME=my_rackspace_username
23+
CLOUDFILES_API_KEY=my_rackspace_api_key
24+
CLOUDFILES_CONTAINER=my_cloudfiles_container
25+
26+
DROPBOX_DIR=~/Dropbox/Public/
27+
28+
DEBUG ?= 0
29+
ifeq ($(DEBUG), 1)
30+
PELICANOPTS += -D
31+
endif
32+
33+
help:
34+
@echo 'Makefile for a pelican Web site '
35+
@echo ' '
36+
@echo 'Usage: '
37+
@echo ' make html (re)generate the web site '
38+
@echo ' make clean remove the generated files '
39+
@echo ' make regenerate regenerate files upon modification '
40+
@echo ' make publish generate using production settings '
41+
@echo ' make serve [PORT=8000] serve site at http://localhost:8000'
42+
@echo ' make devserver [PORT=8000] start/restart develop_server.sh '
43+
@echo ' make stopserver stop local server '
44+
@echo ' make ssh_upload upload the web site via SSH '
45+
@echo ' make rsync_upload upload the web site via rsync+ssh '
46+
@echo ' make dropbox_upload upload the web site via Dropbox '
47+
@echo ' make ftp_upload upload the web site via FTP '
48+
@echo ' make s3_upload upload the web site via S3 '
49+
@echo ' make cf_upload upload the web site via Cloud Files'
50+
@echo ' make github upload the web site via gh-pages '
51+
@echo ' '
52+
@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html'
53+
@echo ' '
54+
55+
html:
56+
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
57+
58+
clean:
59+
[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
60+
61+
regenerate:
62+
$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
63+
64+
serve:
65+
ifdef PORT
66+
cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT)
67+
else
68+
cd $(OUTPUTDIR) && $(PY) -m pelican.server
69+
endif
70+
71+
devserver:
72+
ifdef PORT
73+
$(BASEDIR)/develop_server.sh restart $(PORT)
74+
else
75+
$(BASEDIR)/develop_server.sh restart
76+
endif
77+
78+
stopserver:
79+
kill -9 `cat pelican.pid`
80+
kill -9 `cat srv.pid`
81+
@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
82+
83+
publish:
84+
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
85+
86+
ssh_upload: publish
87+
scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
88+
89+
rsync_upload: publish
90+
rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
91+
92+
dropbox_upload: publish
93+
cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
94+
95+
ftp_upload: publish
96+
lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit"
97+
98+
s3_upload: publish
99+
s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed
100+
101+
cf_upload: publish
102+
cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
103+
104+
github: publish
105+
ghp-import $(OUTPUTDIR)
106+
git push origin gh-pages
107+
108+
.PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github

‎README.md

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,4 @@
1-
# 本站简介
1+
myblog-pelican
2+
==============
23

3-
“工匠实验室”，由国内多名资深的工控行业专家、传统网络安全专家、工控网络安全专家组成，一直从事着工控安全方面的研究和工作，曾参加过多个行业的工控安全现场检测（如电力能源、石油石化、烟草、智能智造等），多个工控安全攻防仿真的建设，多个工控设备的漏洞挖掘。我们主要目的是通过我们的努力，提升工控网络安全水平。本站提供最新的工控安全咨询、资源、工具和研究成果，我们还可提供如下工控安全服务，欢迎垂询。
4-
5-
> * 工控培训、工控安全培训、传统网络安全培训
6-
7-
> * 工控攻防仿真环境建设
8-
9-
> * 工控设备挖掘
10-
11-
> * 工控现场安全检测
12-
13-
> * 工控安全解决方案
14-
15-
16-
# 联系方式
17-
18-
> * QQ：2969192546
19-
20-
> * E-Mail：2969192546@qq.com
21-
22-
> * GitHub：[w3h](https://github.com/w3h)
23-
24-
> * TEL：186\*\*\*\*\*203
4+
使用pelican构建的一个个人静态blog，当然是经过改良后的，做了部份框架的修改和CDN的优化，这里是源代码，喜欢的朋友可以拿去用。利用这个框架生成的blog网站www.webhhh.net，喜欢的朋友可以去看看。

‎content/extra/.nojekyll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.nojekyll

‎content/extra/BingSiteAuth.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0"?>
2+
<users>
3+
<user>93726F489AC197A2B3908A9BF77A7B89</user>
4+
</users>

‎content/extra/CNAME

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
www.icsmaster.net

‎content/extra/LICENSE.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright 2014 Ma Wenbao
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

‎content/extra/README

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
wenbao.github.io
2+
================
3+
4+
This is my static blog built with help from [pelican](https://github.com/getpelican/pelican).

‎content/extra/favicon.ico

16.6 KB
Binary file not shown.

‎content/extra/logo.png

73.1 KB
Loading

‎content/extra/robots.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# robots.txt generated at http://tool.chinaz.com/robots/
2+
User-agent: *
3+
Sitemap: http://w3h.github.io/sitemap.xml

0 commit comments

Comments
 (0)