Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .examples/docker/docker-compose-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ services:
- proxy_certs:/etc/nginx/certs
- proxy_html:/usr/share/nginx/html
- /var/run/docker.sock:/tmp/docker.sock:ro
env_file:
- proxy.env
acme:
image: ${DOCKER_ACME_IMAGE:-nginxproxy/acme-companion}:${DOCKER_ACME_TAG:-latest}
restart: always
Expand Down
4 changes: 2 additions & 2 deletions .examples/docker/lb.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ LB_LOGGING_FOLDER=/var/log/librebooking
LB_LOGGING_LEVEL=DEBUG
LB_LOGGING_SQL=false
LB_DEFAULT_TIMEZONE=Europe/Zurich
LB_UPLOADS_IMAGE_UPLOAD_URL=Web/uploads/images
LB_UPLOADS_RESERVATION_ATTACHMENT_PATH=Web/uploads/reservation
LB_SCRIPT_URL=http://localhost:8080/Web

4 changes: 2 additions & 2 deletions .examples/docker/lb1.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ LB_LOGGING_FOLDER=/var/log/librebooking
LB_LOGGING_LEVEL=ERROR
LB_LOGGING_SQL=false
LB_DEFAULT_TIMEZONE=Europe/Zurich
LB_UPLOADS_IMAGE_UPLOAD_URL=Web/uploads/images
LB_UPLOADS_RESERVATION_ATTACHMENT_PATH=Web/uploads/reservation
LB_SCRIPT_URL=https://acme.org/Web

3 changes: 1 addition & 2 deletions .examples/docker/lb2.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ LB_LOGGING_FOLDER=/var/log/librebooking
LB_LOGGING_LEVEL=ERROR
LB_LOGGING_SQL=false
LB_DEFAULT_TIMEZONE=Europe/Zurich
LB_UPLOADS_IMAGE_UPLOAD_URL=Web/uploads/images
LB_UPLOADS_RESERVATION_ATTACHMENT_PATH=Web/uploads/reservation
LB_SCRIPT_URL=https://acme.org/Web
2 changes: 0 additions & 2 deletions .examples/podman/lb.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ LB_LOGGING_FOLDER=/var/log/librebooking
LB_LOGGING_LEVEL=DEBUG
LB_LOGGING_SQL=false
LB_DEFAULT_TIMEZONE=Europe/Zurich
LB_UPLOADS_IMAGE_UPLOAD_URL=Web/uploads/images
LB_UPLOADS_RESERVATION_ATTACHMENT_PATH=Web/uploads/reservation
7 changes: 4 additions & 3 deletions RUN.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ From version-3, this docker image makes full usage of the
| LB_DATABASE_HOSTSPEC | | Database network address |
| LB_INSTALL_PASSWORD | | Librebooking installation password |
| LB_DEFAULT_TIMEZONE | | Timezone |
| LB_SCRIPT_URL | | Script URL such as `http://localhost:8080/Web` |
| LB_LOGGING_FOLDER | `/var/log/librebooking` | Logs folder |
| LB_LOGGING_LEVEL | `none` | Logging level |
| LB_LOGGING_SQL | `false` | SQL logging |

### Optional variables

| Variable | Description |
| -------- | ----------- |
| APP_PATH | URL path |
| Variable | Description |
| -------- | --------------- |
| APP_PATH | custom URL path |

## Optional mounts

Expand Down
6 changes: 3 additions & 3 deletions SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
### Database initialization

1. Point your web browser to `<YOUR_HOST>/install` or `<YOUR_HOST>/<YOUR_PATH>/install`
(if you are using a custom URL-path)
- Enter the installation password (docker variable `LB_INSTALL_PWD`)
(if you are using a custom URL-path with environment variable `APP_PATH`)
- Enter the installation password (environment variable `LB_INSTALL_PWD`)
- Enter the database root user: `root`
- Enter the database root password (docker variable `MYSQL_ROOT_PASSWORD`)
- Enter the database root password (environment variable `MYSQL_ROOT_PASSWORD`)
- Select `Create the database`
- Select `Create the database user`
- Click on the register link, at the bottom of the web page
Expand Down