From 1d0b8ecd630285f3455980682daa2c5c0da817f1 Mon Sep 17 00:00:00 2001 From: Sergio Colado <33748103+colado@users.noreply.github.com> Date: Sat, 20 Dec 2025 17:30:27 +0200 Subject: [PATCH 1/9] Correct repos URLs --- dev/local-dev-setup.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/local-dev-setup.md b/dev/local-dev-setup.md index bdc33517..d3407d17 100644 --- a/dev/local-dev-setup.md +++ b/dev/local-dev-setup.md @@ -26,14 +26,14 @@ The `v5` infrastructure is highly modularized. You will need to clone all of the I am listing them in a top-down order (ex. `podverse-helpers` is used by everything, `podverse-orm` is used by `podverse-parser` and `podverse-api` etc.): - [podverse-ops](https://github.com/podverse/podverse-ops/blob/v5-develop/) -- [podverse-helpers](https://github.com/podverse/podverse-ops/blob/v5-develop/) +- [podverse-helpers](https://github.com/podverse/podverse-helpers/blob/v5-develop/) - [podverse-external-services](https://github.com/podverse/podverse-external-services/blob/v5-develop/) - [podverse-orm](https://github.com/podverse/podverse-orm/blob/v5-develop/) - [podverse-parser](https://github.com/podverse/podverse-parser/blob/v5-develop/) - [podverse-mq](https://github.com/podverse/podverse-mq/blob/v5-develop/) - [podverse-api](https://github.com/podverse/podverse-api/blob/v5-develop/) - [podverse-web](https://github.com/podverse/podverse-web/blob/v5-develop/) -- [podverse-workers](https://github.com/podverse/podverse-web/blob/v5-develop/) +- [podverse-workers](https://github.com/podverse/podverse-workers/blob/v5-develop/) - [podverse-qa](https://github.com/podverse/podverse-qa/blob/v5-develop/) ## Environment Variables From 89a348ca6efd47f59f9db8e3990b717a5a39fcc2 Mon Sep 17 00:00:00 2001 From: Sergio Colado <33748103+colado@users.noreply.github.com> Date: Sat, 20 Dec 2025 17:31:14 +0200 Subject: [PATCH 2/9] Add missing env.example file --- config/podverse-local-mq.env.example | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 config/podverse-local-mq.env.example diff --git a/config/podverse-local-mq.env.example b/config/podverse-local-mq.env.example new file mode 100644 index 00000000..c0c1cd32 --- /dev/null +++ b/config/podverse-local-mq.env.example @@ -0,0 +1,2 @@ +ARTEMIS_USER=podverse +ARTEMIS_PASSWORD=podverse From a3813e0a91e5a29e4004fbf6166fd74ab8bab1b9 Mon Sep 17 00:00:00 2001 From: Sergio Colado <33748103+colado@users.noreply.github.com> Date: Sun, 21 Dec 2025 13:26:32 +0200 Subject: [PATCH 3/9] Use expected values in correct example files --- config/podverse-db.env.example | 6 ++++-- config/podverse-local-mq.env.example | 2 -- config/podverse-mq.env.example | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 config/podverse-local-mq.env.example diff --git a/config/podverse-db.env.example b/config/podverse-db.env.example index b747b81e..72bc420a 100644 --- a/config/podverse-db.env.example +++ b/config/podverse-db.env.example @@ -3,5 +3,7 @@ POSTGRES_USER=postgres POSTGRES_PASSWORD= PGDATA=/var/lib/postgresql/data/pgdata/ -POSTGRES_READ_PASSWORD= -POSTGRES_READ_WRITE_PASSWORD= +POSTGRES_READ_USERNAME=postgres_read +POSTGRES_READ_PASSWORD=mysecretpw +POSTGRES_READ_WRITE_USERNAME=postgres +POSTGRES_READ_WRITE_PASSWORD=mysecretpw \ No newline at end of file diff --git a/config/podverse-local-mq.env.example b/config/podverse-local-mq.env.example deleted file mode 100644 index c0c1cd32..00000000 --- a/config/podverse-local-mq.env.example +++ /dev/null @@ -1,2 +0,0 @@ -ARTEMIS_USER=podverse -ARTEMIS_PASSWORD=podverse diff --git a/config/podverse-mq.env.example b/config/podverse-mq.env.example index 7d870b77..d7c9ebd1 100644 --- a/config/podverse-mq.env.example +++ b/config/podverse-mq.env.example @@ -1,2 +1,2 @@ -ARTEMIS_USER= -ARTEMIS_PASSWORD= +ARTEMIS_USER=user +ARTEMIS_PASSWORD=mysecretpw \ No newline at end of file From d635c1b92e40924ed2efc850129ede188e0a24c1 Mon Sep 17 00:00:00 2001 From: Sergio Colado <33748103+colado@users.noreply.github.com> Date: Sun, 21 Dec 2025 13:31:18 +0200 Subject: [PATCH 4/9] Clarify file naming in documentation --- dev/local-dev-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/local-dev-setup.md b/dev/local-dev-setup.md index d3407d17..fb468320 100644 --- a/dev/local-dev-setup.md +++ b/dev/local-dev-setup.md @@ -40,7 +40,7 @@ I am listing them in a top-down order (ex. `podverse-helpers` is used by everyth Before running a Podverse Docker service, you will need to create an enviroment variable file for it within the `podverse-ops/config` directory. -Duplicate each of the `.env.example` files found within `podverse-ops/config` and add the corresponding values. +Duplicate each of the `.env.example` files found within `podverse-ops/config` and add the corresponding values (e.g. podverse-local-api.env, etc.). The Podverse repos that run locally (the ones that don't simply need to build, but need to run) will need their own `.env` file within their project directory for local development purposes. For example, for local dev, you will need a corresponding `podverse-api/.env` file, `podverse-web/.env`, and a `podverse-workers/.env` file. From ba19dd858329f075f98358cf0713d9c14458a920 Mon Sep 17 00:00:00 2001 From: Sergio Colado <33748103+colado@users.noreply.github.com> Date: Sun, 21 Dec 2025 13:44:09 +0200 Subject: [PATCH 5/9] Add to script: install expected node v, ensure all packages exist locally, remove lock safely --- dev/npm-link-modules.sh | 54 +++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/dev/npm-link-modules.sh b/dev/npm-link-modules.sh index 894dd58b..85ab5055 100755 --- a/dev/npm-link-modules.sh +++ b/dev/npm-link-modules.sh @@ -24,75 +24,93 @@ echo "Clearing npm cache..." npm cache clean --force echo "Installing podverse-helpers dependencies..." -cd ../podverse-helpers +cd ../podverse-helpers || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-external-services dependencies..." -cd ../podverse-external-services +cd ../podverse-external-services || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-orm dependencies..." -cd ../podverse-orm +cd ../podverse-orm || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-parser dependencies..." -cd ../podverse-parser +cd ../podverse-parser || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-mq dependencies..." -cd ../podverse-mq +cd ../podverse-mq || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-workers dependencies..." -cd ../podverse-workers +cd ../podverse-workers || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-api dependencies..." -cd ../podverse-api +cd ../podverse-api || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-web dependencies..." -cd ../podverse-web +cd ../podverse-web || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-qa dependencies..." -cd ../podverse-qa +cd ../podverse-qa || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install # Link dependencies to npm From 3148eb0973061badc35755fddac5244f4afaacc5 Mon Sep 17 00:00:00 2001 From: Sergio Colado <33748103+colado@users.noreply.github.com> Date: Mon, 22 Dec 2025 09:41:20 +0200 Subject: [PATCH 6/9] Update docker-compose volume path --- docker-compose/local/db/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/local/db/docker-compose.yml b/docker-compose/local/db/docker-compose.yml index e3775eda..35fec32b 100644 --- a/docker-compose/local/db/docker-compose.yml +++ b/docker-compose/local/db/docker-compose.yml @@ -16,7 +16,7 @@ services: networks: - podverse_local_network volumes: - - podverse_local_db_data:/var/lib/postgresql/data + - podverse_local_db_data:/var/lib/postgresql - ../../../database/combined/init_database.sql:/opt/database/combined/init_database.sql - ../../../database/init-scripts/01-create-users.sh:/opt/database/init-scripts/01-create-users.sh command: > From a02fa94ba996e64e1f6de84e13950bc641977a72 Mon Sep 17 00:00:00 2001 From: Sergio Colado <33748103+colado@users.noreply.github.com> Date: Mon, 22 Dec 2025 11:32:30 +0200 Subject: [PATCH 7/9] Add missing value to db.env.example --- config/podverse-db.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/podverse-db.env.example b/config/podverse-db.env.example index 72bc420a..650bdb76 100644 --- a/config/podverse-db.env.example +++ b/config/podverse-db.env.example @@ -1,6 +1,6 @@ POSTGRES_DB=postgres POSTGRES_USER=postgres -POSTGRES_PASSWORD= +POSTGRES_PASSWORD=mysecretpw PGDATA=/var/lib/postgresql/data/pgdata/ POSTGRES_READ_USERNAME=postgres_read From 8ed52f330524c44096987bfd2f45f90b618650c9 Mon Sep 17 00:00:00 2001 From: Sergio Colado <33748103+colado@users.noreply.github.com> Date: Tue, 23 Dec 2025 18:32:45 +0200 Subject: [PATCH 8/9] Remove unnecessary custom roles from local db env file example --- config/podverse-db.env.example | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/podverse-db.env.example b/config/podverse-db.env.example index 650bdb76..fed977e4 100644 --- a/config/podverse-db.env.example +++ b/config/podverse-db.env.example @@ -2,8 +2,3 @@ POSTGRES_DB=postgres POSTGRES_USER=postgres POSTGRES_PASSWORD=mysecretpw PGDATA=/var/lib/postgresql/data/pgdata/ - -POSTGRES_READ_USERNAME=postgres_read -POSTGRES_READ_PASSWORD=mysecretpw -POSTGRES_READ_WRITE_USERNAME=postgres -POSTGRES_READ_WRITE_PASSWORD=mysecretpw \ No newline at end of file From 1d1e114028e5355b32fa9f6053a11cd9bd9857d2 Mon Sep 17 00:00:00 2001 From: Sergio Colado <33748103+colado@users.noreply.github.com> Date: Tue, 23 Dec 2025 19:13:10 +0200 Subject: [PATCH 9/9] Reset last empty line on env file --- config/podverse-mq.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/podverse-mq.env.example b/config/podverse-mq.env.example index d7c9ebd1..339c45d7 100644 --- a/config/podverse-mq.env.example +++ b/config/podverse-mq.env.example @@ -1,2 +1,2 @@ ARTEMIS_USER=user -ARTEMIS_PASSWORD=mysecretpw \ No newline at end of file +ARTEMIS_PASSWORD=mysecretpw