diff options
author | Dessalines <tyhou13@gmx.com> | 2020-02-06 16:23:35 -0500 |
---|---|---|
committer | Dessalines <tyhou13@gmx.com> | 2020-02-06 16:23:35 -0500 |
commit | cd4001b2ef305bf7e0750914c0bbdcbdb68bf1a0 (patch) | |
tree | 9f42bb951cbe97c4f79baa86a92571eba9a10a23 /docs | |
parent | 1c030d1fb667ef7223d1e0ab1038d095f76f2d02 (diff) | |
parent | 33563c3e9fa123efe0824f611413a23a138a1f1e (diff) |
Merge branch 'minor_changes' of https://github.com/StaticallyTypedRice/lemmy into StaticallyTypedRice-minor_changes
Diffstat (limited to 'docs')
-rw-r--r-- | docs/src/administration_configuration.md | 9 | ||||
-rw-r--r-- | docs/src/contributing_local_development.md | 15 |
2 files changed, 21 insertions, 3 deletions
diff --git a/docs/src/administration_configuration.md b/docs/src/administration_configuration.md index 600fc3d2..55f93f05 100644 --- a/docs/src/administration_configuration.md +++ b/docs/src/administration_configuration.md @@ -6,3 +6,12 @@ Additionally, you can override any config files with environment variables. Thes `LEMMY__DATABASE__POOL_SIZE=10`. An additional option `LEMMY_DATABASE_URL` is available, which can be used with a PostgreSQL connection string like `postgres://lemmy:password@lemmy_db:5432/lemmy`, passing all connection details at once. + +If the Docker container is not used, manually create the database specified above by running the following commands: + +```bash +# Start at the root of the Lemmy repository + +cd server +./db-init.sh +``` diff --git a/docs/src/contributing_local_development.md b/docs/src/contributing_local_development.md index c19bcba8..7d782925 100644 --- a/docs/src/contributing_local_development.md +++ b/docs/src/contributing_local_development.md @@ -7,9 +7,18 @@ #### Set up Postgres DB ```bash - psql -c "create user lemmy with password 'password' superuser;" -U postgres - psql -c 'create database lemmy with owner lemmy;' -U postgres - export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy +# Start at the root of the Lemmy repository + +cd server +./db-init.sh +``` + +Or run the commands manually: + +```bash +psql -c "create user lemmy with password 'password' superuser;" -U postgres +psql -c 'create database lemmy with owner lemmy;' -U postgres +export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy ``` #### Running |