Skip to content
Closed
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
1 change: 1 addition & 0 deletions src/roles/foreman/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ foreman_database_ssl_ca: # noqa: no-empty-defaults
foreman_database_ssl_ca_path: /etc/foreman/db-ca.crt

foreman_name: "{{ ansible_facts['fqdn'] }}"
foreman_listen_stream: localhost:3000

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we keep this consistent with PROD deployment?

Suggested change
foreman_listen_stream: localhost:3000
foreman_listen_stream: /run/httpd.foreman.sock

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The design here is that the role defaults remain standalone while a level higher they're connected to Apache.

foreman_url: "http://{{ ansible_facts['fqdn'] }}:3000"

# Puma threads calculation:
Expand Down
8 changes: 8 additions & 0 deletions src/roles/foreman/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,12 @@
- Restart foreman
- Restart dynflow-sidekiq@

- name: Deploy Foreman socket
ansible.builtin.template:
src: foreman.socket.j2
dest: /etc/systemd/system/foreman.socket
mode: '0644'

- name: Deploy Foreman Container
containers.podman.podman_container:
name: "foreman"
Expand Down Expand Up @@ -130,6 +136,8 @@
FOREMAN_ENABLED_PLUGINS: "{{ foreman_plugins | join(' ') }}"
quadlet_options:
- |
[Unit]
Requires=foreman.socket
[Install]
WantedBy=default.target foreman.target
[Unit]
Expand Down
14 changes: 14 additions & 0 deletions src/roles/foreman/templates/foreman.socket.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Unit]
Description=Foreman socket

[Socket]
ListenStream={{ foreman_listen_stream }}
SocketUser=apache
SocketMode=0600

NoDelay=false
ReusePort=true
Backlog=1024

[Install]
WantedBy=sockets.target
7 changes: 7 additions & 0 deletions src/roles/httpd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
persistent: true
when: ansible_facts['selinux']['status'] == "enabled"

# TODO: probably not the right boolean
- name: Set daemons_enable_cluster_mode so Apache can connect to unix sockets
ansible.posix.seboolean:
name: daemons_enable_cluster_mode
state: true
persistent: true
Comment on lines +16 to +21

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would make sense to run this only when SELinux is enabled?
Also, since it worked for you, can we remove the TODO comment as part of this change?

Suggested change
# TODO: probably not the right boolean
- name: Set daemons_enable_cluster_mode so Apache can connect to unix sockets
ansible.posix.seboolean:
name: daemons_enable_cluster_mode
state: true
persistent: true
- name: Set daemons_enable_cluster_mode so Apache can connect to unix sockets
ansible.posix.seboolean:
name: daemons_enable_cluster_mode
state: true
persistent: true
when: ansible_facts['selinux']['status'] == "enabled"

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this really is the correct boolean so IMHO the TODO still stands.


- name: Disable welcome page
ansible.builtin.file:
path: /etc/httpd/conf.d/welcome.conf
Expand Down
3 changes: 3 additions & 0 deletions src/vars/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ foreman_plugins: "{{ enabled_features | features_to_foreman_plugins }}"
foreman_name: "{{ ansible_facts['fqdn'] }}"
foreman_url: "https://{{ foreman_name }}"

foreman_listen_stream: /run/httpd.foreman.sock
httpd_foreman_backend: "unix://{{ foreman_listen_stream }}|http://%{HTTP_HOST}"

httpd_server_ca_certificate: "{{ server_ca_certificate }}"
httpd_client_ca_certificate: "{{ client_ca_certificate }}"
httpd_server_certificate: "{{ server_certificate }}"
Expand Down
9 changes: 4 additions & 5 deletions tests/foreman_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pytest

FOREMAN_HOST = 'localhost'
FOREMAN_PORT = 3000
FOREMAN_SOCKET = '/run/httpd.foreman.sock'

RECURRING_INSTANCES = [
"hourly",
Expand All @@ -15,7 +15,7 @@

@pytest.fixture(scope="module")
def foreman_status_curl(server):
return server.run(f"curl --header 'X-FORWARDED-PROTO: https' --silent --write-out '%{{stderr}}%{{http_code}}' http://{FOREMAN_HOST}:{FOREMAN_PORT}/api/v2/ping")
return server.run(f"curl --header 'X-FORWARDED-PROTO: https' --silent --write-out '%{{stderr}}%{{http_code}}' --unix-socket {FOREMAN_SOCKET} http://{FOREMAN_HOST}/api/v2/ping")


@pytest.fixture(scope="module")
Expand All @@ -28,9 +28,8 @@ def test_foreman_service(server):
assert foreman.is_running


def test_foreman_port(server):
foreman = server.addr(FOREMAN_HOST)
assert foreman.port(FOREMAN_PORT).is_reachable
def test_foreman_socket(server):
assert server.socket(f"unix://{FOREMAN_SOCKET}").is_listening


def test_foreman_status(foreman_status_curl):
Expand Down
Loading