diff --git a/docker-compose.yml b/docker-compose.yml index 6a32a3c..dcc775f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -115,5 +115,67 @@ services: - 21027:21027/udp restart: unless-stopped + + lychee-db: + image: lscr.io/linuxserver/mariadb:latest + container_name: lychee-db + restart: always + volumes: + - lychee-db:/config + environment: + - MYSQL_ROOT_PASSWORD=rootpassword + - MYSQL_DATABASE=lychee + - MYSQL_USER=lychee + - MYSQL_PASSWORD=dbpassword + - PGID=1000 + - PUID=1000 + - TZ=Europe/Paris + + + lychee: + image: lscr.io/linuxserver/lychee:latest + container_name: lychee + restart: always + depends_on: + - lychee-db + volumes: + - lychee-config:/config + - lychee-pictures:/pictures + environment: + - DB_HOST=lychee-db + - DB_USERNAME=lychee + - DB_PASSWORD=dbpassword + - DB_DATABASE=lychee + - DB_PORT=3306 + - PGID=1000 + - PUID=1000 + - TZ=Europe/Paris + + + zotero: + #image: lscr.io/linuxserver/nginx:latest + #image: sashgorokhov/webdav + build: zotero + container_name: zotero + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Paris + - USERNAME=user + - PASSWORD=passwd + volumes: + - zotero-data:/data + #- zotero-data:/media + restart: unless-stopped + # https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/master/Dockerfile + # https://github.com/linuxserver/docker-nginx/blob/master/Dockerfile + # https://github.com/sashgorokhov/docker-nginx-webdav/blob/master/Dockerfile + # XXX: Missing "nginx-extra" in my build? + + volumes: money-data: + zotero-data: + lychee-db: + lychee-config: + lychee-pictures: diff --git a/swag/nginx/proxy-confs/lychee.subdomain.conf b/swag/nginx/proxy-confs/lychee.subdomain.conf new file mode 100644 index 0000000..5cc45fe --- /dev/null +++ b/swag/nginx/proxy-confs/lychee.subdomain.conf @@ -0,0 +1,40 @@ +## Version 2021/05/18 +# make sure that your dns has a cname set for lychee + +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name pics.*; + + include /config/nginx/ssl.conf; + + client_max_body_size 0; + + # enable for ldap auth, fill in ldap details in ldap.conf + #include /config/nginx/ldap.conf; + + # enable for Authelia + #include /config/nginx/authelia-server.conf; + + location / { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable the next two lines for ldap auth + #auth_request /auth; + #error_page 401 =200 /ldaplogin; + + # enable for Authelia + #include /config/nginx/authelia-location.conf; + + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app lychee; + set $upstream_port 80; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + + } +}