Skip to content

Something wrong code #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.

Sign up for GitHub

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 6 commits into
base: master
Choose a base branch
from
Open

Something wrong code #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ccc5bb
按教材修正为dnmonster服务信息
nanquanyuhao Jun 16, 2017
aae5a7a
按教材修正为正确proxy配置
nanquanyuhao Jun 16, 2017
84f9b58
Update identidock.proxy.service
nanquanyuhao Jun 16, 2017
ee14a2d
Update identidock.yml
nanquanyuhao Jun 20, 2017
bbfea15
Create README.md
nanquanyuhao Jun 20, 2017
ab43077
Update README.md
nanquanyuhao Jun 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
2 changes: 2 additions & 0 deletions ansible/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## 运行脚本
### docker run -it -v ${HOME}/.ssh:/root/.ssh:ro -v $(pwd)/identidock.yml:/ansible/identidock.yml -v $(pwd)/hosts:/etc/ansible/hosts --rm=true generik/ansible ansible-playbook identidock.yml
4 changes: 3 additions & 1 deletion ansible/identidock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
sudo: yes
tasks:
- name: easy_install
apt: pkg=python-setuptools
#apt: pkg=python-setuptools
#由于自己实验中使用CentOS，故命令改为yum，如下
yum: pkg=python-setuptools
- name: pip
easy_install: name=pip
- name: docker-py
Expand Down
10 changes: 5 additions & 5 deletions systemd/identidock.dnmonster.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[Unit]
Description=Redis Container for Identidock
Description=dnmonster Container for Identidock
After=docker.service
Requires=docker.service

[Service]
TimeoutStartSec=0
Restart=always
ExecStartPre=-/usr/bin/docker stop redis
ExecStartPre=-/usr/bin/docker rm redis
ExecStartPre=/usr/bin/docker pull redis
ExecStart=/usr/bin/docker run --rm --name redis redis
ExecStartPre=-/usr/bin/docker stop dnmonster
ExecStartPre=-/usr/bin/docker rm dnmonster
ExecStartPre=/usr/bin/docker pull amouat/dnmonster
ExecStart=/usr/bin/docker run --name dnmonster amouat/dnmonster

[Install]
WantedBy=multi-user.target
16 changes: 11 additions & 5 deletions systemd/identidock.proxy.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
[Unit]
Description=Redis Container for Identidock
Description=Proxy Container for Identidock
After=docker.service
Requires=docker.service
Requires=identidock.identidock.service

[Service]
TimeoutStartSec=0
Restart=always
ExecStartPre=-/usr/bin/docker stop redis
ExecStartPre=-/usr/bin/docker rm redis
ExecStartPre=/usr/bin/docker pull redis
ExecStart=/usr/bin/docker run --rm --name redis redis
ExecStartPre=-/usr/bin/docker stop proxy
ExecStartPre=-/usr/bin/docker rm proxy
ExecStartPre=/usr/bin/docker pull amouat/proxy
ExecStart=/usr/bin/docker run --name proxy \
--link identidock:identidock \
-p 80:80 \
-e NGINX_HOST=0.0.0.0 \
-e NGINX_PROXY=http://identidock:9090 \
amouat/proxy

[Install]
WantedBy=multi-user.target