From 24ed8a84d4bf3b165cd0cb2d3c92564a80e99861 Mon Sep 17 00:00:00 2001 From: Monkey Do Date: Fri, 21 Feb 2020 17:45:39 -0800 Subject: [PATCH 1/4] Remove unused file Didn't see that one creep in in PR #332 --- bookbrainz-site/static/js/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bookbrainz-site/static/js/.keep diff --git a/bookbrainz-site/static/js/.keep b/bookbrainz-site/static/js/.keep deleted file mode 100644 index e69de29bb..000000000 From dc51e7436bb2350a52b929341a1faa6b7135d639 Mon Sep 17 00:00:00 2001 From: Monkey Do Date: Fri, 21 Feb 2020 17:48:42 -0800 Subject: [PATCH 2/4] Update directory contents in readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2df93fb44..c357d3690 100644 --- a/README.md +++ b/README.md @@ -13,16 +13,17 @@ are arranged as follows: * `config` - the config to be used when running the site; copy the example files and edit, dropping the `.example` suffix. +* `docker` - deployment files and configurations * `scripts` - scripts used during the development and deployment of BookBrainz. +* `sql` - PostgreSQL database schemas and migration files—formerly separated in https://github.com/bookbrainz/bookbrainz-sql * `src` - node.js source files defining the site logic and user interface. * `static` - static files which are served by node as part of the site. -* `templates` - Jade templates defining how the site looks - we're slowly - replacing these with React. * `test` - unit tests and functional tests for the site. Additionally, after building the client JavaScript (see below), the following directories will exist: +* `lib` - compiled and minified server files * `static/stylesheets` - the CSS generated from compiling the project LESS files (`src/client/stylesheets`). * `static/js` - minified JavaScript files which are referred to by the site From ce19b14e06a6ca89bd9233612291e32cab50b59d Mon Sep 17 00:00:00 2001 From: PrabalSingh Date: Sun, 23 Feb 2020 03:10:25 +0530 Subject: [PATCH 3/4] fix(postgres) : modify enviroment for postgres --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index aa160aa28..46dec1972 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: - postgres volumes: - "./config/config.json:/home/bookbrainz/bookbrainz-site/config/config.json:ro" - + postgres: container_name: postgres restart: unless-stopped @@ -28,6 +28,7 @@ services: - "5432:5432" environment: - POSTGRES_USER=postgres + - POSTGRES_HOST_AUTH_METHOD=trust volumes: - postgres-data:/var/lib/postgresql/data From fe7961ee0726111101b80f94701a6b6795014790 Mon Sep 17 00:00:00 2001 From: Monkey Do Date: Sat, 22 Feb 2020 13:55:13 -0800 Subject: [PATCH 4/4] Corrected manual database restore command --- DEPENDENCIES_MANUAL_INSTALL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPENDENCIES_MANUAL_INSTALL.md b/DEPENDENCIES_MANUAL_INSTALL.md index 5910f96cb..c63bd9a5f 100644 --- a/DEPENDENCIES_MANUAL_INSTALL.md +++ b/DEPENDENCIES_MANUAL_INSTALL.md @@ -57,13 +57,13 @@ set up data identical to the data we have on the bookbrainz.org website. First, Then you can restore the database from the lates dump you dowloaded. To do this, run: - psql -h localhost -U postgres -f latest.sql + psql -h localhost -U postgres -d bookbrainz -f latest.sql At this point, the database is set up, and the following command should give you a list of usernames of BookBrainz editors (after entering the password from earlier): - psql -h localhost -U postgres bookbrainz -c "SELECT name FROM bookbrainz.editor" + psql -h localhost -U postgres bookbrainz --command="SELECT name FROM bookbrainz.editor" You are also required to set the password of your local PostgreSQL instance. You can do this by