From 6ccc5bb974c3d10052007bf9ac1c0cf8f9c76eb1 Mon Sep 17 00:00:00 2001 From: nanquanyuahao Date: Fri, 16 Jun 2017 19:58:22 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8C=89=E6=95=99=E6=9D=90=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E4=B8=BAdnmonster=E6=9C=8D=E5=8A=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 按教材修正为dnmonster服务信息 --- systemd/identidock.dnmonster.service | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/systemd/identidock.dnmonster.service b/systemd/identidock.dnmonster.service index 6b82b6b..8101ccb 100644 --- a/systemd/identidock.dnmonster.service +++ b/systemd/identidock.dnmonster.service @@ -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 From aae5a7a604d424e6287e265d0e9e7e180104a455 Mon Sep 17 00:00:00 2001 From: nanquanyuahao Date: Fri, 16 Jun 2017 20:05:39 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8C=89=E6=95=99=E6=9D=90=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E4=B8=BA=E6=AD=A3=E7=A1=AEproxy=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 按教材修正为正确proxy配置 --- systemd/identidock.proxy.service | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/systemd/identidock.proxy.service b/systemd/identidock.proxy.service index 6b82b6b..66287e1 100644 --- a/systemd/identidock.proxy.service +++ b/systemd/identidock.proxy.service @@ -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/identidock [Install] WantedBy=multi-user.target From 84f9b58dd6c6710b2b26589ba5801c403a4ead1c Mon Sep 17 00:00:00 2001 From: nanquanyuahao Date: Fri, 16 Jun 2017 20:29:35 +0800 Subject: [PATCH 3/6] Update identidock.proxy.service --- systemd/identidock.proxy.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd/identidock.proxy.service b/systemd/identidock.proxy.service index 66287e1..b7159a1 100644 --- a/systemd/identidock.proxy.service +++ b/systemd/identidock.proxy.service @@ -15,7 +15,7 @@ ExecStart=/usr/bin/docker run --name proxy \ -p 80:80 \ -e NGINX_HOST=0.0.0.0 \ -e NGINX_PROXY=http://identidock:9090 \ - amouat/identidock + amouat/proxy [Install] WantedBy=multi-user.target From ee14a2d4ecce90177463b270971871f64e5514ea Mon Sep 17 00:00:00 2001 From: nanquanyuahao Date: Tue, 20 Jun 2017 09:17:14 +0800 Subject: [PATCH 4/6] Update identidock.yml --- ansible/identidock.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/identidock.yml b/ansible/identidock.yml index d5447cb..0ea62a5 100644 --- a/ansible/identidock.yml +++ b/ansible/identidock.yml @@ -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 From bbfea1521d9de4f425273e6e5027f46955f30489 Mon Sep 17 00:00:00 2001 From: nanquanyuahao Date: Tue, 20 Jun 2017 09:40:49 +0800 Subject: [PATCH 5/6] Create README.md --- ansible/README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 ansible/README.md diff --git a/ansible/README.md b/ansible/README.md new file mode 100644 index 0000000..23b830f --- /dev/null +++ b/ansible/README.md @@ -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 From ab43077b68b3a3f03428c282b35351f8081637f6 Mon Sep 17 00:00:00 2001 From: nanquanyuahao Date: Tue, 20 Jun 2017 09:41:54 +0800 Subject: [PATCH 6/6] Update README.md --- ansible/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/README.md b/ansible/README.md index 23b830f..ce24a72 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -1,2 +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 +## 运行脚本 +### 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