From 0832b3369749f183c83d494ecfda795f6955c7ef Mon Sep 17 00:00:00 2001 From: Nabarun Pal Date: Sat, 14 Mar 2020 05:06:11 +0530 Subject: [PATCH 1/2] Remove SSL from roots/inpycon/init.sls SSL should always be on. --- salt/roots/inpycon/init.sls | 3 --- 1 file changed, 3 deletions(-) diff --git a/salt/roots/inpycon/init.sls b/salt/roots/inpycon/init.sls index db4ff7e..2d00d73 100644 --- a/salt/roots/inpycon/init.sls +++ b/salt/roots/inpycon/init.sls @@ -102,7 +102,6 @@ nginx_inpycon_dir: - require: - file: nginx_inpycon_dir -{% if ssl['on'] %} /etc/ssl/in.pycon.org.2016.fullchain.pem: file.managed: - contents_pillar: pycon:ssl:cert @@ -118,5 +117,3 @@ nginx_inpycon_dir: /etc/nginx/sites-available/in.pycon.org.with_ssl.conf: file.managed: - source: salt://inpycon/in.pycon.org.with_ssl.conf - -{% endif %} From 6e40f046921967639c9030ca4db9c4a487650b36 Mon Sep 17 00:00:00 2001 From: Nabarun Pal Date: Sat, 14 Mar 2020 05:11:23 +0530 Subject: [PATCH 2/2] Comment out SSL cert salt config until Pillar gets updated with new certs --- salt/roots/inpycon/init.sls | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/salt/roots/inpycon/init.sls b/salt/roots/inpycon/init.sls index 2d00d73..304e1c9 100644 --- a/salt/roots/inpycon/init.sls +++ b/salt/roots/inpycon/init.sls @@ -102,13 +102,13 @@ nginx_inpycon_dir: - require: - file: nginx_inpycon_dir -/etc/ssl/in.pycon.org.2016.fullchain.pem: - file.managed: - - contents_pillar: pycon:ssl:cert +# /etc/letsencrypt/live/in.pycon.org/fullchain.pem: +# file.managed: +# - contents_pillar: pycon:ssl:cert -/etc/ssl/in.pycon.org.2016.pvtkey.pem: - file.managed: - - contents_pillar: pycon:ssl:key +# /etc/letsencrypt/live/in.pycon.org/privkey.pem: +# file.managed: +# - contents_pillar: pycon:ssl:key /etc/ssl/dhparam.pem: file.managed: