From a6802a078482ba958c612b8c0f0b99de9eeadcca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com>
Date: Thu, 21 Sep 2023 15:06:30 +0000
Subject: [PATCH] chore: better local config
---
.env.template | 28 -------
dbinit/dbinit.sql | 4 -
dbinit/fluidprices.CSV | 84 ---------------------
dbinit/init.md | 25 -------
docker-compose.local.yml | 60 +--------------
docker-compose.yml | 72 ------------------
mnt/configs/tokenskey.json | 3 -
nginx/{site.conf => site.local.conf} | 14 ++--
scripts/import-convert-assets.sh | 29 --------
scripts/init-fluidprices.sh | 106 ---------------------------
10 files changed, 8 insertions(+), 417 deletions(-)
delete mode 100644 .env.template
delete mode 100644 dbinit/dbinit.sql
delete mode 100644 dbinit/fluidprices.CSV
delete mode 100644 dbinit/init.md
delete mode 100644 docker-compose.yml
delete mode 100644 mnt/configs/tokenskey.json
rename nginx/{site.conf => site.local.conf} (56%)
delete mode 100755 scripts/import-convert-assets.sh
delete mode 100755 scripts/init-fluidprices.sh
diff --git a/.env.template b/.env.template
deleted file mode 100644
index e63fc882..00000000
--- a/.env.template
+++ /dev/null
@@ -1,28 +0,0 @@
-NODE_TLS_REJECT_UNAUTHORIZED = '0'
-HTTPS=true
-SSL_CRT_FILE=cert.pem
-SSL_KEY_FILE=key.pem
-
-# Common settings
-HOSTNAME=localhost
-ANIMATOR_ROLE=ANIMATORS
-ADMIN_ROLE=ADMINS
-DEBUG_MODE=
-MOCK_OAUTH2=
-HTTPS_PORT=
-IMAGE_FOLDER=
-
-# Needed to user OAuth2 authentication :
-REDIRECT_URL=
-CLIENT_ID=
-CLIENT_SECRET=
-AUTH_URL=
-TOKEN_URL=
-USERINFO_URL=
-
-# Access to the database
-DATABASE_USER=
-DATABASE_PASSWORD=
-DATABASE_NAME=
-
-SGE_API_TOKEN=
diff --git a/dbinit/dbinit.sql b/dbinit/dbinit.sql
deleted file mode 100644
index 1070e073..00000000
--- a/dbinit/dbinit.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-LOAD DATA LOCAL INFILE '/dbinit/fluidprices.CSV' INTO TABLE prices
-FIELDS TERMINATED BY ','
-LINES TERMINATED BY '\n'
-IGNORE 1 ROWS;
\ No newline at end of file
diff --git a/dbinit/fluidprices.CSV b/dbinit/fluidprices.CSV
deleted file mode 100644
index 21670990..00000000
--- a/dbinit/fluidprices.CSV
+++ /dev/null
@@ -1,84 +0,0 @@
-fluid_type,price,start_date,end_date,id,created_at,updated_at
-0,0.1256,2012-07-23T00:00:00Z,2013-07-31T23:59:59Z,1,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1329,2013-08-01T00:00:00Z,2014-10-31T23:59:59Z,2,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1401,2014-01-11T00:00:00Z,2015-07-31T23:59:59Z,3,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1437,2015-08-01T00:00:00Z,2016-07-31T23:59:59Z,4,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1503,2016-08-01T00:00:00Z,2017-07-31T23:59:59Z,5,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1546,2017-08-01T00:00:00Z,2018-01-31T23:59:59Z,6,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1555,2018-02-01T00:00:00Z,2018-07-31T23:59:59Z,7,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.145,2018-08-01T00:00:00Z,2019-05-31T23:59:59Z,8,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1531,2019-06-01T00:00:00Z,2019-07-31T23:59:59Z,9,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1524,2019-08-01T00:00:00Z,2020-01-31T23:59:59Z,10,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1546,2020-02-01T00:00:00Z,2020-07-31T23:59:59Z,11,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1557,2020-08-01T00:00:00Z,2021-01-31T23:59:59Z,12,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1582,2021-02-01T00:00:00Z,2021-07-31T23:59:59Z,13,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.1558,2021-08-01T00:00:00Z,2022-01-31T23:59:59Z,14,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-0,0.174,2022-02-01T00:00:00Z,,15,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-1,0.0030735,2012-01-01T00:00:00Z,2012-12-31T23:59:59Z,16,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-1,0.0031483,2013-01-01T00:00:00Z,2013-12-31T23:59:59Z,17,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-1,0.0031381,2014-01-01T00:00:00Z,2014-12-31T23:59:59Z,18,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-1,0.00307,2015-01-01T00:00:00Z,2015-12-31T23:59:59Z,19,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-1,0.0031,2016-01-01T00:00:00Z,2016-12-31T23:59:59Z,20,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-1,0.00311,2017-01-01T00:00:00Z,2017-12-31T23:59:59Z,21,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-1,0.00313,2018-01-01T00:00:00Z,2018-12-31T23:59:59Z,22,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-1,0.00313,2019-01-01T00:00:00Z,2019-12-31T23:59:59Z,23,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-1,0.00315,2020-01-01T00:00:00Z,2020-12-31T23:59:59Z,24,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-1,0.00319,2021-01-01T00:00:00Z,,25,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0919,2017-01-01T00:00:00Z,2017-01-31T23:59:59Z,26,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0915,2017-02-01T00:00:00Z,2017-02-28T23:59:59Z,27,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0932,2017-03-01T00:00:00Z,2017-03-31T23:59:59Z,28,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0927,2017-04-01T00:00:00Z,2017-04-30T23:59:59Z,29,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0906,2017-05-01T00:00:00Z,2017-05-31T23:59:59Z,30,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0906,2017-06-01T00:00:00Z,2017-06-30T23:59:59Z,31,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0788,2017-07-01T00:00:00Z,2017-07-31T23:59:59Z,32,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0783,2017-08-01T00:00:00Z,2017-08-31T23:59:59Z,33,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0783,2017-09-01T00:00:00Z,2017-09-30T23:59:59Z,34,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0791,2017-10-01T00:00:00Z,2017-10-31T23:59:59Z,35,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0806,2017-11-01T00:00:00Z,2017-11-30T23:59:59Z,36,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0812,2017-12-01T00:00:00Z,2017-12-31T23:59:59Z,37,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0857,2018-01-01T00:00:00Z,2018-01-31T23:59:59Z,38,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0866,2018-02-01T00:00:00Z,2018-02-28T23:59:59Z,39,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0847,2018-03-01T00:00:00Z,2018-03-31T23:59:59Z,40,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0839,2018-04-01T00:00:00Z,2018-04-30T23:59:59Z,41,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0842,2018-05-01T00:00:00Z,2018-05-31T23:59:59Z,42,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0855,2018-06-01T00:00:00Z,2018-06-30T23:59:59Z,43,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0959,2018-07-01T00:00:00Z,2018-07-31T23:59:59Z,44,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0961,2018-08-01T00:00:00Z,2018-08-31T23:59:59Z,45,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0967,2018-09-01T00:00:00Z,2018-09-30T23:59:59Z,46,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0989,2018-10-01T00:00:00Z,2018-10-31T23:59:59Z,47,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.1031,2018-11-01T00:00:00Z,2018-11-30T23:59:59Z,48,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.1013,2018-12-01T00:00:00Z,2018-12-31T23:59:59Z,49,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0999,2019-01-01T00:00:00Z,2019-01-31T23:59:59Z,50,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0993,2019-02-01T00:00:00Z,2019-02-28T23:59:59Z,51,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0993,2019-03-01T00:00:00Z,2019-03-31T23:59:59Z,52,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0977,2019-04-01T00:00:00Z,2019-04-30T23:59:59Z,53,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0973,2019-05-01T00:00:00Z,2019-05-31T23:59:59Z,54,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0969,2019-06-01T00:00:00Z,2019-06-30T23:59:59Z,55,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0795,2019-07-01T00:00:00Z,2019-07-31T23:59:59Z,56,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0791,2019-08-01T00:00:00Z,2019-08-31T23:59:59Z,57,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0785,2019-09-01T00:00:00Z,2019-09-30T23:59:59Z,58,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.077,2019-10-01T00:00:00Z,2019-10-31T23:59:59Z,59,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0789,2019-11-01T00:00:00Z,2019-11-30T23:59:59Z,60,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0793,2019-12-01T00:00:00Z,2019-12-31T23:59:59Z,61,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0787,2020-01-01T00:00:00Z,2020-01-31T23:59:59Z,62,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0765,2020-02-01T00:00:00Z,2020-02-29T23:59:59Z,70,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0736,2020-03-01T00:00:00Z,2020-03-31T23:59:59Z,71,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.071,2020-04-01T00:00:00Z,2020-04-30T23:59:59Z,72,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0703,2020-05-01T00:00:00Z,2020-05-31T23:59:59Z,73,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0687,2020-06-01T00:00:00Z,2020-06-30T23:59:59Z,74,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0698,2020-07-01T00:00:00Z,2020-07-31T23:59:59Z,75,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0705,2020-08-01T00:00:00Z,2020-08-31T23:59:59Z,76,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0709,2020-09-01T00:00:00Z,2020-09-30T23:59:59Z,77,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0735,2020-10-01T00:00:00Z,2020-10-31T23:59:59Z,78,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0745,2020-11-01T00:00:00Z,2020-11-30T23:59:59Z,79,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0759,2020-12-01T00:00:00Z,2020-12-31T23:59:59Z,80,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.076,2021-01-01T00:00:00Z,2021-01-31T23:59:59Z,81,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0782,2021-02-01T00:00:00Z,2021-02-28T23:59:59Z,82,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0818,2021-03-01T00:00:00Z,2021-03-31T23:59:59Z,83,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.079,2021-04-01T00:00:00Z,2021-04-30T23:59:59Z,84,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0797,2021-05-01T00:00:00Z,2021-05-31T23:59:59Z,85,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0826,2021-06-01T00:00:00Z,2021-06-30T23:59:59Z,86,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0895,2021-07-01T00:00:00Z,2021-07-31T23:59:59Z,87,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.0934,2021-08-01T00:00:00Z,2021-08-31T23:59:59Z,88,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.1002,2021-09-01T00:00:00Z,2021-09-30T23:59:59Z,89,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
-2,0.1121,2021-10-01T00:00:00Z,,90,2000-01-01T00:00:00Z,2000-01-01T00:00:00Z
\ No newline at end of file
diff --git a/dbinit/init.md b/dbinit/init.md
deleted file mode 100644
index 21120af5..00000000
--- a/dbinit/init.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Init first prices data
-
-## Local
-
-If the script is not working (problem with secure_file_priv variable), use the import in phpMyAdmin:
-
-- Ignore the request for the first line
-- Select format "CVS using LOAD DATA"
-- Choose the right column separator ","
-- Then launch the execution
-
-## Rec/Prod
-
-- Connect to mysql docker container
-
-```
-docker exec -it <container-id> bash
-```
-
-- Open mysql shell
-
-```
-mysql --local-infile=1 -uroot -p backoffice < /dbinit/dbinit.sql
-
-```
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index f071a7bf..20b98d3d 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -4,69 +4,11 @@ services:
image: nginxinc/nginx-unprivileged:1.25
volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
- - ./nginx/site.conf:/etc/nginx/conf.d/default.conf
+ - ./nginx/site.local.conf:/etc/nginx/conf.d/default.conf
- ./cert.pem:/etc/nginx/cert.pem
- ./key.pem:/etc/nginx/key.pem
ports:
- 443:443
- depends_on:
- - backend
# For linux users
extra_hosts:
- 'host.docker.internal:host-gateway'
-
- database-agent:
- image: mysql:5
- volumes:
- - ./db_data:/var/lib/mysql
- ports:
- - 3306:3306
- environment:
- MYSQL_ROOT_PASSWORD: ${DATABASE_PASSWORD}
- MYSQL_DATABASE: ${DATABASE_NAME}
- healthcheck:
- test: mysqladmin ping -h 127.0.0.1 -u root --password=$$MYSQL_ROOT_PASSWORD
- interval: 5s
- timeout: 10s
- retries: 60
-
- phpmyadmin:
- image: phpmyadmin/phpmyadmin:latest
- depends_on:
- - database-agent
- ports:
- - 8008:80
- environment:
- PMA_HOST: database-agent
-
- backend:
- # --When using yarn local-up build backoffice service image with: docker build . -t backoffice-server
- image: backoffice-server
- depends_on:
- database-agent:
- condition: service_healthy
- restart: unless-stopped
- volumes:
- - ./mnt:/app/mnt
- ports:
- - ${HTTPS_PORT}:${HTTPS_PORT}
- - 8090:8090
- environment:
- - HOSTNAME=${HOSTNAME}
- - HTTPS_PORT=${HTTPS_PORT}
- - ANIMATOR_ROLE=${ANIMATOR_ROLE}
- - ADMIN_ROLE=${ADMIN_ROLE}
- - REDIRECT_URL=${REDIRECT_URL}
- - CLIENT_ID=${CLIENT_ID}
- - CLIENT_SECRET=${CLIENT_SECRET}
- - AUTH_URL=${AUTH_URL}
- - TOKEN_URL=${TOKEN_URL}
- - USERINFO_URL=${USERINFO_URL}
- - DEBUG_MODE=${DEBUG_MODE}
- - DATABASE_USER=${DATABASE_USER}
- - DATABASE_NAME=${DATABASE_NAME}
- - DATABASE_PASSWORD=${DATABASE_PASSWORD}
- - DATABASE_HOST=database-agent
- - MOCK_OAUTH2=${MOCK_OAUTH2}
- - IMAGE_FOLDER=${IMAGE_FOLDER}
- - SGE_API_TOKEN=${SGE_API_TOKEN}
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index b0754887..00000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-version: '3.7'
-services:
- nginx:
- image: registry.forge.grandlyon.com/web-et-numerique/factory/llle_project/backoffice-client:dev
- restart: unless-stopped
- ports:
- - 8088:8080
- depends_on:
- - backend
- networks:
- backoffice:
- volumes:
- - ./site.conf:/etc/nginx/conf.d/default.conf
- - ./image-lib:/usr/share/nginx/html/lib
- - ./dacc-preview:/usr/share/nginx/html/static-site
-
- database-agent:
- image: mysql:5
- ports:
- - 3306:3306
- networks:
- backoffice:
- restart: unless-stopped
- environment:
- MYSQL_ROOT_PASSWORD: ${DATABASE_PASSWORD}
- MYSQL_DATABASE: ${DATABASE_NAME}
- healthcheck:
- test: mysqladmin ping -h 127.0.0.1 -u root --password=$$MYSQL_ROOT_PASSWORD
- interval: 5s
- timeout: 10s
- retries: 60
- volumes:
- - ./dbinit:/dbinit
-
- backend:
- image: registry.forge.grandlyon.com/web-et-numerique/factory/llle_project/backoffice-server:dev
- networks:
- backoffice:
- depends_on:
- database-agent:
- condition: service_healthy
- restart: unless-stopped
- volumes:
- - /etc/localtime:/etc/localtime:ro
- - ./configs:/app/configs
- - ./letsencrypt_cache:/app/letsencrypt_cache
- - ./data:/app/data
- - ./${IMAGE_FOLDER}:/app/${IMAGE_FOLDER}
- ports:
- - ${HTTPS_PORT}:${HTTPS_PORT}
- - 8190:8090
- environment:
- - HOSTNAME=${HOSTNAME}
- - HTTPS_PORT=${HTTPS_PORT}
- - ANIMATOR_ROLE=${ANIMATOR_ROLE}
- - ADMIN_ROLE=${ADMIN_ROLE}
- - REDIRECT_URL=${REDIRECT_URL}
- - CLIENT_ID=${CLIENT_ID}
- - CLIENT_SECRET=${CLIENT_SECRET}
- - AUTH_URL=${AUTH_URL}
- - IMAGE_FOLDER=${IMAGE_FOLDER}
- - MOCK_OAUTH2=${MOCK_OAUTH2}
- - TOKEN_URL=${TOKEN_URL}
- - USERINFO_URL=${USERINFO_URL}
- - DEBUG_MODE=${DEBUG_MODE}
- - DATABASE_USER=${DATABASE_USER}
- - DATABASE_NAME=${DATABASE_NAME}
- - DATABASE_PASSWORD=${DATABASE_PASSWORD}
- - DATABASE_HOST=database-agent
-
-networks:
- backoffice:
diff --git a/mnt/configs/tokenskey.json b/mnt/configs/tokenskey.json
deleted file mode 100644
index 4ac2c4c1..00000000
--- a/mnt/configs/tokenskey.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "Key": "F+gSLqJL7zZynkJYp/fd2jI6t3TolYGRt9bjO7mMgQc="
-}
diff --git a/nginx/site.conf b/nginx/site.local.conf
similarity index 56%
rename from nginx/site.conf
rename to nginx/site.local.conf
index 127a8310..10882b16 100644
--- a/nginx/site.conf
+++ b/nginx/site.local.conf
@@ -10,24 +10,24 @@ server {
proxy_pass https://host.docker.internal:3000;
}
location /api {
- proxy_pass https://backend:1443/api;
+ proxy_pass https://host.docker.internal:1443/api;
}
location /OAuth2Login {
- proxy_pass https://backend:1443/OAuth2Login;
+ proxy_pass https://host.docker.internal:1443/OAuth2Login;
}
location /OAuth2Callback {
- proxy_pass https://backend:1443/OAuth2Callback;
+ proxy_pass https://host.docker.internal:1443/OAuth2Callback;
}
location /Logout {
- proxy_pass https://backend:1443/Logout;
+ proxy_pass https://host.docker.internal:1443/Logout;
}
location /doc {
- proxy_pass https://backend:1443/doc;
+ proxy_pass https://host.docker.internal:1443/doc;
}
location /imageNames {
- proxy_pass https://backend:1443/api/animator/imageNames;
+ proxy_pass https://host.docker.internal:1443/api/animator/imageNames;
}
location /assets {
- proxy_pass https://backend:1443/assets;
+ proxy_pass https://host.docker.internal:1443/assets;
}
}
\ No newline at end of file
diff --git a/scripts/import-convert-assets.sh b/scripts/import-convert-assets.sh
deleted file mode 100755
index 73615174..00000000
--- a/scripts/import-convert-assets.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Get env variables
-. ../.env
-
-REGISTRY_ID=409
-EMAIL_ASSETS_PATH="src/assets/icons/email"
-ECOGESTURE_ASSETS_PATH="src/assets/icons/visu/ecogesture"
-pwd=$(pwd)
-
-# Fetch and convert email assets
-curl "https://forge.grandlyon.com/api/v4/projects/${REGISTRY_ID}/repository/archive?path=${EMAIL_ASSETS_PATH}" --output email.tar.gz
-tar -xf email.tar.gz
-cd *-email/$EMAIL_ASSETS_PATH && for file in *.svg; do inkscape -h 200 --export-type="png" $file; done && rm *.svg
-
-cd $pwd
-# Fetch and convert ecogesture assets
-curl "https://forge.grandlyon.com/api/v4/projects/${REGISTRY_ID}/repository/archive?path=${ECOGESTURE_ASSETS_PATH}" --output ecogesture.tar.gz
-tar -xf ecogesture.tar.gz
-cd *-ecogesture/$ECOGESTURE_ASSETS_PATH && for file in *.svg; do inkscape -h 200 --export-type="png" $file; done && rm *.svg
-
-# Cleanup
-cd $pwd
-rm -rf ../${IMAGE_FOLDER}/*
-
-# Copy assets in IMAGE_FOLDER
-mv *-email/$EMAIL_ASSETS_PATH/* ../${IMAGE_FOLDER}
-mv *-ecogesture/$ECOGESTURE_ASSETS_PATH ../${IMAGE_FOLDER}/ecogesture
-rm -rf email.tar.gz ecogesture.tar.gz *-email *-ecogesture
diff --git a/scripts/init-fluidprices.sh b/scripts/init-fluidprices.sh
deleted file mode 100755
index 1bc1fe59..00000000
--- a/scripts/init-fluidprices.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/bash
-
-source ../.env
-
-# REMOVE PRICES TABLE
-docker compose exec database-agent mysql -u${DATABASE_USER} -p${DATABASE_PASSWORD} -e "use $DATABASE_NAME; DROP TABLE prices;"
-echo "Prices database dropped"
-# CREATE PRICES TABLE
-docker compose exec database-agent mysql -u${DATABASE_USER} -p${DATABASE_PASSWORD} -e "use $DATABASE_NAME; CREATE TABLE prices (
- id int(11) NOT NULL,
- fluid_type bigint(20) DEFAULT NULL,
- price float DEFAULT NULL,
- start_date longtext,
- end_date longtext,
- created_at datetime(3) DEFAULT NULL,
- updated_at datetime(3) DEFAULT NULL,
- deleted_at datetime(3) DEFAULT NULL
-);"
-echo "Prices database created"
-# POPULATE PRICES TABLE
-docker compose exec database-agent mysql -u${DATABASE_USER} -p${DATABASE_PASSWORD} -e "use $DATABASE_NAME; INSERT INTO prices (id, fluid_type, price, start_date, end_date) VALUES
- (1,0,0.1256,'2012-07-23 00:00:00','2013-07-31 23:59:59'),
- (2,0,0.1329,'2013-08-01 00:00:00','2014-10-31 23:59:59'),
- (3,0,0.1401,'2014-01-11 00:00:00','2015-07-31 23:59:59'),
- (4,0,0.1437,'2015-08-01 00:00:00','2016-07-31 23:59:59'),
- (5,0,0.1503,'2016-08-01 00:00:00','2017-07-31 23:59:59'),
- (6,0,0.1546,'2017-08-01 00:00:00','2018-01-31 23:59:59'),
- (7,0,0.1555,'2018-02-01 00:00:00','2018-07-31 23:59:59'),
- (8,0,0.145,'2018-08-01 00:00:00','2019-05-31 23:59:59'),
- (9,0,0.1531,'2019-02-01 00:00:00','2019-07-31 23:59:59'),
- (10,0,0.1524,'2019-08-01 00:00:00','2020-01-31 23:59:59'),
- (11,0,0.1546,'2020-02-01 00:00:00','2020-07-31 23:59:59'),
- (12,0,0.1557,'2020-08-01 00:00:00','2021-01-31 23:59:59'),
- (13,0,0.1582,'2021-02-01 00:00:00','2021-07-31 23:59:59'),
- (14,0,0.1558,'2021-08-01 00:00:00','2022-01-31 23:59:59'),
- (15,0,0.174,'2022-02-01 00:00:00',NULL),
- (16,1,0.0030735,'2012-01-01 00:00:00','2012-12-31 23:59:59'),
- (17,1,0.0031483,'2013-01-01 00:00:00','2013-12-31 23:59:59'),
- (18,1,0.0031381,'2014-01-01 00:00:00','2014-12-31 23:59:59'),
- (19,1,0.00307,'2015-01-01 00:00:00','2015-12-31 23:59:59'),
- (20,1,0.0031,'2016-01-01 00:00:00','2016-12-31 23:59:59'),
- (21,1,0.00311,'2017-01-01 00:00:00','2017-12-31 23:59:59'),
- (22,1,0.00313,'2018-01-01 00:00:00','2018-12-31 23:59:59'),
- (23,1,0.00313,'2019-01-01 00:00:00','2019-12-31 23:59:59'),
- (24,1,0.00315,'2020-01-01 00:00:00','2020-12-31 23:59:59'),
- (25,1,0.00319,'2021-01-01 00:00:00',NULL),
- (26,2,0.0919,'2017-01-01 00:00:00','2017-01-31 23:59:59'),
- (27,2,0.0915,'2017-02-01 00:00:00','2017-02-28 23:59:59'),
- (28,2,0.0932,'2017-03-01 00:00:00','2017-03-31 23:59:59'),
- (29,2,0.0927,'2017-04-01 00:00:00','2017-04-30 23:59:59'),
- (30,2,0.0906,'2017-05-01 00:00:00','2017-05-31 23:59:59'),
- (31,2,0.0906,'2017-06-01 00:00:00','2017-06-30 23:59:59'),
- (32,2,0.0788,'2017-07-01 00:00:00','2017-07-31 23:59:59'),
- (33,2,0.0783,'2017-08-01 00:00:00','2017-08-31 23:59:59'),
- (34,2,0.0783,'2017-09-01 00:00:00','2017-09-30 23:59:59'),
- (35,2,0.0791,'2017-10-01 00:00:00','2017-10-31 23:59:59'),
- (36,2,0.0806,'2017-11-01 00:00:00','2017-11-30 23:59:59'),
- (37,2,0.0812,'2017-12-01 00:00:00','2017-12-31 23:59:59'),
- (38,2,0.0857,'2018-01-01 00:00:00','2018-01-31 23:59:59'),
- (39,2,0.0866,'2018-02-01 00:00:00','2018-02-28 23:59:59'),
- (40,2,0.0847,'2018-03-01 00:00:00','2018-03-31 23:59:59'),
- (41,2,0.0839,'2018-04-01 00:00:00','2018-04-30 23:59:59'),
- (42,2,0.0842,'2018-05-01 00:00:00','2018-05-31 23:59:59'),
- (43,2,0.0855,'2018-06-01 00:00:00','2018-06-30 23:59:59'),
- (44,2,0.0959,'2018-07-01 00:00:00','2018-07-31 23:59:59'),
- (45,2,0.0961,'2018-08-01 00:00:00','2018-08-31 23:59:59'),
- (46,2,0.0967,'2018-09-01 00:00:00','2018-09-30 23:59:59'),
- (47,2,0.0989,'2018-10-01 00:00:00','2018-10-31 23:59:59'),
- (48,2,0.1031,'2018-11-01 00:00:00','2018-11-30 23:59:59'),
- (49,2,0.1013,'2018-12-01 00:00:00','2018-12-31 23:59:59'),
- (50,2,0.0999,'2019-01-01 00:00:00','2019-01-31 23:59:59'),
- (51,2,0.0993,'2019-02-01 00:00:00','2019-02-28 23:59:59'),
- (52,2,0.0993,'2019-03-01 00:00:00','2019-03-31 23:59:59'),
- (53,2,0.0977,'2019-04-01 00:00:00','2019-04-30 23:59:59'),
- (54,2,0.0973,'2019-05-01 00:00:00','2019-05-31 23:59:59'),
- (55,2,0.0969,'2019-06-01 00:00:00','2019-06-30 23:59:59'),
- (56,2,0.0795,'2019-07-01 00:00:00','2019-07-31 23:59:59'),
- (57,2,0.0791,'2019-08-01 00:00:00','2019-08-31 23:59:59'),
- (58,2,0.0785,'2019-09-01 00:00:00','2019-09-30 23:59:59'),
- (59,2,0.077,'2019-10-01 00:00:00','2019-10-31 23:59:59'),
- (60,2,0.0789,'2019-11-01 00:00:00','2019-11-30 23:59:59'),
- (61,2,0.0793,'2019-12-01 00:00:00','2019-12-31 23:59:59'),
- (62,2,0.0787,'2020-01-01 00:00:00','2020-01-31 23:59:59'),
- (63,2,0.0765,'2020-02-01 00:00:00','2020-02-29 23:59:59'),
- (64,2,0.0736,'2020-03-01 00:00:00','2020-03-31 23:59:59'),
- (65,2,0.071,'2020-04-01 00:00:00','2020-04-30 23:59:59'),
- (66,2,0.0703,'2020-05-01 00:00:00','2020-05-31 23:59:59'),
- (67,2,0.0687,'2020-06-01 00:00:00','2020-06-30 23:59:59'),
- (68,2,0.0698,'2020-07-01 00:00:00','2020-07-31 23:59:59'),
- (69,2,0.0705,'2020-08-01 00:00:00','2020-08-31 23:59:59'),
- (70,2,0.0709,'2020-09-01 00:00:00','2020-09-30 23:59:59'),
- (71,2,0.0735,'2020-10-01 00:00:00','2020-10-31 23:59:59'),
- (72,2,0.0745,'2020-11-01 00:00:00','2020-11-30 23:59:59'),
- (73,2,0.0759,'2020-12-01 00:00:00','2020-12-31 23:59:59'),
- (74,2,0.076,'2021-01-01 00:00:00','2021-01-31 23:59:59'),
- (75,2,0.0782,'2021-02-01 00:00:00','2021-02-28 23:59:59'),
- (76,2,0.0818,'2021-03-01 00:00:00','2021-03-31 23:59:59'),
- (77,2,0.079,'2021-04-01 00:00:00','2021-04-30 23:59:59'),
- (78,2,0.0797,'2021-05-01 00:00:00','2021-05-31 23:59:59'),
- (79,2,0.0826,'2021-06-01 00:00:00','2021-06-30 23:59:59'),
- (80,2,0.0895,'2021-07-01 00:00:00','2021-07-31 23:59:59'),
- (81,2,0.0934,'2021-08-01 00:00:00','2021-08-31 23:59:59'),
- (82,2,0.1002,'2021-09-01 00:00:00','2021-09-30 23:59:59'),
- (83,2,0.1121,'2021-10-01 00:00:00',NULL)
-;"
-echo "Prices database populated"
\ No newline at end of file
--
GitLab