From e51244ab23662f0f8de9b95c7aaa8cb04ba7fd0f Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Thu, 18 Apr 2024 22:10:45 +0200 Subject: [PATCH] Versione: 1.0.35: Versione Server con Token... --- .env.development | 2 +- .env.example.production | 2 +- .env.prod.pcb | 2 +- .env.test.pcb | 2 +- .env.test.risosrv | 10 +++++----- .env.test_riso.pcb | 2 +- _ALL_SITES/fioredellavita.riso.app/.env.development | 2 +- _ALL_SITES/fioredellavita.riso.app/.env.test | 2 +- _ALL_SITES/gruppomacro.app/.env.test | 2 +- _ALL_SITES/piuchebuono.app/.env.development | 2 +- _ALL_SITES/piuchebuono.app/.env.test | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.production | 2 +- _ALL_SITES/riso.app/.env.test | 2 +- _ALL_SITES/terradellavisione.app/.env.development | 2 +- deploy_risosrv_on_test_server.sh | 2 +- send_pwa_to_risotest.sh | 7 ++----- 17 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.env.development b/.env.development index df858001..4deb8a45 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index cbc799e2..11172a75 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index 5ef1f2f1..b06815a0 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index 0cefa483..48801a1b 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 619c43e9..c3ed9a4e 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,16 +1,16 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="splendidus.it/riso" -APP_URL="https://riso.splendidus.it" +DIRECTORY_SERVER=/var/www/testriso.freeplanet_serverside +SERVERDIR_WEBSITE="/var/www/testriso.piuchebuono.app" +APP_URL="https://testriso.piuchebuono.app" URL_FACEBOOK="" PROVA_PAOLO="" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -MONGODB_HOST="https://splendidus.it:3001" +MONGODB_HOST="https://piuchebuono.app:3001" LOGO_REG='riso-logo-full.png' TEST_NAME="" TEST_SURNAME="" diff --git a/.env.test_riso.pcb b/.env.test_riso.pcb index 97163b98..89056c43 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development index e367cf9c..c00dd676 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.development +++ b/_ALL_SITES/fioredellavita.riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.test b/_ALL_SITES/fioredellavita.riso.app/.env.test index d11450bf..7016ca7a 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.test +++ b/_ALL_SITES/fioredellavita.riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/gruppomacro.app/.env.test b/_ALL_SITES/gruppomacro.app/.env.test index 95c2458a..3dab4da5 100755 --- a/_ALL_SITES/gruppomacro.app/.env.test +++ b/_ALL_SITES/gruppomacro.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/piuchebuono.app/.env.development b/_ALL_SITES/piuchebuono.app/.env.development index 0ab89cfc..65707c8c 100755 --- a/_ALL_SITES/piuchebuono.app/.env.development +++ b/_ALL_SITES/piuchebuono.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/piuchebuono.app/.env.test b/_ALL_SITES/piuchebuono.app/.env.test index 95c2458a..3dab4da5 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index df858001..4deb8a45 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index 6da2d14e..42b269be 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index 943cfe60..b0d03de0 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 8f5e9398..eaffa96a 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.34" +APP_VERSION="1.0.35" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/deploy_risosrv_on_test_server.sh b/deploy_risosrv_on_test_server.sh index 0c3eee20..fb4b99b2 100755 --- a/deploy_risosrv_on_test_server.sh +++ b/deploy_risosrv_on_test_server.sh @@ -18,7 +18,7 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -rsync -e 'ssh -p 5522' -a dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE +rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE cp .env.prod.bak .env.production diff --git a/send_pwa_to_risotest.sh b/send_pwa_to_risotest.sh index eb41976b..4adc3754 100755 --- a/send_pwa_to_risotest.sh +++ b/send_pwa_to_risotest.sh @@ -2,10 +2,7 @@ source .env.test.risosrv -cp .env.test.risosrv .env.production - echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." -rsync -e 'ssh -p 5522' -a --exclude 'upload' dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE/ +echo "SERVERDIR_WEBSITE = $SERVERDIR_WEBSITE" +rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE echo "Finito $SERVERDIR_WEBSITE" - -cp .env.prod.bak .env.production