From 8320ac01656a8812cc8f20b7068b61494d9cdefa Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 19 Jan 2015 19:28:33 +0000 Subject: [PATCH] Try to complain if ips or cert_name are not specified. --- roles/httpd/website/tasks/main.yml | 4 ++-- roles/httpd/website/vars/main.yml | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/roles/httpd/website/tasks/main.yml b/roles/httpd/website/tasks/main.yml index ab7fbe48e0..e8073ee46a 100644 --- a/roles/httpd/website/tasks/main.yml +++ b/roles/httpd/website/tasks/main.yml @@ -1,11 +1,11 @@ # Expected vars # - name... -# - ips: [] +# - ips... +# - cert_name... # - server_aliases: [] # - server_admin: webmaster@fedoraproject.org # - ssl: true # - sslonly: false -# - cert_name: "" # - SSLCertificateChainFile: "" # - gzip: false diff --git a/roles/httpd/website/vars/main.yml b/roles/httpd/website/vars/main.yml index ac7609056a..b8b5697c3e 100644 --- a/roles/httpd/website/vars/main.yml +++ b/roles/httpd/website/vars/main.yml @@ -1,8 +1,11 @@ -ips: [] -server_aliases: [] +# These three are required +#name: ... +#ips: [] +#cert_name: "" + +server_aliases: [] server_admin: webmaster@fedoraproject.org ssl: true -sslonly: false -cert_name: "" -SSLCertificateChainFile: "" -gzip: false +sslonly: false +SSLCertificateChainFile: "" +gzip: false