Revert unstaged parts from berlin.

This reverts parts of commit 2ec0a03774.

hydra/nginx/berlin.scm

@@ -108,9 +108,9 @@ Allow: /$\r
 
            ;; Do not tolerate slowness of hydra.gnu.org when fetching
            ;; narinfos: better return 504 quickly than wait forever.
-           "proxy_connect_timeout 10s;"
-           "proxy_read_timeout 10s;"
-           "proxy_send_timeout 10s;"
+           "proxy_connect_timeout 2s;"
+           "proxy_read_timeout 2s;"
+           "proxy_send_timeout 2s;"
 
            ;; 'guix publish --ttl' produces a 'Cache-Control' header for
            ;; use by 'guix substitute'.  Let it through rather than use
@@ -959,6 +959,7 @@ PUBLISH-URL."
       %tls-settings
       (list
        "add_header Content-Security-Policy \"frame-ancestors 'none'\";"
+
        ;; TODO This works around NGinx using the epoch for the
        ;; Last-Modified date, as well as the etag.
        ;; See http://issues.guix.gnu.org/37207