From 2c636e0a957f6d8ba75746db318c7920abb6170e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 9 Oct 2018 09:33:30 +0000 Subject: [PATCH] java-deptools: Turn proxy.conf into jinja template --- roles/java-deptools/tasks/main.yml | 2 +- .../{files/proxy.conf => templates/proxy.conf.j2} | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename roles/java-deptools/{files/proxy.conf => templates/proxy.conf.j2} (56%) diff --git a/roles/java-deptools/tasks/main.yml b/roles/java-deptools/tasks/main.yml index 28795d7201..80d414459b 100644 --- a/roles/java-deptools/tasks/main.yml +++ b/roles/java-deptools/tasks/main.yml @@ -82,7 +82,7 @@ - config - name: Install proxy config - copy: src=proxy.conf dest=/etc/httpd/conf.d/java-deptools-proxy.conf + template: src=proxy.conf.j2 dest=/etc/httpd/conf.d/java-deptools-proxy.conf notify: - restart apache tags: diff --git a/roles/java-deptools/files/proxy.conf b/roles/java-deptools/templates/proxy.conf.j2 similarity index 56% rename from roles/java-deptools/files/proxy.conf rename to roles/java-deptools/templates/proxy.conf.j2 index 6e47da3caf..ef5f914d97 100644 --- a/roles/java-deptools/files/proxy.conf +++ b/roles/java-deptools/templates/proxy.conf.j2 @@ -1,4 +1,4 @@ -ServerName java-deptools.fedorainfracloud.org +ServerName {{ inventory_hostname }} AddDefaultCharset off @@ -8,9 +8,9 @@ ServerName java-deptools.fedorainfracloud.org SSLEngine on - SSLCertificateFile /etc/letsencrypt/live/java-deptools.fedorainfracloud.org/cert.pem - SSLCertificateKeyFile /etc/letsencrypt/live/java-deptools.fedorainfracloud.org/privkey.pem - SSLCertificateChainFile /etc/letsencrypt/live/java-deptools.fedorainfracloud.org/fullchain.pem + SSLCertificateFile /etc/letsencrypt/live/{{ inventory_hostname }}/cert.pem + SSLCertificateKeyFile /etc/letsencrypt/live/{{ inventory_hostname }}/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/{{ inventory_hostname }}/fullchain.pem SSLHonorCipherOrder On SSLCipherSuite {{ ssl_ciphers }} SSLProtocol {{ ssl_protocols }}