Add nginx template for RabbitMQ

Author: jefor184

ansible/group_vars/galaxyservers.yml

@@ -41,7 +41,7 @@ galaxy_job_config:
       drmaa_library_path: /usr/lib/slurm-drmaa/lib/libdrmaa.so.1
     pulsar_runner:
       load: galaxy.jobs.runners.pulsar:PulsarMQJobRunner
-      amqp_url: "pyamqp://pulsar_au:{{ RABBITMQ_PASSWORD_VHOST }}@localhost:5671/{{ rabbitmq_vhosts[0] }}?ssl=1"
+      amqp_url: "pyamqp://pulsar_ca:{{ RABBITMQ_PASSWORD_VHOST }}@{{ groups['rabbitmqservers'][0] }}:5671/{{ rabbitmq_vhosts[0] }}?ssl=1"
       amqp_acknowledge: true
       amqp_ack_republish_time: 1200
       amqp_consumer_timeout: 2
@@ -349,16 +349,16 @@ rabbitmq_config:
   consumer_timeout: 21600000 # 6 hours in milliseconds
 
 rabbitmq_vhosts:
-  - /pulsar/pulsar_au
+  - /pulsar/pulsar_ca
 
 rabbitmq_users:
   - user: "{{ RABBITMQ_ADMIN_USERNAME }}"
     password: "{{ RABBITMQ_ADMIN_PASSWORD }}"
     tags: administrator
     vhost: /
-  - user: pulsar_au
+  - user: pulsar_ca
     password: "{{ RABBITMQ_PASSWORD_VHOST }}"
-    vhost: /pulsar/pulsar_au
+    vhost: /pulsar/pulsar_ca
 
 # TUS
 tusd_version: v1.13.0

ansible/group_vars/pulsarservers.yml

@@ -1,4 +1,4 @@
-galaxy_server_hostname: "{{ usegalaxy_domain }}" # Important!!!
+galaxy_server_hostname: "mq.{{ usegalaxy_domain }}" # Important!!!
 # Put your Galaxy server's fully qualified domain name (FQDN) (or the FQDN of the RabbitMQ server) above.
 
 pulsar_root: /mnt/pulsar
@@ -29,7 +29,7 @@ pulsar_yaml_config:
   persistence_directory: "{{ pulsar_persistence_dir }}"
   tool_dependency_dir: "{{ pulsar_dependencies_dir }}"
   # The following are the settings for the pulsar server to contact the message queue with related timeouts etc.
-  message_queue_url: "pyamqp://pulsar_au:{{ RABBITMQ_PASSWORD_VHOST }}@{{ galaxy_server_hostname }}:5671//pulsar/pulsar_au?ssl=1"
+  message_queue_url: "pyamqp://pulsar_ca:{{ RABBITMQ_PASSWORD_VHOST }}@{{ galaxy_server_hostname }}:5671//pulsar/pulsar_ca?ssl=1"
   min_polling_interval: 0.5
   amqp_publish_retry: True
   amqp_publish_retry_max_retries: 5

ansible/rabbitmq.yml

@@ -10,10 +10,11 @@
         certbot_post_renewal: |
           docker restart rabbit_hole || true
         certbot_domains:
-          - "rabbitmq.{{ usegalaxy_domain }}"
-        nginx_ssl_servers:
+          - "mq.{{ usegalaxy_domain }}"
+        nginx_servers:
           - rabbitmq
+        nginx_ssl_servers: []
   roles:
-    - galaxyproject.nginx
+    - usegalaxy_eu.certbot
     - geerlingguy.docker
     - usegalaxy_eu.rabbitmqserver

ansible/templates/nginx/rabbitmq.j2

@@ -0,0 +1,10 @@
+server {
+	listen 80 default_server;
+	listen [::]:80 default_server;
+
+	server_name "{{ inventory_hostname }}";
+
+	location /.well-known/ {
+		root {{ certbot_well_known_root }};
+	}
+}