From 59a69e6f77b015b5963721445aa47da7504e7d1d Mon Sep 17 00:00:00 2001 From: xiaodino Date: Tue, 9 Apr 2024 09:14:42 -0700 Subject: [PATCH 1/2] fix(blobstorage, eventindexer, relayer): remove username and password --- packages/blobstorage/.default.indexer.env | 4 ++-- packages/blobstorage/.default.server.env | 4 ++-- packages/blobstorage/README.md | 4 ++-- packages/eventindexer/.l1.env | 4 ++-- packages/eventindexer/.l2.env | 4 ++-- packages/relayer/.default.env | 4 ++-- packages/relayer/.l1indexer.example.env | 8 ++++---- packages/relayer/.l1processor.example.env | 8 ++++---- packages/relayer/README.md | 4 ++-- packages/relayer/docker-compose/docker-compose.yml | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/blobstorage/.default.indexer.env b/packages/blobstorage/.default.indexer.env index a6cf895557..c73b38dfd1 100644 --- a/packages/blobstorage/.default.indexer.env +++ b/packages/blobstorage/.default.indexer.env @@ -3,7 +3,7 @@ BEACON_URL=https://l1beacon.hekla.taiko.xyz TAIKO_L1_CONTRACT_ADDRESS=0xC069c3d2a9f2479F559AD34485698ad5199C555f DATABASE_HOST=localhost DATABASE_PORT=3306 -DATABASE_USER=root -DATABASE_PASSWORD=passw00d +DATABASE_USER= +DATABASE_PASSWORD= DATABASE_NAME=blobs METRICS_HTTP_PORT=7472 diff --git a/packages/blobstorage/.default.server.env b/packages/blobstorage/.default.server.env index d7c46611e1..c50948e393 100644 --- a/packages/blobstorage/.default.server.env +++ b/packages/blobstorage/.default.server.env @@ -1,7 +1,7 @@ HTTP_PORT=3282 DATABASE_HOST=localhost DATABASE_PORT=3306 -DATABASE_USER=root -DATABASE_PASSWORD=passw00d +DATABASE_USER= +DATABASE_PASSWORD= DATABASE_NAME=blobs METRICS_HTTP_PORT=7471 diff --git a/packages/blobstorage/README.md b/packages/blobstorage/README.md index e7fe0e15ce..dd1bb84a97 100644 --- a/packages/blobstorage/README.md +++ b/packages/blobstorage/README.md @@ -28,8 +28,8 @@ Repository for BLOB storage (archive and serve data) ```bash cd ./migrations - goose mysql "root:passw00d@tcp(localhost:3306)/blobs" status - goose mysql "root:passw00d@tcp(localhost:3306)/blobs" up + goose mysql ":@tcp(localhost:3306)/blobs" status + goose mysql ":@tcp(localhost:3306)/blobs" up ``` These commands apply migrations to the `blobs` database. diff --git a/packages/eventindexer/.l1.env b/packages/eventindexer/.l1.env index 79bb020e2d..1385dbba47 100644 --- a/packages/eventindexer/.l1.env +++ b/packages/eventindexer/.l1.env @@ -1,7 +1,7 @@ HTTP_PORT=4100 PROMETHEUS_HTTP_PORT=6063 -DATABASE_USER=root -DATABASE_PASSWORD=root +DATABASE_USER= +DATABASE_PASSWORD= DATABASE_NAME=eventindexer DATABASE_HOST=localhost:3306 DATABASE_MAX_IDLE_CONNS=50 diff --git a/packages/eventindexer/.l2.env b/packages/eventindexer/.l2.env index 77bb8409ff..983f2ac306 100644 --- a/packages/eventindexer/.l2.env +++ b/packages/eventindexer/.l2.env @@ -1,7 +1,7 @@ HTTP_PORT=4009 METRICS_HTTP_PORT=6067 -DATABASE_USER=root -DATABASE_PASSWORD=root +DATABASE_USER= +DATABASE_PASSWORD= DATABASE_NAME=eventindexer DATABASE_HOST=localhost:3306 DATABASE_MAX_IDLE_CONNS=50 diff --git a/packages/relayer/.default.env b/packages/relayer/.default.env index 88973ca621..28f7c92ee7 100644 --- a/packages/relayer/.default.env +++ b/packages/relayer/.default.env @@ -1,7 +1,7 @@ HTTP_PORT=4101 PROMETHEUS_HTTP_PORT=6061 -MYSQL_USER=root -MYSQL_PASSWORD=root +MYSQL_USER= +MYSQL_PASSWORD= MYSQL_DATABASE=relayer MYSQL_HOST=localhost:3306 MYSQL_MAX_IDLE_CONNS=50 diff --git a/packages/relayer/.l1indexer.example.env b/packages/relayer/.l1indexer.example.env index 1abb2aedd3..8a11abd4a6 100644 --- a/packages/relayer/.l1indexer.example.env +++ b/packages/relayer/.l1indexer.example.env @@ -1,14 +1,14 @@ HTTP_PORT=4103 METRICS_HTTP_PORT=6062 -DATABASE_USER=root -DATABASE_PASSWORD=root +DATABASE_USER= +DATABASE_PASSWORD= DATABASE_NAME=relayer DATABASE_HOST=localhost:3306 DATABASE_MAX_IDLE_CONNS=50 DATABASE_MAX_OPEN_CONNS=3000 DATABASE_CONN_MAX_LIFETIME=100000 -QUEUE_USER=guest -QUEUE_PASSWORD=guest +QUEUE_USER= +QUEUE_PASSWORD= QUEUE_HOST=localhost QUEUE_PORT=5672 EVENT_NAME=MessageSent diff --git a/packages/relayer/.l1processor.example.env b/packages/relayer/.l1processor.example.env index 6b8c1c05cb..df6f69374d 100644 --- a/packages/relayer/.l1processor.example.env +++ b/packages/relayer/.l1processor.example.env @@ -1,13 +1,13 @@ PROMETHEUS_HTTP_PORT=6062 -DATABASE_USER=root -DATABASE_PASSWORD=passw00d +DATABASE_USER= +DATABASE_PASSWORD= DATABASE_NAME=relayer DATABASE_HOST=localhost:3306 DATABASE_MAX_IDLE_CONNS=50 DATABASE_MAX_OPEN_CONNS=3000 DATABASE_CONN_MAX_LIFETIME=100000 -QUEUE_USER=guest -QUEUE_PASSWORD=guest +QUEUE_USER= +QUEUE_PASSWORD= QUEUE_HOST=localhost QUEUE_PORT=5672 PROCESSOR_PRIVATE_KEY= diff --git a/packages/relayer/README.md b/packages/relayer/README.md index 87e07dab3c..cbc9780041 100644 --- a/packages/relayer/README.md +++ b/packages/relayer/README.md @@ -36,8 +36,8 @@ To migrate the database schema in MySQL: ```sh cd ./migrations -goose mysql "root:passw00d@tcp(localhost:3306)/relayer" status -goose mysql "root:passw00d@tcp(localhost:3306)/relayer" up +goose mysql ":@tcp(localhost:3306)/relayer" status +goose mysql ":@tcp(localhost:3306)/relayer" up ``` ### Configure Environment Variables diff --git a/packages/relayer/docker-compose/docker-compose.yml b/packages/relayer/docker-compose/docker-compose.yml index c2343fb855..e3747ae311 100644 --- a/packages/relayer/docker-compose/docker-compose.yml +++ b/packages/relayer/docker-compose/docker-compose.yml @@ -7,7 +7,7 @@ services: restart: always environment: - MYSQL_DATABASE=relayer - - MYSQL_ROOT_PASSWORD=passw00d + - MYSQL_ROOT_PASSWORD=****** ports: - "3306:3306" volumes: From a246611cca8c3bf1e97dfb1ff2281355de983eb2 Mon Sep 17 00:00:00 2001 From: xiaodino Date: Tue, 9 Apr 2024 09:19:20 -0700 Subject: [PATCH 2/2] Update --- packages/relayer/docker-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/relayer/docker-compose/docker-compose.yml b/packages/relayer/docker-compose/docker-compose.yml index e3747ae311..66192fde61 100644 --- a/packages/relayer/docker-compose/docker-compose.yml +++ b/packages/relayer/docker-compose/docker-compose.yml @@ -7,7 +7,7 @@ services: restart: always environment: - MYSQL_DATABASE=relayer - - MYSQL_ROOT_PASSWORD=****** + - MYSQL_ROOT_PASSWORD= ports: - "3306:3306" volumes: