Commit c6a59a74 authored by LAVENIER's avatar LAVENIER
Browse files

Merge branch 'ad323d7-master-patch-43793' into 'master'

Improve tooling & documentation

See merge request sih-public/sumaris/sumaris-pod!54
parents e4ded8cb 6a3958ea
......@@ -40,9 +40,9 @@ The SUMARiS Pod has several features:
- Copy the file [sumaris-db-hsqldb.sh](https://github.com/sumaris-net/sumaris-pod/blob/master/sumaris-server/src/main/assembly/bin/sumaris-db-hsqldb.sh) locally
```bash
wget -kL https://github.com/sumaris-net/sumaris-pod/blob/master/sumaris-server/src/main/assembly/bin/sumaris-db-hsqldb.sh
wget -kL https://raw.githubusercontent.com/sumaris-net/sumaris-pod/master/sumaris-server/src/main/assembly/bin/sumaris-db-hsqldb.sh
# Or using curl:
# curl https://github.com/sumaris-net/sumaris-pod/blob/master/sumaris-server/src/main/assembly/bin/sumaris-db-hsqldb.sh > sumaris-db-hsqldb.sh
# curl https://raw.githubusercontent.com/sumaris-net/sumaris-pod/master/sumaris-server/src/main/assembly/bin/sumaris-db-hsqldb.sh > sumaris-db-hsqldb.sh
# Give execution rights
chmod u+x sumaris-db-hsqldb.sh
......@@ -91,13 +91,13 @@ spring-boot:run -Dspring-boot.run.fork=false -Doracle.net.tns_admin=\\brest\tnsn
* Install LibSodium (Unix only) : https://download.libsodium.org/doc/installation/
* Install Java SDK 8
2. Download the latest JAR file at: https://github.com/sumaris-net/sumaris-pod/releases
2. Download the latest WAR file at: https://github.com/sumaris-net/sumaris-pod/releases
3. Copy the JAR file anywhere;
3. Copy the WAR file anywhere;
4. In a terminal, start the pod using the command:
```bash
java -jar sumaris-pod-x.y.z.jar
java -jar sumaris-pod-x.y.z.war
```
5. Congratulations !
......@@ -140,7 +140,7 @@ To change the Pod's configuration, follow this steps:
4. In a terminal, start the pod with the command:
```bash
java -server -Xms512m -Xmx1024m -Dspring.config.additional-location=/home/<USER>/.config/sumaris/ -jar sumaris-pod-x.y.z.jar
java -server -Xms512m -Xmx1024m -Dspring.config.additional-location=/home/<USER>/.config/sumaris/ -jar sumaris-pod-x.y.z.war
```
5. That's it !
......@@ -174,4 +174,4 @@ To change the Pod's configuration, follow this steps:
mvn install -DskipTests
```
4. The final JAR file should have been created inside the directory: `<PROJECT_DIR>/sumaris-server/target/`
4. The final WAR file should have been created inside the directory: `<PROJECT_DIR>/sumaris-server/target/`
......@@ -44,7 +44,7 @@ fi
PID_FILE="${DATA_DIRECTORY}/${SERVICE_NAME}.pid"
JAR_FILE="${SUMARIS_HOME}/lib/hsqldb-${HSQLDB_VERSION}.jar"
JAR_URL="http://www.hsqldb.org/org/hsqldb/hsqldb/${HSQLDB_VERSION}/hsqldb-${HSQLDB_VERSION}.jar"
JAR_URL="http://www.hsqldb.org/repos/org/hsqldb/hsqldb/${HSQLDB_VERSION}/hsqldb-${HSQLDB_VERSION}.jar"
TOOL_JAR_FILE="${SUMARIS_HOME}/lib/sqltool-${HSQLDB_VERSION}.jar"
TOOL_JAR_URL="http://www.hsqldb.org/repos/org/hsqldb/sqltool/${HSQLDB_VERSION}/sqltool-${HSQLDB_VERSION}.jar"
DB_DIRECTORY=${DATA_DIRECTORY}/db
......@@ -90,7 +90,7 @@ download() {
# Make sure jar exists
checkJarExists() {
if [[ ! -f "${$TOOL_JAR_FILE}" ]]; then
if [[ ! -f "${TOOL_JAR_FILE}" ]]; then
echo "Downloading Hsqldb Tools JAR... ${TOOL_JAR_URL}"
download "${TOOL_JAR_URL}" -o "${TOOL_JAR_FILE}"
if [[ $? -ne 0 ]]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment