From f7bcb0c36194cf726b3a646f47b08716b0b7d1fa Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Thu, 7 Dec 2023 11:28:01 +0100
Subject: [PATCH] modif

---
 .env.prod.pcb                                  |  2 +-
 .env.test.pcb                                  |  2 +-
 deploynode_on_prod_pcb.sh                      | 18 ++++++++++++++++++
 ...node_on_pcb.sh => deploynode_on_test_pcb.sh |  5 ++---
 src/server/db/mongoose.js                      | 12 +++++++++---
 5 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100755 deploynode_on_prod_pcb.sh
 rename deploynode_on_pcb.sh => deploynode_on_test_pcb.sh (81%)

diff --git a/.env.prod.pcb b/.env.prod.pcb
index 275e951..e068be6 100644
--- a/.env.prod.pcb
+++ b/.env.prod.pcb
@@ -10,7 +10,7 @@ DIRECTORY_SERVER=freeplanet_serverside
 SERVERDIR_WEBSITE=www.freeplanet_server
 PORT_APP1="0"
 DOMAIN=mongodb://localhost:32001/
-AUTH_MONGODB=true
+AUTH_MONGODB=1
 MONGODB_USER=admin
 MONGODB_PWD=mypwadminREAL@1A
 SIGNCODE=SU2134hncaskjdbo231oihJSDNHEI$1@AB
diff --git a/.env.test.pcb b/.env.test.pcb
index cb717e6..d7beb17 100644
--- a/.env.test.pcb
+++ b/.env.test.pcb
@@ -10,7 +10,7 @@ DIRECTORY_SERVER=freeplanet_serverside
 SERVERDIR_WEBSITE=test.freeplanet_server
 PORT_APP1="0"
 DOMAIN=mongodb://localhost:32002/
-AUTH_MONGODB=true
+AUTH_MONGODB=1
 MONGODB_USER=admin
 MONGODB_PWD=mypwadmin@1A
 SIGNCODE=SU2134hncaskjdbo231oihJSDNHEI$1@AB
diff --git a/deploynode_on_prod_pcb.sh b/deploynode_on_prod_pcb.sh
new file mode 100755
index 0000000..162753f
--- /dev/null
+++ b/deploynode_on_prod_pcb.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+source ./.env.prod.pcb
+
+echo "Sincronizzazione in corso PCB PRODUZIONE ... /var/www/$SERVERDIR_WEBSITE/"
+echo ""
+
+rsync -avz -e 'ssh -p 8822' css pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
+rsync -avz -e 'ssh -p 8822' docs pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
+rsync -avz -e 'ssh -p 8822' emails pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
+rsync -avz -e 'ssh -p 8822' images pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
+rsync -avz -e 'ssh -p 8822' plugins pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
+rsync -avz -e 'ssh -p 8822' sass pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
+rsync -avz -e 'ssh -p 8822' src pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
+rsync -avz -e 'ssh -p 8822' .env.prod.pcb pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/.env.production
+rsync -avz -e 'ssh -p 8822' package.json pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/package.json
+
+echo "Sincronizzazione TERMINATA! - SERVER PCB!"
diff --git a/deploynode_on_pcb.sh b/deploynode_on_test_pcb.sh
similarity index 81%
rename from deploynode_on_pcb.sh
rename to deploynode_on_test_pcb.sh
index 8d8241e..fc0485f 100755
--- a/deploynode_on_pcb.sh
+++ b/deploynode_on_test_pcb.sh
@@ -2,7 +2,7 @@
 
 source ./.env.test.pcb
 
-echo "Sincronizzazione in corso PCB ... /var/www/$SERVERDIR_WEBSITE/"
+echo "Sincronizzazione in corso PCB TEST ... /var/www/$SERVERDIR_WEBSITE/"
 echo ""
 
 rsync -avz -e 'ssh -p 8822' css pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
@@ -12,9 +12,8 @@ rsync -avz -e 'ssh -p 8822' images pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
 rsync -avz -e 'ssh -p 8822' plugins pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
 rsync -avz -e 'ssh -p 8822' sass pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
 rsync -avz -e 'ssh -p 8822' src pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
-rsync -avz -e 'ssh -p 8822' .env.production pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/.env.production
 rsync -avz -e 'ssh -p 8822' .env.test.pcb pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/.env.test
-rsync -avz -e 'ssh -p 8822' .env.test.pcb pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/.env.test.pcb
+rsync -avz -e 'ssh -p 8822' .env.test.pcb pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/
 rsync -avz -e 'ssh -p 8822' package.json pcbuser@pcb:/var/www/$SERVERDIR_WEBSITE/package.json
 
 echo "Sincronizzazione TERMINATA! - SERVER PCB!"
diff --git a/src/server/db/mongoose.js b/src/server/db/mongoose.js
index be0e2a6..8cd7f3a 100755
--- a/src/server/db/mongoose.js
+++ b/src/server/db/mongoose.js
@@ -11,7 +11,7 @@ mongoose.plugin(schema => {
 
 mongoose.set('debug', false);
 
-const options = {
+let options = {
   // user: process.env.UDB,
   // pass: process.env.PDB,
   // useMongoClient: true,
@@ -38,7 +38,7 @@ const options = {
   // keepAliveInitialDelay: 300000   // keepAliveInitialDelay is the number of milliseconds to wait before initiating keepAlive on the socket.
 };
 
-if (process.env.AUTH_MONGODB) {
+if (process.env.AUTH_MONGODB === '1') {
   options.auth = {
     authSource: "admin",
     poolSize: 10,
@@ -47,6 +47,12 @@ if (process.env.AUTH_MONGODB) {
   };
 }
 
+if (options.auth && options.auth.user) {
+  console.log('MongoDb con Authenticazione:', options.auth.user, '******');
+} else {
+  console.log('### MongoDb SENZA Authenticazione !!! ');
+}
+
 const db = mongoose.connection;
 
 console.log('Node Version ' + process.version);
@@ -60,7 +66,7 @@ mongoose.connect(connectionUrl, options);
 db.on('error', console.error.bind(console, 'connection error:'));
 db.once('open', function () {
   // we're connected!
-  console.log('*** CONNESSIONE EFFETTUATA ! ' + process.env.MONGODB_URI + ' db: ' + process.env.DATABASE)
+  console.log('*** CONNESSIONE EFFETTUATA ! ' + connectionUrl + ' db: ' + process.env.DATABASE)
 
 });