diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6552ce1..afb1403 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,4 +15,4 @@ jobs: with: fqcn: 'middleware_automation/keycloak' molecule_tests: >- - [ "default", "overridexml", "quarkus", "quarkus-devmode" ] + [ "default", "overridexml", "https_revproxy", "quarkus", "quarkus-devmode" ] diff --git a/molecule/https_revproxy/molecule.yml b/molecule/https_revproxy/molecule.yml index 6a8790d..48bf375 100644 --- a/molecule/https_revproxy/molecule.yml +++ b/molecule/https_revproxy/molecule.yml @@ -41,8 +41,6 @@ provisioner: ansible_python_interpreter: "{{ ansible_playbook_python }}" env: ANSIBLE_FORCE_COLOR: "true" - REDHAT_PRODUCT_DOWNLOAD_CLIENT_ID: "${PROD_JBOSSNETWORK_API_CLIENTID}" - REDHAT_PRODUCT_DOWNLOAD_CLIENT_SECRET: "${PROD_JBOSSNETWORK_API_SECRET}" verifier: name: ansible scenario: diff --git a/molecule/https_revproxy/prepare.yml b/molecule/https_revproxy/prepare.yml index 5cdb135..a641257 100644 --- a/molecule/https_revproxy/prepare.yml +++ b/molecule/https_revproxy/prepare.yml @@ -3,7 +3,7 @@ hosts: all tasks: - name: Install sudo - ansible.builtin.yum: + ansible.builtin.dnf: name: sudo state: present @@ -14,36 +14,35 @@ - name: Prepare proxy hosts: proxy vars: - jbcs_mod_cluster_enable: True - jbcs_configure_firewalld: False - jbcs_offline_install: False - jbcs_bind_address: '*' - jbcs_proxy_pass: - - path: / - url: http://instance:8080/ - reverse_path: / - reverse_url: http://instance:8080/ - external_domain_name: proxy - rhn_username: "{{ lookup('env', 'REDHAT_PRODUCT_DOWNLOAD_CLIENT_ID') }}" - rhn_password: "{{ lookup('env', 'REDHAT_PRODUCT_DOWNLOAD_CLIENT_SECRET') }}" + nginx_proxy: | + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://instance:8080; + } roles: - - middleware_automation.jbcs.jbcs + - elan.simple_nginx_reverse_proxy pre_tasks: - name: Create certificate request ansible.builtin.command: openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256 -days 365 -nodes -subj '/CN=proxy' delegate_to: localhost - changed_when: False - + changed_when: false + - name: Make certificate directory + ansible.builtin.file: + path: /etc/nginx/tls + state: directory - name: Copy certificates ansible.builtin.copy: src: "{{ item.name }}" dest: "{{ item.dest }}" mode: 0444 - become: True + become: true loop: - - { name: 'cert.pem', dest: '/etc/pki/tls/certs/proxy.crt' } - - { name: 'key.pem', dest: '/etc/pki/tls/private/proxy.key' } - - - name: update_ca_trust - command: update-ca-trust - become: True + - { name: 'cert.pem', dest: '/etc/nginx/tls/certificate.crt' } + - { name: 'key.pem', dest: '/etc/nginx/tls/certificate.key' } + - name: Update CA trust + ansible.builtin.command: update-ca-trust + changed_when: false + become: true diff --git a/molecule/requirements.yml b/molecule/requirements.yml index 5e39b59..c87fd9a 100644 --- a/molecule/requirements.yml +++ b/molecule/requirements.yml @@ -6,3 +6,6 @@ collections: - name: ansible.posix - name: community.docker version: ">=1.9.1" + +roles: + - name: elan.simple_nginx_reverse_proxy