uncomment working parts

Author: JacobCoffee

salt/tls/init.sls

@@ -45,19 +45,7 @@ certbot:
       - pkg: ssl-cert
 {% endfor %}
 
-# initial test
 {% if grains['id'] == 'salt.nyc1.psf.io' or grains['id'] == 'salt-master.vagrant.psf.io' %}
-pypa.io:
-  acme.cert:
-    - email: [email protected]
-    - webroot: /etc/lego
-    - renew: 14
-    {% if pillar["dc"] == "vagrant" %}
-    - server: https://salt-master.vagrant.psf.io:14000/dir
-    {% endif %}
-    - require:
-      - sls: tls.lego
-      - file: /etc/lego/.well-known/acme-challenge
 
 # DNS-validated domains
 # dns plugins do not exist yet for route53 & gandi
@@ -73,7 +61,7 @@ pypa.io:
 {#    - require:#}
 {#      - pkg: certbot#}
 {#
-- sls: tls.lego#}
+- sls: tls.lego
 {#star.pycon.org:#}
 {#  acme.cert:#}
 {#    - aliases:#}
@@ -98,22 +86,25 @@ pypa.io:
 {#      - sls: tls.lego#}
 
 # HTTP-validated domains
-{#{% for domain in [#}
-{#    'pypa.io',#}
-{#    'www.pycon.org',#}
-{#    'speed.pypy.org',#}
-{#    'salt-public.psf.io',#}
-{#    'planetpython.org',#}
-{#    'bugs.python.org'#}
-{#] %}#}
-{#{{ domain }}:#}
-{#  acme.cert:#}
-{#    - email: [email protected]#}
-{#    - webroot: /etc/lego#}
-{#    - renew: 14#}
-{#    - require:#}
-{#      - sls: tls.lego#}
-{#{% endfor %}#}
+{% for domain in [
+    'pypa.io',
+    'www.pycon.org',
+    'speed.pypy.org',
+    'salt-public.psf.io',
+    'planetpython.org',
+    'bugs.python.org'
+] %}
+{{ domain }}:
+  acme.cert:
+    - email: [email protected]
+    - webroot: /etc/lego
+    - renew: 14
+    {% if pillar["dc"] == "vagrant" %}
+    - server: https://salt-master.vagrant.psf.io:14000/dir
+    {% endif %}
+    - require:
+      - sls: tls.lego
+{% endfor %}
 
 # Multi-domain certificates
 {#jython.org:#}
@@ -128,7 +119,7 @@ pypa.io:
 {#    - renew: 14#}
 {#    - require:#}
 {#      - sls: tls.lego#}
-
+{##}
 {#bugs.python.org-multi:#}
 {#  acme.cert:#}
 {#    - name: bugs.python.org#}