Merge branch 'master' of https://github.com/bookbrainz/bookbrainz-site

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

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

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