Skip to content

Allow apt repo settings to be user defined #20

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 1 commit into from
Jun 23, 2016
Merged

Allow apt repo settings to be user defined #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Role Variables
- `datadog_config` - Settings to place in `/etc/dd-agent/datadog.conf`.
- `datadog_process_checks` - Array of process checks and options (DEPRECATED: use `process` under
`datadog_checks` instead)
- `datadog_apt_repo` - Override default Datadog `apt` repository
- `datadog_apt_key_url` - Url to Datadog `apt` key

Dependencies
------------
Expand Down
3 changes: 3 additions & 0 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ datadog_checks: {}
# default user/group
datadog_user: dd-agent
datadog_group: root

# default apt repo
datadog_apt_repo: "deb http://apt.datadoghq.com/ stable main"
6 changes: 5 additions & 1 deletion tasks/pkg-debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
- apt: name=apt-transport-https state=latest

- apt_key: id=C7A7DA52 keyserver=hkp://keyserver.ubuntu.com:80 state=present
when: datadog_apt_key_url is not defined

- apt_repository: repo='deb http://apt.datadoghq.com/ stable main' state=present update_cache=yes
- apt_key: id=C7A7DA52 url={{ datadog_apt_key_url }} state=present
when: datadog_apt_key_url is defined

- apt_repository: repo='{{ datadog_apt_repo }}' state=present update_cache=yes

- apt: name=datadog-agent state=latest