Skip to content

Master #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 41 commits into
base: gh-pages
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
3be034e
Replace master branch with page content via GitHub
minuux May 25, 2016
e4c553a
remove
minuux May 25, 2016
40ffbcf
Replace master branch with page content via GitHub
minuux May 27, 2016
75fbff1
add edu
minuux May 27, 2016
de5492f
init
minuux May 27, 2016
a46d7d5
add .gitignore
minuux May 27, 2016
367555f
del _site
minuux May 27, 2016
3fd17ef
update config
minuux May 27, 2016
499631a
update edx.md,ansible.md
minuux May 27, 2016
7026d84
update .gitignore
minuux May 27, 2016
4890700
modify title
minuux May 27, 2016
04d7fd6
modify datetime
minuux May 27, 2016
0dfc2f6
change style
minuux May 27, 2016
da8eea6
modify edx
minuux May 27, 2016
95d55d6
modify post
minuux May 29, 2016
d28bf69
add django
minuux Jun 1, 2016
74e8bc6
change name
minuux Jun 1, 2016
6b49b70
change
minuux Jun 1, 2016
cb73fee
add ubuntu install docker
minuux Jun 9, 2016
5e9a1a5
Rename 2016-06-10-ubuntu1404-install-docker.md to 2016-06-10-ubuntu-1…
minuux Jun 11, 2016
c1f50eb
Update 2016-06-10-ubuntu-1404-install-docker.md
minuux Jun 11, 2016
ad66e38
Update 2016-06-10-ubuntu-1404-install-docker.md
minuux Jun 11, 2016
177a433
Create npm
minuux Jun 14, 2016
0b6481c
Rename npm to npm.md
minuux Jun 14, 2016
4960953
Merge branch 'gh-pages'
minuux Aug 27, 2016
4e595e9
Merge remote-tracking branch 'origin/master'
minuux Aug 27, 2016
103a25a
merge错误导致无法生成了...
minuux Aug 27, 2016
f9770a7
add Ubuntu php connect sqlserver
minuux Aug 31, 2016
a717262
add linked server usage
minuux Sep 8, 2016
4f40bab
add draft
minuux Sep 18, 2016
c5b067e
add gitignore
minuux Sep 19, 2016
b803adf
Create rsync.md
minuux Oct 21, 2016
1df4433
Update rsync.md
minuux Oct 21, 2016
3f06bcb
Update and rename rsync.md to 2016-10-21-rsync.md
minuux Oct 21, 2016
20adf8e
Update and rename 2016-10-21-rsync.md to 2016-10-21-cygwin-rsync.md
minuux Oct 21, 2016
ad5a822
Update 2016-10-21-cygwin-rsync.md
minuux Oct 21, 2016
78d713d
Update 2016-10-21-cygwin-rsync.md
minuux Oct 21, 2016
99cb7ba
Add Synology
minuux Dec 11, 2016
a585234
fix
minuux Dec 11, 2016
7e1f130
Add merlin-xiaobao
minuux May 20, 2017
1fd9165
避免*号被解析
minuux May 20, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
_site
.sass-cache
run.docker
.DS_Store
19 changes: 19 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Welcome to Jekyll!
#
# This config file is meant for settings that affect your whole blog, values
# which you are expected to set up once and rarely need to edit after that.
# For technical reasons, this file is *NOT* reloaded automatically when you use
# 'jekyll serve'. If you change this file, please restart the server process.

# Site settings
title: minuux
email:
description: > # this means to ignore newlines until "baseurl:"

baseurl: "" # the subpath of your site, e.g. /blog
url: "minuux.github.io" # the base hostname & protocol for your site
twitter_username: minuux
github_username: minuux

# Build settings
markdown: kramdown
38 changes: 38 additions & 0 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<footer class="site-footer">

<div class="wrapper">

<!--<h2 class="footer-heading">{{ site.title }}</h2>-->

<div class="footer-col-wrapper">
<div class="footer-col footer-col-1">
<ul class="contact-list">
<!--<li>{{ site.title }}</li>
<li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>-->
</ul>
</div>

<div class="footer-col footer-col-2">
<ul class="social-media-list">
{% if site.github_username %}
<li>
{% include icon-github.html username=site.github_username %}
</li>
{% endif %}

{% if site.twitter_username %}
<li>
{% include icon-twitter.html username=site.twitter_username %}
</li>
{% endif %}
</ul>
</div>

<div class="footer-col footer-col-3">
<p>{{ site.description }}</p>
</div>
</div>

</div>

</footer>
12 changes: 12 additions & 0 deletions _includes/head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">

<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
</head>
28 changes: 28 additions & 0 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<header class="site-header">

<div class="wrapper">

<a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>

<nav class="site-nav">
<a href="#" class="menu-icon">
<svg viewBox="0 0 18 15">
<path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
<path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
<path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
</svg>
</a>

<div class="trigger">
{% for my_page in site.pages %}
{% if my_page.title %}
<a class="page-link" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
{% endif %}
{% endfor %}
<a class="page-link" href="{{ "/feed.xml" | prepend: site.baseurl }}">RSS</a>
</div>
</nav>

</div>

