diff --git a/src/roles/candlepin/tasks/certs.yml b/src/roles/candlepin/tasks/certs.yml index c90468c49..9b00000df 100644 --- a/src/roles/candlepin/tasks/certs.yml +++ b/src/roles/candlepin/tasks/certs.yml @@ -46,6 +46,26 @@ notify: - Restart candlepin +- name: Create the podman secret for Tomcat certificate + containers.podman.podman_secret: + state: present + name: candlepin-tomcat-cert + path: "{{ candlepin_tomcat_certificate }}" + labels: + app: tomcat + notify: + - Restart candlepin + +- name: Create the podman secret for Tomcat key + containers.podman.podman_secret: + state: present + name: candlepin-tomcat-key + path: "{{ candlepin_tomcat_key }}" + labels: + app: tomcat + notify: + - Restart candlepin + - name: Create the podman secret for Tomcat keystore containers.podman.podman_secret: state: present diff --git a/src/roles/candlepin/tasks/main.yml b/src/roles/candlepin/tasks/main.yml index 4b2628138..28c1970eb 100644 --- a/src/roles/candlepin/tasks/main.yml +++ b/src/roles/candlepin/tasks/main.yml @@ -76,6 +76,8 @@ secrets: - 'candlepin-ca-cert,target=/etc/candlepin/certs/candlepin-ca.crt,mode=0440,type=mount' - 'candlepin-ca-key,target=/etc/candlepin/certs/candlepin-ca.key,mode=0440,type=mount' + - 'candlepin-tomcat-cert,target=/etc/candlepin/certs/tomcat.crt,mode=0440,type=mount' + - 'candlepin-tomcat-key,target=/etc/candlepin/certs/tomcat.key,mode=0440,type=mount' - 'candlepin-tomcat-keystore,target=/etc/candlepin/certs/keystore,mode=0440,type=mount' - 'candlepin-tomcat-truststore,target=/etc/candlepin/certs/truststore,mode=0440,type=mount' - 'candlepin-candlepin-conf,target=/etc/candlepin/candlepin.conf,mode=0440,type=mount' diff --git a/src/roles/candlepin/templates/server.xml.j2 b/src/roles/candlepin/templates/server.xml.j2 index 99db65da1..b50efeb80 100644 --- a/src/roles/candlepin/templates/server.xml.j2 +++ b/src/roles/candlepin/templates/server.xml.j2 @@ -20,8 +20,8 @@ --> - - + + @@ -62,24 +62,21 @@ APR (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL HTTP/1.1 Connector on port 8080 --> - + + maxThreads="150" scheme="https" secure="true"> + + + +