zilti
/
sompani-toolbox
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Shell fix

This commit is contained in:
Daniel Ziltener 2020-02-13 17:55:36 +01:00
parent e2d2564273
commit e670131de0
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/sompani/onboarding.clj
View File

@ -29,7 +29,7 @@
(recur)))) (recur))))
(.waitFor process))) (.waitFor process)))
(def driver (FirefoxDriver.)) (def driver (atom nil))
;; # AWS Domain ;; # AWS Domain
(declare make-dns-entries!) (declare make-dns-entries!)
@ -141,7 +141,7 @@
;; ## nginx configuration ;; ## nginx configuration
(defn create-nginx-server! [datamap] (defn create-nginx-server! [datamap]
(printf "Creating nginx entries for $s." (:company-name datamap)) (printf "Creating nginx entries for %n." (:company-name datamap))
(doseq [file ["skel.talent.careers" (doseq [file ["skel.talent.careers"
"staging.skel.talent.careers"] "staging.skel.talent.careers"]
:let [in-file (str "resources/nginx/" file) :let [in-file (str "resources/nginx/" file)
@ -154,13 +154,14 @@
;; ## Certificates ;; ## Certificates
(defn generate-certs! [{:keys [company-name company-domain] :as datamap}] (defn generate-certs! [{:keys [company-name company-domain] :as datamap}]
(println "Generating certificates...") (println "Generating certificates...")
(apply sh (map #(cljstache/render % datamap) (let [command (map #(cljstache/render % datamap)
["certbot" "certonly" "--nginx" ["certbot" "certonly" "--nginx"
"-d" "staging.{{company-name}}.talent.careers" "-d" "staging.{{company-name}}.talent.careers"
"-d" "{{company-name}}.talent.careers" "-d" "{{company-name}}.talent.careers"
"-d" "talent.{{company-domain}}" "-d" "talent.{{company-domain}}"
"-d" "www.talent.{{company-domain}}" "-d" "www.talent.{{company-domain}}"
"--cert-name" "{{company-name}}"])) "--cert-name" "{{company-name}}"])]
(apply sh command))
(println "ok.")) (println "ok."))
;; # DNS configuration ;; # DNS configuration
@ -220,7 +221,8 @@
datamap {:company-name vc-name "company-domain" vc-domain}] datamap {:company-name vc-name "company-domain" vc-domain}]
(and deploy-directories (make-dirs! datamap)) (and deploy-directories (make-dirs! datamap))
(and base-dns (make-basic-dns-entries! datamap)) (and base-dns (make-basic-dns-entries! datamap))
(and aws-domain (do (aws-login) (and aws-domain (do (reset! driver (FirefoxDriver.))
(aws-login)
(Thread/sleep 5000) (Thread/sleep 5000)
(aws-verify-domain-dns datamap) (aws-verify-domain-dns datamap)
(aws-verify-domain-mailfrom datamap))) (aws-verify-domain-mailfrom datamap)))