</header>
1 change: 1 addition & 0 deletions _includes/icon-github.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<a href="https://github.com/{{ include.username }}"><span class="icon icon--github">{% include icon-github.svg %}</span><span class="username">{{ include.username }}</span></a>
1 change: 1 addition & 0 deletions _includes/icon-github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions _includes/icon-twitter.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<a href="https://twitter.com/{{ include.username }}"><span class="icon icon--twitter">{% include icon-twitter.svg %}</span><span class="username">{{ include.username }}</span></a>
1 change: 1 addition & 0 deletions _includes/icon-twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>

{% include head.html %}

<body>

{% include header.html %}

<div class="page-content">
<div class="wrapper">
{{ content }}
</div>
</div>

{% include footer.html %}

</body>

</html>
14 changes: 14 additions & 0 deletions _layouts/page.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
layout: default
---
<article class="post">

<header class="post-header">
<h1 class="post-title">{{ page.title }}</h1>
</header>

<div class="post-content">
{{ content }}
</div>

</article>
15 changes: 15 additions & 0 deletions _layouts/post.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
layout: default
---
<article class="post" itemscope itemtype="http://schema.org/BlogPosting">

<header class="post-header">
<h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
<p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%Y-%m-%d" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}</p>
</header>

<div class="post-content" itemprop="articleBody">
{{ content }}
</div>

</article>
25 changes: 25 additions & 0 deletions _posts/2015-05-27-welcome-to-jekyll.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
layout: post
title: "Welcome to Jekyll!"
date: 2015-05-27 08:26:31 +0000
categories: jekyll update
---
You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.

To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.

Jekyll also offers powerful support for code snippets:

{% highlight ruby %}
def print_hi(name)
puts "Hi, #{name}"
end
print_hi('Tom')
#=> prints 'Hi, Tom' to STDOUT.
{% endhighlight %}

Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].

[jekyll-docs]: http://jekyllrb.com/docs/home
[jekyll-gh]: https://github.com/jekyll/jekyll
[jekyll-talk]: https://talk.jekyllrb.com/
38 changes: 38 additions & 0 deletions _posts/2016-05-12-ansible.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
layout: post
title: "Ansible"
date: 2016-05-12 08:26:31
categories: notes
---


## doc

- [Ansible中文权威指南](http://www.ansible.com.cn)


## other
[http://docs.ansible.com/ansible/playbooks_startnstep.html](http://docs.ansible.com/ansible/playbooks_startnstep.html)

### 从某一个任务开始执行
```
ansible-playbook playbook.yml --start-at-task="install packages"
```

### 单步执行,每执行一次task,之后会提示是否继续执行下一步
```
ansible-playbook playbook.yml --step
```

### 只执行某一个任务
执行的时候会有提示,是否执行,当执行完这个task后就ctrl+c来结束
```
ansible-playbook playbook.yml --step --start-at-task='run the task only'
```







96 changes: 96 additions & 0 deletions _posts/2016-05-12-docker.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
---
layout: post
title: "Docker"
date: 2016-05-12 08:26:31 +0000
categories: notes
---


## nginx

```
docker run --name nginx -p 80:80 -v /Users/lizhixin/dev/docker/nginx:/usr/share/nginx/html:ro -d nginx
```

## mysql
osx中使用mysql镜像创建容器会出现volumes无权限加载的情况
解决方法:http://stackoverflow.com/questions/34442831/permission-denied-when-mounting-docker-volume-in-osx

创建自己的镜像,修改权限

```
FROM mysql

RUN usermod -u 1000 mysql
RUN mkdir -p /var/run/mysqld
RUN chmod -R 777 /var/run/mysqld
```

```
docker build -t mysql2 .
```
生成容器

```
docker run -it --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=123456 -v /Users/lizhixin/dev/edx/mysql:/var/lib/mysql mysql2
```

## docker-machine 使用代理

修改 vi /var/lib/boot2docker/profile,或者创建的时候就设置

```
docker-machine create -d virtualbox \
--engine-env HTTP_PROXY=http://192.168.1.1:8080 \
--engine-env HTTPS_PROXY=http://192.168.1.1:8080 \
--engine-env NO_PROXY=localhost \
--EXTRA_ARGS="--registry-mirror=http://de1b1668.m.daocloud.io" \
default
```


## windows 下使用 docker

安装 Kitematic ,之后使用CMD,运行docker命令
提示无法连接到 daemon

通过 docker-machine ip 查询到machine的IP
设置下面的系统环境变量

```
export DOCKER_HOST=tcp://192.168.99.100:2376
export DOCKER_MACHINE_NAME=default
export DOCKER_TLS_VERIFY=1
export DOCKER_CERT_PATH=C:\Users\li\.docker\machine\machines\default
```
之后就可以正常使用了

但仅仅只能通过本机访问
通过设置virtualbox可以使用局域网中的IP(桥接网络),之后重新通过docker-machine regenerate-certs 生成certs


## 安装成功后需要配置日期时间

设置ubuntu的时区

```
echo "Asia/shanghai" > /etc/timezone
```

但PHP或MYSQL还是需要单独设置
找了好久终于找到了解决方法,在容器中执行以下命令就可以了,MYSQL的容器设置后还是需要重启的
http://www.opstool.com/article/320

```
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
```

## boot2docker 默认密码

```
docker:tcuser
```

## docker pull 本地镜像
[http://stackoverflow.com/questions/20481225/how-can-i-use-a-local-image-as-the-base-image-with-a-dockerfile](How can I use a local image as the base image with a dockerfile?)

Loading