Updated Setup instructions in README

OWNER_KEY_PASSWORD not required in .env anymore

Author: namedgraph

.env_sample

@@ -15,5 +15,4 @@ OWNER_ORG_UNIT=My unit
 OWNER_ORGANIZATION=My org
 OWNER_LOCALITY=Copenhagen
 OWNER_STATE_OR_PROVINCE=Denmark
-OWNER_COUNTRY_NAME=DK
-OWNER_KEY_PASSWORD=changeit
+OWNER_COUNTRY_NAME=DK

README.md

@@ -20,10 +20,11 @@ What makes LinkedDataHub unique is its completely _data-driven architecture_: ap
 <details>
   <summary>Click to expand</summary>
 
-  1. [Install Docker](https://docs.docker.com/install/)
+  1. Have your `bash` shell ready. It should be included by default on Linux. On Windows you can install the [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
+  2. [Install Docker](https://docs.docker.com/install/)
      - [Install Docker Compose](https://docs.docker.com/compose/install/), if it is not already included in the Docker installation
-  2. [Fork](https://guides.github.com/activities/forking/) this repository and clone the fork into a folder
-  3. In the folder, create an `.env` file and fill out the missing values (you can use [`.env_sample`](https://github.com/AtomGraph/LinkedDataHub/blob/master/.env_sample) as a template). For example:
+  3. [Fork](https://guides.github.com/activities/forking/) this repository and clone the fork into a folder
+  4. In the folder, create an `.env` file and fill out the missing values (you can use [`.env_sample`](https://github.com/AtomGraph/LinkedDataHub/blob/master/.env_sample) as a template). For example:
   ```
   COMPOSE_CONVERT_WINDOWS_PATHS=1
   COMPOSE_PROJECT_NAME=linkeddatahub
@@ -42,26 +43,30 @@ What makes LinkedDataHub unique is its completely _data-driven architecture_: ap
   OWNER_LOCALITY=Copenhagen
   OWNER_STATE_OR_PROVINCE=Denmark
   OWNER_COUNTRY_NAME=DK
-  OWNER_KEY_PASSWORD=changeit
   ```
-  4. Run this from command line:
+  5. Setup SSL certificates/keys by running this from command line (replace `$owner_cert_pwd` and `$secretary_cert_pwd` with your own passwords):
+  ```
+  ./scripts/setup.sh .env ssl $owner_cert_pwd $secretary_cert_pwd 3650 
+  ```
+  The script will create an `ssl` sub-folder where the SSL certificates and/or public keys will be placed. It requires Java's `keytool` as well as `openssl` to be available on `$PATH`.
+  6. Launch the application services by running this from command line:
   ```
   docker-compose up
   ```
-  5. LinkedDataHub will start and create the following sub-folders:
-     - `certs` where your WebID certificates are stored
+  LinkedDataHub will start and mount the following sub-folders:
      - `data` where the triplestore(s) will persist RDF data
      - `uploads` where LDH stores content-hashed file uploads
-  6. Install `certs/owner.p12` into a web browser of your choice (password is the `OWNER_KEY_PASSWORD` value)
+
+  The first should take around half a minute as datasets are being loaded into triplestores. After a successful startup, the last line of the Docker log should read something like:
+
+    linkeddatahub_1     | 09-Feb-2021 14:18:10.536 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in [32609] milliseconds
+
+  7. Install `ssl/owner/keystore.p12` into a web browser of your choice (password is the `$owner_cert_pwd` value supplied to `setup.sh`)
      - Google Chrome: `Settings > Advanced > Manage Certificates > Import...`
      - Mozilla Firefox: `Options > Privacy > Security > View Certificates... > Import...`
      - Apple Safari: The file is installed directly into the operating system. Open the file and import it using the [Keychain Access](https://support.apple.com/guide/keychain-access/what-is-keychain-access-kyca1083/mac) tool.
      - Microsoft Edge: Does not support certificate management, you need to install the file into Windows. [Read more here](https://social.technet.microsoft.com/Forums/en-US/18301fff-0467-4e41-8dee-4e44823ed5bf/microsoft-edge-browser-and-ssl-certificates?forum=win10itprogeneral).
-  7. Open **https://localhost:4443/** in that web browser
-
-  After a successful startup, the last line of the Docker log should read:
-
-      linkeddatahub_1    | 02-Feb-2020 02:02:20.200 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in 3420 ms
+  8. Open **https://localhost:4443/** in that web browser
 
   ### Notes
 
@@ -108,7 +113,7 @@ _:warning: Do not use blank nodes to identify applications or services. We recom
 
   If you need to start fresh and wipe the existing setup (e.g. after configuring a new base URI), you can do that using
   ```
-  sudo rm -rf certs data && docker-compose down -v
+  sudo rm -rf data && docker-compose down -v
   ```
 
 _:warning: This will **remove the persisted data**, server and owner certificates as well as their Docker volumes._

scripts/setup.sh

@@ -22,6 +22,7 @@ secretary_keystore="${out_folder}/secretary/keystore.p12"
 secretary_keystore_pwd="LinkedDataHub"
 secretary_cert="${out_folder}/secretary/cert.pem"
 secretary_cert_pwd="$4"
+secretary_cert_dname="CN=LDH, OU=LDH, O=AtomGraph, L=Copenhagen, ST=Denmark, C=DK"
 
 validity="$5"
 
@@ -149,7 +150,6 @@ secretary_uri="${base_uri}admin/acl/agents/${secretary_uuid}/#this"
 
 printf "\n### Secretary's WebID URI: %s\n" "$secretary_uri"
 
-secretary_cert_dname="CN=LDH, OU=LDH, O=AtomGraph, L=Copenhagen, ST=Denmark, C=DK"
 printf "\n### Secretary WebID certificate's DName attributes: %s\n" "$secretary_cert_dname"
 
 keytool \