Skip to content
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

Use Official repositores instead of Bintray #53

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 4 deletions files/rabbitmq.bintray.list

This file was deleted.

2 changes: 0 additions & 2 deletions files/rabbitmq.list

This file was deleted.

6 changes: 3 additions & 3 deletions tasks/install/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
when: not rabbitmq_os_package

- name: Add the official rabbitmq repository
copy:
src: rabbitmq.list
dest: /etc/apt/sources.list.d/
template:
src: rabbitmq.list.j2
dest: /etc/apt/sources.list.d/rabbitmq.list
backup: true
when: not rabbitmq_os_package

Expand Down
22 changes: 14 additions & 8 deletions tasks/install/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
---
- name: Add bintray rabbitmq repository's key
- name: Add the official Erlang repository's key
apt_key:
url: "https://bintray.com/user/downloadSubjectPublicKey?username=rabbitmq"
url: "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf77f1eda57ebb1cc"
state: present
when: not rabbitmq_os_package

- name: Add bintray rabbitmq repository
copy:
src: rabbitmq.bintray.list
dest: /etc/apt/sources.list.d/
- name: Add the PackageCloud RabbitMQ repository's key
apt_key:
url: "https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey"
state: present
when: not rabbitmq_os_package

- name: Add the official rabbitmq repository
template:
src: rabbitmq.list.j2
dest: /etc/apt/sources.list.d/rabbitmq.list
backup: true
when: not rabbitmq_os_package

- name: Install rabbitmq-server
apt:
name: rabbitmq-server={{ rabbitmq_package }}
update_cache: true
update_cache: yes
state: present
force: true
force: yes

- name: Update locale
command: update-locale LC_ALL=en_US.UTF-8
Expand Down
2 changes: 1 addition & 1 deletion templates/rabbitmq.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## Networking
## ====================
listeners.tcp.default = {{ rabbitmq_conf_tcp_listeners_address ~ ":" if rabbitmq_conf_tcp_listeners_address is defined and rabbitmq_conf_tcp_listeners_address|ipaddr else ":::" }}{{ rabbitmq_conf_tcp_listeners_port | default("5672")}}
listeners.tcp.default = {{ rabbitmq_conf_tcp_listeners_address ~ ":" if rabbitmq_conf_tcp_listeners_address is defined and rabbitmq_conf_tcp_listeners_address|ansible.utils.ipaddr else ":::" }}{{ rabbitmq_conf_tcp_listeners_port | default("5672")}}
num_acceptors.tcp = {{ rabbitmq_conf_num_acceptors_tcp | default("10")}}

{% if rabbitmq_newrelic_agent_enabled %}
Expand Down
16 changes: 16 additions & 0 deletions templates/rabbitmq.list.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Official repository of rabbitmq
## https://www.rabbitmq.com/install-debian.html#apt-quick-start-packagecloud

## Provides modern Erlang/OTP releases
##
## "{{ ansible_distribution_release }}" as distribution name should work for any reasonably recent Ubuntu or Debian release.
## See the release to distribution mapping table in RabbitMQ doc guides to learn more.
deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu {{ ansible_distribution_release|lower }} main
deb-src http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu {{ ansible_distribution_release|lower }} main

## Provides RabbitMQ
##
## "{{ ansible_distribution_release }}" as distribution name should work for any reasonably recent Ubuntu or Debian release.
## See the release to distribution mapping table in RabbitMQ doc guides to learn more.
deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ {{ ansible_distribution_release|lower }} main
deb-src https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ {{ ansible_distribution_release|lower }} main