diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml
index 740afa426d..286c56ecf5 100644
--- a/playbooks/groups/keyserver.yml
+++ b/playbooks/groups/keyserver.yml
@@ -26,6 +26,7 @@
- { role: openvpn/client,
when: env != "staging" }
- apache
+ - certbot
- keyserver
tasks:
diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index ee13fe43e2..1a5014bcb6 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -621,9 +621,3 @@
remotepath: /
localpath: /
proxyurl: http://data-analysis01.phx2.fedoraproject.org
-
- - role: httpd/reverseproxy
- website: keys.fedoraproject.org
- destname: keys
- keephost: true
- proxyurl: http://keys02
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 76b648a332..d7ac98039d 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -461,10 +461,6 @@
sslonly: true
cert_name: "{{wildcard_cert_name}}"
- - role: httpd/website
- name: keys.fedoraproject.org
- sslonly: true
- cert_name: "{{wildcard_cert_name}}"
#
# Make a website here so we can redirect it to paste.fedoraproject.org
#
diff --git a/roles/keyserver/tasks/main.yml b/roles/keyserver/tasks/main.yml
index fbbf8443b6..b72c6efb58 100644
--- a/roles/keyserver/tasks/main.yml
+++ b/roles/keyserver/tasks/main.yml
@@ -48,7 +48,7 @@
- config
- name: /etc/httpd/conf.d/ssl.conf
- file: path=/etc/httpd/conf.d/ssl.conf state=absent
+ template: src="ssl.conf" dest=/etc/httpd/conf.d/ssl.conf owner=root group=root mode=0644
tags:
- config
diff --git a/roles/keyserver/templates/sks.conf b/roles/keyserver/templates/sks.conf
index c7a540cc0b..8020dee3f7 100644
--- a/roles/keyserver/templates/sks.conf
+++ b/roles/keyserver/templates/sks.conf
@@ -40,53 +40,48 @@ NameVirtualHost *:443
<VirtualHost *:80>
ServerAdmin sysadmin-keys-members@fedoraproject.org
ServerName keys.fedoraproject.org
+ RewriteEngine On
+ RewriteCond %{HTTPS} off
+ RewriteRule ^/\.well-known/(.*) /srv/web/acme-challenge/.well-known/$1 [L]
+ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
+ Header always add Strict-Transport-Security "max-age=15768000; includeSubDomains; preload"
+</VirtualHost>
-# RewriteEngine On
-# RewriteCond %{HTTPS} off
-# RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
-# Header always add Strict-Transport-Security "max-age=15768000; includeSubDomains; preload"
+<VirtualHost *:443>
+ ServerAdmin sysadmin-keys-members@fedoraproject.org
+ ServerName keys.fedoraproject.org
+ ServerAlias keys02.fedoraproject.org
+ Header always add Strict-Transport-Security "max-age=15768000; includeSubDomains; preload"
+
+ SSLEngine on
+ SSLCertificateFile /etc/letsencrypt/live/keys.fedoraproject.org/cert.pem
+ SSLCertificateKeyFile /etc/letsencrypt/live/keys.fedoraproject.org/privkey.pem
+ SSLCertificateChainFile /etc/letsencrypt/live/keys.fedoraproject.org/fullchain.pem
+ 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
-#<VirtualHost *:443>
-# ServerAdmin sysadmin-keys-members@fedoraproject.org
-# ServerName keys.fedoraproject.org
-# ServerAlias keys02.fedoraproject.org
-# Header always add Strict-Transport-Security "max-age=15768000; includeSubDomains; preload"
-#
-# SSLEngine on
-# SSLCertificateFile /etc/pki/tls/wildcard-2014.fedoraproject.org.cert
-# SSLCertificateChainFile /etc/pki/tls/wildcard-2014.fedoraproject.org.intermediate.cert
-# SSLCertificateKeyFile /etc/pki/tls/wildcard-2014.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>
+ 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
diff --git a/roles/keyserver/templates/ssl.conf b/roles/keyserver/templates/ssl.conf
new file mode 100644
index 0000000000..dd9c7e791e
--- /dev/null
+++ b/roles/keyserver/templates/ssl.conf
@@ -0,0 +1,224 @@
+#
+# This is the Apache server configuration file providing SSL support.
+# It contains the configuration directives to instruct the server how to
+# serve pages over an https connection. For detailing information about these
+# directives see <URL:http://httpd.apache.org/docs/2.2/mod/mod_ssl.html>
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do. They're here only as hints or reminders. If you are unsure
+# consult the online docs. You have been warned.
+#
+
+LoadModule ssl_module modules/mod_ssl.so
+
+#
+# When we also provide SSL we have to listen to the
+# the HTTPS port in addition.
+#
+Listen 443
+
+##
+## SSL Global Context
+##
+## All SSL configuration in this context applies both to
+## the main server and all SSL-enabled virtual hosts.
+##
+
+# Pass Phrase Dialog:
+# Configure the pass phrase gathering process.
+# The filtering dialog program (`builtin' is a internal
+# terminal dialog) has to provide the pass phrase on stdout.
+SSLPassPhraseDialog builtin
+
+# Inter-Process Session Cache:
+# Configure the SSL Session Cache: First the mechanism
+# to use and second the expiring timeout (in seconds).
+SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000)
+SSLSessionCacheTimeout 300
+
+# Semaphore:
+# Configure the path to the mutual exclusion semaphore the
+# SSL engine uses internally for inter-process synchronization.
+#SSLMutex default
+
+# Pseudo Random Number Generator (PRNG):
+# Configure one or more sources to seed the PRNG of the
+# SSL library. The seed data should be of good random quality.
+# WARNING! On some platforms /dev/random blocks if not enough entropy
+# is available. This means you then cannot use the /dev/random device
+# because it would lead to very long connection times (as long as
+# it requires to make more entropy available). But usually those
+# platforms additionally provide a /dev/urandom device which doesn't
+# block. So, if available, use this one instead. Read the mod_ssl User
+# Manual for more details.
+SSLRandomSeed startup file:/dev/urandom 256
+SSLRandomSeed connect builtin
+#SSLRandomSeed startup file:/dev/random 512
+#SSLRandomSeed connect file:/dev/random 512
+#SSLRandomSeed connect file:/dev/urandom 512
+
+#
+# Use "SSLCryptoDevice" to enable any supported hardware
+# accelerators. Use "openssl engine -v" to list supported
+# engine names. NOTE: If you enable an accelerator and the
+# server does not start, consult the error logs and ensure
+# your accelerator is functioning properly.
+#
+SSLCryptoDevice builtin
+#SSLCryptoDevice ubsec
+
+##
+## SSL Virtual Host Context
+##
+
+<VirtualHost _default_:443>
+
+# General setup for the virtual host, inherited from global configuration
+#DocumentRoot "/var/www/html"
+ # ProxyPass / http://localhost:11371/
+ # ProxyPassReverse / http://localhost:11371/
+#ServerName www.example.com:443
+
+# Use separate log files for the SSL virtual host; note that LogLevel
+# is not inherited from httpd.conf.
+ErrorLog logs/ssl_error_log
+TransferLog logs/ssl_access_log
+LogLevel warn
+
+# SSL Engine Switch:
+# Enable/Disable SSL for this virtual host.
+SSLEngine on
+
+# SSL Protocol support:
+# List the enable protocol levels with which clients will be able to
+# connect. Disable SSLv2 access by default:
+SSLProtocol {{ ssl_protocols }}
+
+# SSL Cipher Suite:
+# List the ciphers that the client is permitted to negotiate.
+# See the mod_ssl documentation for a complete list.
+SSLCipherSuite {{ ssl_ciphers }}
+
+# Server Certificate:
+# Point SSLCertificateFile at a PEM encoded certificate. If
+# the certificate is encrypted, then you will be prompted for a
+# pass phrase. Note that a kill -HUP will prompt again. A new
+# certificate can be generated using the genkey(1) command.
+SSLCertificateFile /etc/pki/tls/keys_fedoraproject_org.crt.pem
+
+# Server Private Key:
+# If the key is not combined with the certificate, use this
+# directive to point at the key file. Keep in mind that if
+# you've both a RSA and a DSA private key you can configure
+# both in parallel (to also allow the use of DSA ciphers, etc.)
+SSLCertificateKeyFile /etc/pki/tls/keys_fedoraproject_org.key
+
+# Server Certificate Chain:
+# Point SSLCertificateChainFile at a file containing the
+# concatenation of PEM encoded CA certificates which form the
+# certificate chain for the server certificate. Alternatively
+# the referenced file can be the same as SSLCertificateFile
+# when the CA certificates are directly appended to the server
+# certificate for convinience.
+#SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt
+
+# Certificate Authority (CA):
+# Set the CA certificate verification path where to find CA
+# certificates for client authentication or alternatively one
+# huge file containing all of them (file must be PEM encoded)
+#SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt
+
+# Client Authentication (Type):
+# Client certificate verification type and depth. Types are
+# none, optional, require and optional_no_ca. Depth is a
+# number which specifies how deeply to verify the certificate
+# issuer chain before deciding the certificate is not valid.
+#SSLVerifyClient require
+#SSLVerifyDepth 10
+
+# Access Control:
+# With SSLRequire you can do per-directory access control based
+# on arbitrary complex boolean expressions containing server
+# variable checks and other lookup directives. The syntax is a
+# mixture between C and Perl. See the mod_ssl documentation
+# for more details.
+#<Location />
+#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
+# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
+# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
+# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
+# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \
+# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
+#</Location>
+
+# SSL Engine Options:
+# Set various options for the SSL engine.
+# o FakeBasicAuth:
+# Translate the client X.509 into a Basic Authorisation. This means that
+# the standard Auth/DBMAuth methods can be used for access control. The
+# user name is the `one line' version of the client's X.509 certificate.
+# Note that no password is obtained from the user. Every entry in the user
+# file needs this password: `xxj31ZMTZzkVA'.
+# o ExportCertData:
+# This exports two additional environment variables: SSL_CLIENT_CERT and
+# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+# server (always existing) and the client (only existing when client
+# authentication is used). This can be used to import the certificates
+# into CGI scripts.
+# o StdEnvVars:
+# This exports the standard SSL/TLS related `SSL_*' environment variables.
+# Per default this exportation is switched off for performance reasons,
+# because the extraction step is an expensive operation and is usually
+# useless for serving static content. So one usually enables the
+# exportation for CGI and SSI requests only.
+# o StrictRequire:
+# This denies access when "SSLRequireSSL" or "SSLRequire" applied even
+# under a "Satisfy any" situation, i.e. when it applies access is denied
+# and no other module can change it.
+# o OptRenegotiate:
+# This enables optimized SSL connection renegotiation handling when SSL
+# directives are used in per-directory context.
+#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+<Files ~ "\.(cgi|shtml|phtml|php3?)$">
+ SSLOptions +StdEnvVars
+</Files>
+<Directory "/var/www/cgi-bin">
+ SSLOptions +StdEnvVars
+</Directory>
+
+# SSL Protocol Adjustments:
+# The safe and default but still SSL/TLS standard compliant shutdown
+# approach is that mod_ssl sends the close notify alert but doesn't wait for
+# the close notify alert from client. When you need a different shutdown
+# approach you can use one of the following variables:
+# o ssl-unclean-shutdown:
+# This forces an unclean shutdown when the connection is closed, i.e. no
+# SSL close notify alert is send or allowed to received. This violates
+# the SSL/TLS standard but is needed for some brain-dead browsers. Use
+# this when you receive I/O errors because of the standard approach where
+# mod_ssl sends the close notify alert.
+# o ssl-accurate-shutdown:
+# This forces an accurate shutdown when the connection is closed, i.e. a
+# SSL close notify alert is send and mod_ssl waits for the close notify
+# alert of the client. This is 100% SSL/TLS standard compliant, but in
+# practice often causes hanging connections with brain-dead browsers. Use
+# this only for browsers where you know that their SSL implementation
+# works correctly.
+# Notice: Most problems of broken clients are also related to the HTTP
+# keep-alive facility, so you usually additionally want to disable
+# keep-alive for those clients, too. Use variable "nokeepalive" for this.
+# Similarly, one has to force some clients to use HTTP/1.0 to workaround
+# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
+# "force-response-1.0" for this.
+SetEnvIf User-Agent ".*MSIE.*" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+
+# Per-Server Logging:
+# The home of a custom SSL log file. Use this when you want a
+# compact non-error SSL logfile on a virtual host basis.
+CustomLog logs/ssl_request_log \
+ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+
+</VirtualHost>
+