summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Bebout <nb@batcave01.phx2.fedoraproject.org>2017-05-10 16:21:01 +0000
committerNick Bebout <nb@batcave01.phx2.fedoraproject.org>2017-05-10 16:21:01 +0000
commitab1ba867c8ce8c3874ac9d89e7d94f48508c8b3c (patch)
tree24705e5506c1c686a061797ee5c6765aaeed9570
parent30d3002882b455170f599838c36ccdcc518680f9 (diff)
downloadansible-ab1ba867c8ce8c3874ac9d89e7d94f48508c8b3c.tar.gz
ansible-ab1ba867c8ce8c3874ac9d89e7d94f48508c8b3c.tar.xz
ansible-ab1ba867c8ce8c3874ac9d89e7d94f48508c8b3c.zip
Disable sks-keyservers.net SSL
-rw-r--r--roles/keyserver/templates/sks.conf34
1 files changed, 17 insertions, 17 deletions
diff --git a/roles/keyserver/templates/sks.conf b/roles/keyserver/templates/sks.conf
index 521249c9c..a64adf5a7 100644
--- a/roles/keyserver/templates/sks.conf
+++ b/roles/keyserver/templates/sks.conf
@@ -70,23 +70,23 @@ NameVirtualHost *:443
SetEnv proxy-nokeepalive 1
ProxyVia Full
</VirtualHost>
-<VirtualHost *:443>
- ServerAdmin sysadmin-keys-members@fedoraproject.org
- ServerName pool.sks-keyservers.net
- ServerAlias sks-keyservers.net
- ServerAlias *.sks-keyservers.net
-
- SSLEngine on
- SSLCertificateFile /etc/pki/tls/keys_fedoraproject_org.crt.pem
- SSLCertificateKeyFile /etc/pki/tls/keys_fedoraproject_org.key
- SSLProtocol {{ ssl_protocols }}
- SSLCipherSuite {{ ssl_ciphers }}
-
- ProxyPass / http://localhost:11371/
- ProxyPassReverse / http://localhost:11371/
- SetEnv proxy-nokeepalive 1
- ProxyVia Full
-</VirtualHost>
+#<VirtualHost *:443>
+# ServerAdmin sysadmin-keys-members@fedoraproject.org
+# ServerName pool.sks-keyservers.net
+# ServerAlias sks-keyservers.net
+# ServerAlias *.sks-keyservers.net
+#
+# SSLEngine on
+# SSLCertificateFile /etc/pki/tls/keys_fedoraproject_org.crt.pem
+# SSLCertificateKeyFile /etc/pki/tls/keys_fedoraproject_org.key
+# SSLProtocol {{ ssl_protocols }}
+# SSLCipherSuite {{ ssl_ciphers }}
+#
+# ProxyPass / http://localhost:11371/
+# ProxyPassReverse / http://localhost:11371/
+# SetEnv proxy-nokeepalive 1
+# ProxyVia Full
+#</VirtualHost>
<VirtualHost *:11371>
ServerAdmin sysadmin-keys-members@fedoraproject.org
ServerName keys.fedoraproject.org