From d7c1cbe118062fcd289b16f7ec5b01cbecb7bd61 Mon Sep 17 00:00:00 2001
From: Arjan H <github@hakwerk.com>
Date: Sat, 4 Dec 2021 15:29:34 +0100
Subject: [PATCH] Make initial setup process a bit more clear

---
 commander                        |  4 ++++
 gui/templates/views/cert.tmpl    | 16 ++++++++++++----
 gui/templates/views/polling.tmpl |  2 +-
 gui/templates/views/wrapup.tmpl  |  2 +-
 install                          |  2 ++
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/commander b/commander
index 3c9b6eb..8102763 100755
--- a/commander
+++ b/commander
@@ -41,6 +41,10 @@ case $txt in
     cp /etc/nginx/ssl/labca_cert.pem /usr/local/share/ca-certificates/labca_cert.crt
     cp ~labca/admin/data/root-ca.pem /usr/local/share/ca-certificates/root-ca.crt
     update-ca-certificates &>>$LOGFILE
+    echo "Waiting for initial startup of the docker containers..." &>>$LOGFILE
+    wait_up $PS_MYSQL &>>$LOGFILE
+    wait_up $PS_LABCA &>>$LOGFILE
+    wait_up $PS_BOULDER $PS_BOULDER_COUNT &>>$LOGFILE
     ;;
 "docker-restart")
     cd /home/labca/boulder
diff --git a/gui/templates/views/cert.tmpl b/gui/templates/views/cert.tmpl
index 8dda835..e5ccf9f 100644
--- a/gui/templates/views/cert.tmpl
+++ b/gui/templates/views/cert.tmpl
@@ -2,7 +2,7 @@
 </div>
 <div class="col-md-6 col-sm-12">
 {{with .CertificateInfo}}
-    <h3>{{ if .IsRoot }}Root{{ else }}Issuer (2nd level){{ end }} Certificate</h3>
+    <h3>{{ if .IsRoot }}<b>Root</b>{{ else }}<b>Issuer</b> (2nd level){{ end }} Certificate</h3>
 
 <ul class="nav nav-tabs">
   <li class="{{ if eq .CreateType "generate" }}active{{ end }}">
@@ -19,7 +19,7 @@
 <div class="tab-content">
   <div class="tab-pane fade {{ if eq .CreateType "generate" }}active in{{ end }}" id="generate">
   <br/>
-<form role="form" action="{{ .RequestBase }}/setup" enctype="multipart/form-data" method="POST">
+<form role="form" class="form-cert" action="{{ .RequestBase }}/setup" enctype="multipart/form-data" method="POST">
   <input type="hidden" name="cert" value="{{ if .IsRoot }}root{{ else }}issuer{{ end }}">
   <input type="hidden" name="createtype" value="generate">
   <div class="form-group">
@@ -73,7 +73,7 @@
 
   <div class="tab-pane fade {{ if eq .CreateType "import" }}active in{{ end }}" id="import">
   <br/>
-<form role="form" action="{{ .RequestBase }}/setup" enctype="multipart/form-data" method="POST">
+<form role="form" class="form-cert" action="{{ .RequestBase }}/setup" enctype="multipart/form-data" method="POST">
   <input type="hidden" name="cert" value="{{ if .IsRoot }}root{{ else }}issuer{{ end }}">
   <input type="hidden" name="createtype" value="import">
   <p>
@@ -101,7 +101,7 @@
 
   <div class="tab-pane fade {{ if eq .CreateType "upload" }}active in{{ end }}" id="upload">
   <br/>
-<form role="form" action="{{ .RequestBase }}/setup" enctype="multipart/form-data" method="POST">
+<form role="form" class="form-cert" action="{{ .RequestBase }}/setup" enctype="multipart/form-data" method="POST">
   <input type="hidden" name="cert" value="{{ if .IsRoot }}root{{ else }}issuer{{ end }}">
   <input type="hidden" name="createtype" value="upload">
   <div class="form-group">
@@ -137,6 +137,8 @@
 </form>
   </div>
 </div>
+<p id="processing" class="hidden"><br/>Setting up LabCA and applying configuration. This will take a minute...<br/>
+<img id="restart-spinner" src="static/img/spinner.gif" height="36"></p>
 {{end}}
 {{ template "partials/progress.tmpl" . }}
 {{end}}
@@ -149,6 +151,12 @@
                     $(window).resize();
                 }, 250);
             });
+{{ if not .CertificateInfo.IsRoot }}
+
+            $(".form-cert").submit(function() {
+                $("#processing").removeClass("hidden");
+            });
+{{end}}
         });
     </script>
 {{end}}
diff --git a/gui/templates/views/polling.tmpl b/gui/templates/views/polling.tmpl
index a8b6d67..bf857b8 100644
--- a/gui/templates/views/polling.tmpl
+++ b/gui/templates/views/polling.tmpl
@@ -3,7 +3,7 @@
 <div class="col-md-6 col-sm-12">
     <h3>Restart</h3>
     <p id="pre-restart-1">
-      Please install the root certificate in the <b>Trusted Root Certification Authorities</b> store of this machine now.<br/>
+      Please install the root certificate in the <b>Trusted Root Certification Authorities</b> store of your client machine now.<br/>
       <a href="../certs/root-ca.der">Windows (.der) format</a>&nbsp;|&nbsp;<a href="../certs/root-ca.pem">Linux (.pem) format</a>
     </p>
     <p id="pre-restart-2">Then, <a class="button active" id="restart-button" href="javascript:void();">restart LabCA</a></p>
diff --git a/gui/templates/views/wrapup.tmpl b/gui/templates/views/wrapup.tmpl
index 73480db..491a2d5 100644
--- a/gui/templates/views/wrapup.tmpl
+++ b/gui/templates/views/wrapup.tmpl
@@ -2,7 +2,7 @@
 </div>
 <div class="col-md-6 col-sm-12">
     <h3>Restart</h3>
-    <p>Almost there! Now we will request a certificate for this website and restart one more time...<br/>
+    <p>Almost there!<br/>Now we will request a certificate for this website and restart one more time...<br/>
     <img id="wrapup-spinner" src="static/img/spinner.gif" height="36"></p>
 {{ template "partials/progress.tmpl" . }}
 {{end}}
diff --git a/install b/install
index 2875c3e..0a648f7 100755
--- a/install
+++ b/install
@@ -634,6 +634,8 @@ config_boulder() {
     sed -i -e "s|http://127.0.0.1:4000/acme/issuer-cert|http://$LABCA_FQDN/certs/ca-int.der|" config/ca-b.json
     sed -i -e "s|http://boulder:4430/acme/issuer-cert|http://$LABCA_FQDN/acme/issuer-cert|" config/wfe2.json
     sed -i -e "s|http://127.0.0.1:4000/acme/issuer-cert|https://$LABCA_FQDN/acme/issuer-cert|" config/wfe2.json
+    sed -i -e "s|letsencrypt/boulder|hakwerk/labca|" config/wfe.json
+    sed -i -e "s|letsencrypt/boulder|hakwerk/labca|" config/wfe2.json
     sed -i -e "s|http://127.0.0.1:4002/|http://$LABCA_FQDN/ocsp/|g" config/ca-a.json
     sed -i -e "s|http://127.0.0.1:4002/|http://$LABCA_FQDN/ocsp/|g" config/ca-b.json
     sed -i -e "s|http://example.com/cps|http://$LABCA_FQDN/cps/|g" config/ca-a.json