                   (keys old-ssl-config)))))
   (let [truststore  (-> (ssl/keystore)
                       (ssl/assoc-cert-file! "PuppetDB CA" ssl-ca-cert))
-        keystore-pw (pl-utils/uuid)
+        keystore-pw (uuid)
         keystore    (-> (ssl/keystore)
                       (ssl/assoc-private-key-file! "PuppetDB Agent Private Key" ssl-key keystore-pw ssl-cert))]
     (-> options

  (:import [java.security KeyStore])
  (:require [clojure.tools.logging :as log]
            [puppetlabs.kitchensink.ssl :as ssl]
            [puppetlabs.kitchensink.core :as pl-utils]
            [puppetlabs.kitchensink.core :refer [missing?]]))

(defn configure-web-server-ssl-from-pems
  "Configures the web server's SSL settings based on Puppet PEM files, rather than

  This bug is solved in Jetty 9, so this check can probably be removed if we
  upgrade."
  ([threads]
    (jetty7-minimum-threads threads (inc (num-cpus))))

  ([threads min-threads]
    {:pre [(pos? threads)
