README.md

@@ -1,6 +1,6 @@
 # Drinks Manager (season 2)
 
-Note: This piece of software is tailored to my own needs.
+Note: This software is tailored to my own needs.
 I probably won't accept feature requests, and don't recommend you
 to use this software if this isn't exactly what you are looking for.  
 
@@ -15,7 +15,7 @@ You have to bring your own PostgreSQL Database though.
 
 ## Setup, Installation, Updating and Dependencies
 
-You can find the latest releases [here](https://gitlab.com/W13R/drinks-manager/-/releases), but for Installation/Updating, you should consider using Git.  
+You can find the latest releases [here](https://gitlab.com/W13R/drinks-manager/-/releases), but you should consider using Git to easily switch between versions.  
 For more information see [Setup](docs/Setup.md).
 
 

docs/Configuration.md

@@ -1,14 +1,14 @@
 # Configuration
 
-## Main Configuration  
+## Main Configuration
 
-`./config/config.sh`  
+<u>`config/config.sh`</u>  
 
-There is no default configuration available, only a sample configuration with explanations.
+There is a sample configuration with explanations: [/config/config.sample.sh](/config/config.sample.sh)
 
 
-## Caddy Server Configuration  
+## Caddy (Reverse Proxy & Static File Server)
 
-`./config/Caddyfile`  
+<u>[config/Caddyfile](/config/Caddyfile)</u>  
 
 The default configuration should work out of the box, don't edit this file unless you know what you're doing.

docs/Setup.md

@@ -20,7 +20,7 @@ Before the actual setup, you have to satisfy the following dependencies:
 
 ### Python Packages (pip)
 
-All required python packages are listed `in pip-dependencies.txt`  
+All required python packages are listed in [pip-dependencies.txt](/pip-dependencies.txt)  
 
 You can install the required python packages with  
 ```bash
@@ -32,9 +32,9 @@ You can install the required python packages with
 You can get the latest version with git:
 
 ```
-git clone --branch release-x.x https://gitlab.com/W13R/drinks-manager.git
+git clone --branch release-x https://gitlab.com/W13R/drinks-manager.git
 ```
-(replace x.x with the latest version)
+(replace x with the latest version)
 
 Alternatively, you can download the [latest release](https://gitlab.com/W13R/drinks-manager/-/releases) and extract the files to your prefered destination.  
 
@@ -55,9 +55,9 @@ If you installed the application with git, you can run the following in the drin
 
 ```
 git fetch
-git checkout x.x
+git checkout x
 ```
-(replace x.x with the new version)
+(replace x with the new version)
 
 If you downloaded the application from the releases page, you can download the new release in the same manner, and overwrite the old files with the new ones.
 
@@ -69,16 +69,20 @@ Further upgrading-instructions may be provided in the Release Notes on the Relea
 
 ## III. Database
 
-This project is using PostgreSQL. You have to set up a database by yourself.  
-The database must have the schema `public` (exists on a new database). Make shure that you create a database user with the necessary privileges to write to and read from the database (SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, CREATE, CONNECT):
+This project is using PostgreSQL. You have to set up a database:
 
 ```sql
--- connected to target database
-grant SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES on all tables in schema public to <dbuser>;
-grant CREATE, CONNECT on database <dbname> to <dbuser>;
+create user drinksmanager password '<a safe password>';
+create database drinksmgr owner drinksmanager;
 ```
 
-You can configure your database connection in `config/config.sh`.
+After creating the user, you have to edit your `pg_hba.conf` (see https://www.postgresql.org/docs/current/auth-pg-hba-conf.html).  
+Add the following line:
+```
+host    drinksmgr       drinksmanager   127.0.0.1/32            md5
+```
+
+Now you can configure your database connection in `config/config.sh`.
 
 
 ## IV. HTTPS & TLS Certificates
@@ -89,7 +93,7 @@ Filepaths:
 - `config/tls/server.pem` for the certificate 
 - `config/tls/server-key.pem` for the key
 
-You can set another filepath for those files in your caddy configuration at `config/Caddyfile`.
+You can set another filepath for those files in your caddy configuration at [config/Caddyfile](/config/Caddyfile).
 
 
 ## V. Configuration