Auto-create books directory, log upload errors, document Docker deployment
- library.New now creates BOOKS_DIR (MkdirAll) on startup so uploads don't fail when the directory is missing on a fresh bind mount - uploadSubmit logs the underlying OS error on save/write failures - README: document docker-compose deployment, container UID/GID (100/101) for bind-mounted ./data permissions, and running the admin CLI via docker compose exec Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -74,6 +74,68 @@ go run ./cmd/admin user delete <name>
|
||||
go run ./cmd/admin user set-role <name> <reader|uploader|admin>
|
||||
```
|
||||
|
||||
## Docker / docker-compose Deployment
|
||||
|
||||
Beispiel `docker-compose.yml`:
|
||||
|
||||
```yaml
|
||||
version: '3'
|
||||
|
||||
networks:
|
||||
web:
|
||||
external: true
|
||||
|
||||
services:
|
||||
app:
|
||||
image: git.arnef.de/arnef/ebooks:latest
|
||||
restart: always
|
||||
networks:
|
||||
- web
|
||||
volumes:
|
||||
- ./data:/data
|
||||
- /etc/timezone:/etc/timezone:ro
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
labels:
|
||||
traefik.enable: 'true'
|
||||
traefik.http.routers.ebooks.rule: Host(`books.arnef.de`)
|
||||
traefik.http.routers.ebooks.entrypoints: websecure
|
||||
traefik.http.routers.ebooks.tls.certresolver: letsencrypt
|
||||
traefik.http.services.ebooks.loadbalancer.server.port: 8080
|
||||
```
|
||||
|
||||
Der Container läuft als nicht-root Benutzer `ebooks` (UID `100`, GID `101`).
|
||||
`BOOKS_DIR` (`/data/books`) und `USERS_DB` (`/data/users.db`) liegen im
|
||||
Volume `./data`. Der Server legt `BOOKS_DIR` beim Start automatisch an,
|
||||
falls es fehlt — gehört das Host-Verzeichnis `./data` aber nicht dem
|
||||
passenden UID/GID, schlägt das Anlegen fehl bzw. `users.db` kann nicht
|
||||
geöffnet werden (`unable to open database file`) und Uploads schlagen mit
|
||||
"Datei konnte nicht gespeichert werden" fehl.
|
||||
|
||||
1. Datenverzeichnis anlegen und Rechte setzen:
|
||||
|
||||
```bash
|
||||
mkdir -p data
|
||||
sudo chown -R 100:101 data
|
||||
```
|
||||
|
||||
2. Container starten:
|
||||
|
||||
```bash
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
3. Ersten Benutzer über die im Image enthaltene Admin-CLI anlegen (der
|
||||
Server muss dafür nicht gestoppt werden, `--role admin` empfohlen für
|
||||
den ersten Account):
|
||||
|
||||
```bash
|
||||
docker compose exec app /app/admin user add <name> --role admin
|
||||
docker compose exec app /app/admin user list
|
||||
```
|
||||
|
||||
`USERS_DB` ist im Image bereits auf `/data/users.db` gesetzt, daher ist
|
||||
kein zusätzlicher Parameter nötig.
|
||||
|
||||
## Konfiguration
|
||||
|
||||
Umgebungsvariablen:
|
||||
|
||||
+4
-1
@@ -21,7 +21,10 @@ func main() {
|
||||
}
|
||||
defer store.Close()
|
||||
|
||||
lib := library.New(booksDir)
|
||||
lib, err := library.New(booksDir)
|
||||
if err != nil {
|
||||
log.Fatalf("books dir: %v", err)
|
||||
}
|
||||
h := web.NewHandler(lib, store)
|
||||
|
||||
mux := http.NewServeMux()
|
||||
|
||||
@@ -19,8 +19,11 @@ type Service struct {
|
||||
booksDir string
|
||||
}
|
||||
|
||||
func New(booksDir string) *Service {
|
||||
return &Service{booksDir: booksDir}
|
||||
func New(booksDir string) (*Service, error) {
|
||||
if err := os.MkdirAll(booksDir, 0o755); err != nil {
|
||||
return nil, fmt.Errorf("books dir: %w", err)
|
||||
}
|
||||
return &Service{booksDir: booksDir}, nil
|
||||
}
|
||||
|
||||
func (s *Service) BooksDir() string { return s.booksDir }
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -232,12 +233,14 @@ func (h *Handler) uploadSubmit(w http.ResponseWriter, r *http.Request) {
|
||||
render(w, r.Context(), views.UploadPage(fmt.Sprintf("Datei '%s' existiert bereits.", safeFilename)))
|
||||
return
|
||||
}
|
||||
log.Printf("upload: create %q failed: %v", destPath, err)
|
||||
http.Error(w, "Datei konnte nicht gespeichert werden", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
defer out.Close()
|
||||
|
||||
if _, err := io.Copy(out, file); err != nil {
|
||||
log.Printf("upload: write %q failed: %v", destPath, err)
|
||||
_ = os.Remove(destPath)
|
||||
http.Error(w, "Upload fehlgeschlagen", http.StatusInternalServerError)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user