diff --git a/roles/odcs/base/tasks/main.yml b/roles/odcs/base/tasks/main.yml index f9f53b7e4a..f34b614748 100644 --- a/roles/odcs/base/tasks/main.yml +++ b/roles/odcs/base/tasks/main.yml @@ -190,7 +190,7 @@ src: "fedora-messaging.toml.j2" dest: /etc/fedora-messaging/config.toml owner: odcs - group: fedmsg + group: apache mode: 0640 tags: - odcs @@ -261,7 +261,7 @@ src: "{{private}}/files/rabbitmq/{{env}}/pki/issued/odcs{{env_suffix}}.crt" dest: /etc/odcs/odcs-rabbitmq.crt owner: odcs - group: fedmsg + group: apache mode: 0640 tags: - odcs @@ -273,19 +273,19 @@ src: "{{private}}/files/rabbitmq/{{env}}/pki/private/odcs{{env_suffix}}.key" dest: /etc/odcs/odcs-rabbitmq.key owner: odcs - group: fedmsg - mode: 0640 - tags: - - odcs - - odcs/backend - - odcs/frontendi - -- name: copy the odcs rabbitmq CA cert. - copy: - src: "{{private}}/files/rabbitmq/{{env}}/pki/ca.crt" - dest: /etc/odcs/ca.crt - owner: odcs - group: fedmsg + group: apache + mode: 0640 + tags: + - odcs + - odcs/backend + - odcs/frontend + +- name: copy the odcs rabbitmq CA cert. + copy: + src: "{{private}}/files/rabbitmq/{{env}}/pki/ca.crt" + dest: /etc/odcs/ca.crt + owner: odcs + group: apache mode: 0640 tags: - odcs diff --git a/roles/odcs/frontend/templates/etc/httpd/conf.d/odcs.conf.j2 b/roles/odcs/frontend/templates/etc/httpd/conf.d/odcs.conf.j2 index 98af361a85..14e687762b 100644 --- a/roles/odcs/frontend/templates/etc/httpd/conf.d/odcs.conf.j2 +++ b/roles/odcs/frontend/templates/etc/httpd/conf.d/odcs.conf.j2 @@ -5,7 +5,7 @@ RewriteCond %{HTTPS} off RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} {% endif %} -WSGIDaemonProcess odcs user=odcs group=apache processes={{wsgi_procs}} threads={{wsgi_threads}} +WSGIDaemonProcess odcs user=apache group=apache processes={{wsgi_procs}} threads={{wsgi_threads}} WSGIScriptAlias /{{ odcs_endpoint }} /usr/share/odcs/odcs.wsgi {% if env == 'staging' %}