Moved the copying of the ATS Signing Certificate to the init.d script

because the CasaAuthTokenSvc webapp folder is not created until after
Tomcat is started.

CASA-auth-token/server-java/Svc/linux/CasaAuthtokenSvcD

@@ -115,6 +115,24 @@ StartDAEMON()
     sleep 1
     if atsIsRunning ; then
       rc_failed 0
+
+      # Check if we need to copy the Signing Certificate to the webapp folder
+      if [ ! -f /srv/www/casaats/webapps/CasaAuthTokenSvc/SigningCert ]; then
+        # Wait a max of 60 seconds for the webapp folder to be created
+          wait_sec=60
+          while [ "$wait_sec" != "0" ] ; do
+            sleep 1
+            if [ -d /srv/www/casaats/webapps/CasaAuthTokenSvc ]; then
+              # The folder was created, end the loop
+              wait_sec=0
+              break
+            fi
+            wait_sec=$((wait_sec -1))
+          done
+
+          # Copy the signing certificate to the webapps folder so that it can be downloaded from the ATS
+          cp /etc/CASA/authtoken/keys/localSigningCert /srv/www/casaats/webapps/CasaAuthTokenSvc/SigningCert
+      fi
     else
       rc_failed 7
     fi    
@@ -136,7 +154,7 @@ StopDAEMON()
     while [ "$wait_sec" != "0" ] ; do
       sleep 1
       if ! atsIsRunning ; then
-        # the server is stoped, end the loop
+        # the server is stopped, end the loop
         wait_sec=0
         break
       fi

CASA-auth-token/server-java/Svc/linux/server_keystore_setup.sh

@@ -68,9 +68,6 @@ else
    # Print the exported cert
    #$KEYTOOL_PATH -printcert -file $LOCAL_ATS_SIGNING_CERT_PATH
 
-   # Allow the signing certificate to be downloaded from the ATS
-   cp $LOCAL_ATS_SIGNING_CERT_PATH /srv/www/casaats/webapps/CasaAuthTokenSvc/SigningCert
-
    # Import the signing certificate into the trusted ATS keystore
    $KEYTOOL_PATH -import -noprompt -keystore $TRUSTED_ATS_KEYSTORE_PATH -alias local_signingCert -storepass secret -keypass secret -file $LOCAL_ATS_SIGNING_CERT_PATH