From 51060cf028d8056d4cc7c93b912e6e14c399e3c6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 Jul 2015 18:08:13 +0000 Subject: [PATCH 1/2] Add --- inventory/inventory | 4 ---- roles/hosts/files/sundries01.phx2.fedoraproject.org-hosts | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 roles/hosts/files/sundries01.phx2.fedoraproject.org-hosts diff --git a/inventory/inventory b/inventory/inventory index 3b1c908561..8e9ed31ed5 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -42,9 +42,6 @@ arm01-retrace01.arm.fedoraproject.org retrace01.qa.fedoraproject.org retrace02.qa.fedoraproject.org -[app-stg] -app01.stg.phx2.fedoraproject.org - [ask] ask01.phx2.fedoraproject.org ask02.phx2.fedoraproject.org @@ -518,7 +515,6 @@ junk01.phx2.fedoraproject.org # All staging hosts should be in this group too. # [staging] -app01.stg.phx2.fedoraproject.org ask01.stg.phx2.fedoraproject.org badges-backend01.stg.phx2.fedoraproject.org badges-web01.stg.phx2.fedoraproject.org diff --git a/roles/hosts/files/sundries01.phx2.fedoraproject.org-hosts b/roles/hosts/files/sundries01.phx2.fedoraproject.org-hosts new file mode 100644 index 0000000000..9b5fc13a10 --- /dev/null +++ b/roles/hosts/files/sundries01.phx2.fedoraproject.org-hosts @@ -0,0 +1,4 @@ +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 +10.5.126.23 infrastructure.fedoraproject.org +209.132.182.71 fedora.zanata.org From 64debfb5ae8193ee0294fed0b0bb253743b52c53 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Mon, 27 Jul 2015 18:15:59 +0000 Subject: [PATCH 2/2] use valid template syntax for apache config template --- files/httpd/newvirtualhost.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/httpd/newvirtualhost.conf.j2 b/files/httpd/newvirtualhost.conf.j2 index 11fddcc60d..18c7a2e8ad 100644 --- a/files/httpd/newvirtualhost.conf.j2 +++ b/files/httpd/newvirtualhost.conf.j2 @@ -45,7 +45,7 @@ # when the CA certificates are directly appended to the server # certificate for convinience. #SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt - {% if sslintermediatecertfile is defined %} + {% if sslintermediatecertfile != '' %} SSLCertificateChainFile /etc/pki/tls/certs/{{ sslintermediatecertfile }} {% endif %}