Merge branch '2.0.0'

Author: RPSoftCompany

.gitignore

@@ -104,6 +104,7 @@ node_modules
 server/client
 server/secret
 server/server/datasources.test*
+server/server/datasources.development*
 
 dist/tower-*
 

.idea/jsLinters/eslint.xml

@@ -0,0 +1,15 @@
+Copyright RPSoft 2019,2020. All Rights Reserved.
+This file is part of RPSoft Tower.
+
+Tower is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Tower is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Tower. If not, see http:www.gnu.org/licenses/gpl-3.0.html.

.idea/prettier.xml

@@ -6,6 +6,7 @@
   "nonSafe": false,
   "fullEncryption": false,
   "tokenHeaders": [],
+  "auditTTL": 30,
   "#privateKey": "./certs/privatekey.pem",
   "#certificate": "./certs/certificate.pem"
 }

.idea/tower.iml

@@ -1,16 +1,17 @@
 FROM ubuntu:20.04
 
-ARG VERSION=1.17.0
+ARG VERSION=2.0.0
 
 LABEL TOWER_VERSION=${VERSION}
 
 ENV NODE_ENV production
+ENV NVM_DIR /home/tower/.nvm
 
-RUN apt update && apt install -y wget unzip
+RUN apt update && apt install -y wget unzip git curl
 
-RUN mkdir -p /apps/tower
+RUN mkdir -p /home/tower
 
-WORKDIR /apps/tower
+WORKDIR /home/tower
 
 RUN groupadd -g 2001 tower \
     && useradd -r -u 2001 -g tower tower
@@ -19,11 +20,29 @@ RUN chown -R tower:tower .
 
 USER tower
 
-RUN wget -q https://github.com/RPSoftCompany/tower/releases/download/${VERSION}/tower-${VERSION}.zip
-RUN unzip tower-${VERSION}.zip
-RUN mv tower/* .
+RUN git clone https://github.com/RPSoftCompany/tower.git
 
-RUN chmod 777 ./tower-linux
+RUN ( git clone https://github.com/nvm-sh/nvm.git "$NVM_DIR" && \
+  cd "$NVM_DIR" && \
+  git checkout `git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1)` \
+  ) && \. "$NVM_DIR/nvm.sh"
+
+WORKDIR /home/tower/tower
+
+RUN [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && nvm install node && npm install
+
+WORKDIR /home/tower/tower/server
+
+RUN [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && nvm install && npm install
+RUN mkdir -p client/ui
+
+WORKDIR /home/tower/tower/ui
+
+RUN [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && nvm install && export NODE_ENV=development && npm install
+RUN [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && nvm use && npm i -g @quasar/cli && npm run build
+RUN cp -r ./dist/spa/* ../server/client/ui/
+
+WORKDIR /home/tower/tower/server
 
 COPY config.json .
 COPY database-config.json_template .

.idea/workspace.xml

@@ -6,6 +6,7 @@
   "nonSafe": $NON_SAFE,
   "fullEncryption": $FULL_ENCRYPTION,
   "tokenHeaders": $TOKEN_HEADERS,
+  "auditTTL": $AUDIT_TTL,
   "#privateKey": "./certs/privatekey.pem",
   "#certificate": "./certs/certificate.pem"
 }

Copyright.txt

@@ -1,5 +1,23 @@
 #!/bin/bash
 
+#
+# Copyright RPSoft 2019,2023. All Rights Reserved.
+# This file is part of RPSoft Tower.
+#
+# Tower is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Tower is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Tower. If not, see http:www.gnu.org/licenses/gpl-3.0.html.
+#
+
 # =============================
 # secret
 # =============================
@@ -46,6 +64,12 @@ then
   __NON_SAFE="false"
 fi
 
+__AUDIT_TTL=${AUDIT_TTL}
+if [ -z "${__AUDIT_TTL}" ]
+then
+  __AUDIT_TTL="30"
+fi
+
 __FULL_ENCRYPTION=${FULL_ENCRYPTION}
 if [ -z "${__FULL_ENCRYPTION}" ]
 then
@@ -78,4 +102,4 @@ fi
 
 awk -v database="${__DATABASE}" '{sub(/\$DATABASE/, database)}1' database-config.json_template > database-config.json
 
-exec ./tower-linux
+exec node .