Skip to content

Remove psad from dock #613

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

Merged
merged 2 commits into from
Mar 14, 2017
Merged

Remove psad from dock #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be0897d
remove psad from dock
Mar 13, 2017
b01eef7
update charon, add tag for cert
Mar 13, 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
7 changes: 3 additions & 4 deletions ansible/dock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
name={{ dock }}
groups=dock

- include: charon.yml git_branch="v4.0.0"
- include: dock-init.yml git_branch="v10.1.0"
- include: charon.yml git_branch="v5.0.1"
- include: dock-init.yml git_branch="v10.1.2"
- include: krain.yml git_branch="v0.3.0"

- hosts: "{{ dock }}"
tasks:
tasks:
- name: remove datadog agent
become: true
apt:
Expand All @@ -28,4 +28,3 @@
roles:
- { role: install-ssm }
- { role: dock-images }
- { role: docks-psad }
5 changes: 3 additions & 2 deletions ansible/roles/docker/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
file:
path=/etc/ssl/docker
state=directory

- name: copy docker upstart config
become: true
copy:
Expand All @@ -17,6 +17,7 @@

- name: copy docker certs
become: true
tags: docker_certs
when: dock is defined
copy:
src=certs/
Expand Down Expand Up @@ -117,4 +118,4 @@
become: true
group:
name: docker
state: present
state: present