Cleaned up Vagrant and merged new commits

[github/fretlink/ansible-rabbitmq.git] / tasks / debian.yml

diff --git a/tasks/debian.yml b/tasks/debian.yml
index 563563abf8ed1df41ca8aba4fc1319e3ec6c5513..c98ff680ab31b4b545de297ddb748ac834478835 100644 (file)
--- a/tasks/debian.yml
+++ b/tasks/debian.yml
@@ -1,22 +1,52 @@
 ---
-- name: Add the RabbitMQ public GPG key to the apt repo
-  apt_key: url=http://www.rabbitmq.com/rabbitmq-signing-key-public.asc state=present
+- name: debian | adding RabbitMQ public GPG key to the apt repo
+  apt_key:
+    url: "{{ rabbitmq_debian_repo_key }}"
+    state: present
+  become: true
+  register: result
+  until: result is successful
 
-- name: Add RabbitMQ to the sources list
-  apt_repository: repo='deb http://www.rabbitmq.com/debian/ testing main' update_cache=no state=present
+- name: debian | adding RabbitMQ repo
+  apt_repository:
+    repo: "{{ rabbitmq_debian_repo }}"
+    state: present
+  become: true
+  register: result
+  until: result is successful
 
-- name: Install RabbitMQ server
-  apt: name={{ item }} update_cache=no force=yes state=installed
+- name: debian | add Rabbitmq erlang repo key
+  apt_key:
+    url: https://bintray.com/user/downloadSubjectPublicKey?username=rabbitmq-erlang
+    state: present
+  become: true
+  when: rabbitmq_debian_erlang_from_rabbit
+
+- name: debian | add Rabbitmq erlang repo
+  apt_repository:
+    repo: deb https://dl.bintray.com/rabbitmq-erlang/debian {{ ansible_distribution_release }} erlang
+    state: present
+  become: true
+  when: rabbitmq_debian_erlang_from_rabbit
+
+- name: debian | installing RabbitMQ server
+  apt:
+    name: ['rabbitmq-server']
+    state: present
+  become: true
   with_items:
-    - rabbitmq-server
+    - rabbitmq-server{{ (rabbitmq_debian_version is defined) | ternary(['=',rabbitmq_debian_version] | join(''),'')}}
 
-- name: Enable the RabbitMQ Management Console
-  rabbitmq_plugin: names=rabbitmq_management state=enabled
+- name: debian | enabling the RabbitMQ Management Console
+  rabbitmq_plugin:
+    names: rabbitmq_management
+    state: enabled
+  become: true
   notify: restart rabbitmq-server
 
-- name: Ensure that the RabbitMQ service is running
-  service: name=rabbitmq-server state=started enabled=yes
-
-- name: check | checking to see if already clustered
-  stat: path=/etc/rabbitmq/clustered
-  register: clustered
+- name: debian | ensuring that the RabbitMQ service is running
+  service:
+    name: rabbitmq-server
+    state: started
+    enabled: yes
+  become: true