fix: correct path of ssl cert for joinmarket-api

Author: openoms

scripts/install.joinmarket-api.sh

@@ -14,6 +14,9 @@ fi
 source $HOME_DIR/joinin.conf
 
 function joinmarketApiServiceOn() {
+
+  $HOME_DIR/install.selfsignedcert.sh
+
   if ! systemctl is-active --quiet joinmarket-api; then
     echo "# Install joinmarket-api.service"
     echo "# joinmarket-api.service
@@ -46,7 +49,6 @@ WantedBy=multi-user.target
   fi
 }
 
-
 if [ "$1" = on ]; then
 
   joinmarketApiServiceOn
@@ -55,17 +57,13 @@ elif [ "$1" = connect ]; then
 
   joinmarketApiServiceOn
 
-  # https://github.com/openoms/joininbox/issues/78
-  # A self signed cert.pem file in base64 text
-  $HOME_DIR/install.selfsignedcert.sh
-
   # add hidden service
   $HOME_DIR/install.hiddenservice.sh joinmarket-api 28183 28183
 
   # A QR code which displays the textual representation of a url in the following format:"
   #http://<hostname>.onion:28183?cert=<base64cert>
   torAddress=$(sudo cat /mnt/hdd/tor/joinmarket-api/hostname)
-  base64cert=$(base64 -w 0 ${HOME_DIR}/selfsignedcert/cert.pem)
+  base64cert=$(base64 -w 0 ${HOME_DIR}/.joinmarket/ssl/cert.pem)
   url="http://${torAddress}:28183?cert=${base64cert}"
 
   if [ "$runningEnv" = raspiblitz ];then

scripts/install.selfsignedcert.sh

@@ -1,47 +1,22 @@
 #!/bin/bash
-
 # script to create a self-signed SSL certificate
 
 USERNAME=joinmarket
 HOME_DIR=/home/$USERNAME
 
-if [ ! -f ${HOME_DIR}/selfsignedcert/cert.pem ] || [ ! -f ${HOME_DIR}/selfsignedcert/key.pem ];then
+if [ ! -f ${HOME_DIR}/.joinmarket/ssl/cert.pem ] || [ ! -f ${HOME_DIR}/.joinmarket/ssl/key.pem ];then
   sudo apt-get install openssl
 
-  sudo -u ${USERNAME} mkdir ${HOME_DIR}/selfsignedcert
-  cd ${HOME_DIR}/selfsignedcert || exit 1
-
-  echo "# Create a self signed SSL certificate"
-  localip=$(hostname -I | awk '{print $1}')
-
-  sudo -u ${USERNAME} openssl genrsa -out key.pem 2048
-
-  echo "
-[req]
-prompt             = no
-default_bits       = 2048
-default_keyfile    = key.pem
-distinguished_name = req_distinguished_name
-req_extensions     = req_ext
-x509_extensions    = v3_ca
-
-[req_distinguished_name]
-C = GB
-ST = London
-L = JoinMarket
-O = Joininbox
-CN = Joininbox
-[req_ext]
-subjectAltName = @alt_names
-[v3_ca]
-subjectAltName = @alt_names
-[alt_names]
-DNS.1   = localhost
-DNS.2   = 127.0.0.1
-DNS.3   = $localip
-" | sudo -u ${USERNAME} tee localhost.conf
+  if [ -d $HOME_DIR/.joinmarket/ssl ]; then
+    sudo -u $USERNAME rm -rf $HOME_DIR/.joinmarket/ssl
+  fi
 
-  sudo -u ${USERNAME} openssl req -new -x509 -sha256 -key key.pem \
-   -out cert.pem -days 3650 -config localhost.conf
+  subj="/C=US/ST=Utah/L=Lehi/O=Your Company, Inc./OU=IT/CN=example.com"
+  sudo -u $USERNAME mkdir -p $HOME_DIR/.joinmarket/ssl/ \
+   && pushd "$_" \
+   && sudo -u $USERNAME openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes -out cert.pem -keyout key.pem -subj "$subj" \
+   && popd || exit 1
 
-fi
+else
+  echo "${HOME_DIR}/.joinmarket/ssl/cert.pem and key.pem is already present"
+fi