Compare commits
3 Commits
2430d89eb5
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| e43c1e5fb0 | |||
| c531e12db6 | |||
| 0d0dcc92d0 |
+8
-16
@@ -52,7 +52,7 @@ configs:
|
|||||||
reverse_proxy 192.168.0.106:3923
|
reverse_proxy 192.168.0.106:3923
|
||||||
}
|
}
|
||||||
photos.${DOMAIN} {
|
photos.${DOMAIN} {
|
||||||
reverse_proxy 192.168.0.167:2283
|
reverse_proxy 192.168.0.166:2283
|
||||||
}
|
}
|
||||||
|
|
||||||
ai-chat.${DOMAIN_LOCAL} {
|
ai-chat.${DOMAIN_LOCAL} {
|
||||||
@@ -77,7 +77,7 @@ configs:
|
|||||||
# otherwise its hostname will be redirected to the above IP address
|
# otherwise its hostname will be redirected to the above IP address
|
||||||
host-record=nas.${DOMAIN_LOCAL},192.168.0.106
|
host-record=nas.${DOMAIN_LOCAL},192.168.0.106
|
||||||
host-record=nixos.${DOMAIN_LOCAL},192.168.0.203
|
host-record=nixos.${DOMAIN_LOCAL},192.168.0.203
|
||||||
host-record=oldguy.${DOMAIN_LOCAL},192.168.0.167
|
host-record=oldguy.${DOMAIN_LOCAL},192.168.0.168
|
||||||
ptr-record=106.0.168.192.in-addr.arpa,nas.${DOMAIN_LOCAL}
|
ptr-record=106.0.168.192.in-addr.arpa,nas.${DOMAIN_LOCAL}
|
||||||
host-record=suma.${DOMAIN_LOCAL},192.168.0.159
|
host-record=suma.${DOMAIN_LOCAL},192.168.0.159
|
||||||
host-record=suma-proxy3.${DOMAIN_LOCAL},192.168.0.176
|
host-record=suma-proxy3.${DOMAIN_LOCAL},192.168.0.176
|
||||||
@@ -135,7 +135,6 @@ services:
|
|||||||
- "${DOCKER_STORAGE_PATH}/caddy/config:/config"
|
- "${DOCKER_STORAGE_PATH}/caddy/config:/config"
|
||||||
- "/var/run/tailscale/tailscaled.sock:/var/run/tailscale/tailscaled.sock"
|
- "/var/run/tailscale/tailscaled.sock:/var/run/tailscale/tailscaled.sock"
|
||||||
- "/www/notes:/srv/notes"
|
- "/www/notes:/srv/notes"
|
||||||
- "timetracker-static:/srv/timetracker"
|
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
networks:
|
networks:
|
||||||
public:
|
public:
|
||||||
@@ -152,13 +151,12 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- TZ=${TZ}
|
- TZ=${TZ}
|
||||||
- "CSRF_TRUSTED_ORIGINS=https://tracker.kucharczyk.xyz"
|
- "CSRF_TRUSTED_ORIGINS=https://tracker.kucharczyk.xyz"
|
||||||
user: ${PUID}
|
- PUID=${PUID}
|
||||||
|
- PGID=${PGID}
|
||||||
|
- DATA_DIR=/home/timetracker/app/data
|
||||||
volumes:
|
volumes:
|
||||||
- "${DOCKER_STORAGE_PATH}/timetracker/db.sqlite3:/home/timetracker/app/db.sqlite3"
|
- "${DOCKER_STORAGE_PATH}/timetracker/data:/home/timetracker/app/data"
|
||||||
- "${DOCKER_STORAGE_PATH}/timetracker/db.sqlite3-shm:/home/timetracker/app/db.sqlite3-shm"
|
|
||||||
- "${DOCKER_STORAGE_PATH}/timetracker/db.sqlite3-wal:/home/timetracker/app/db.sqlite3-wal"
|
|
||||||
- "${DOCKER_STORAGE_PATH}/timetracker/backups:/home/timetracker/app/games/fixtures/backups"
|
- "${DOCKER_STORAGE_PATH}/timetracker/backups:/home/timetracker/app/games/fixtures/backups"
|
||||||
- "timetracker-static:/var/www/django/static"
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- caddy
|
- caddy
|
||||||
networks:
|
networks:
|
||||||
@@ -166,13 +164,7 @@ services:
|
|||||||
ipv4_address: 192.168.240.3
|
ipv4_address: 192.168.240.3
|
||||||
labels:
|
labels:
|
||||||
caddy: tracker.${DOMAIN}
|
caddy: tracker.${DOMAIN}
|
||||||
caddy.reverse_proxy: "{{ upstreams 8001 }}"
|
caddy.reverse_proxy: "{{ upstreams 8000 }}"
|
||||||
caddy.handle_path: "/static/*"
|
|
||||||
caddy.handle_path.root: "* /srv/timetracker"
|
|
||||||
caddy.handle_path.file_server:
|
|
||||||
caddy.handle: /robots.txt
|
|
||||||
caddy.handle.root: "* /srv/timetracker"
|
|
||||||
caddy.handle.file_server:
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
trilium:
|
trilium:
|
||||||
@@ -274,7 +266,7 @@ services:
|
|||||||
OIDC_SIGNUP_ENABLED: false
|
OIDC_SIGNUP_ENABLED: false
|
||||||
OIDC_USER_GROUP: mealie-users
|
OIDC_USER_GROUP: mealie-users
|
||||||
OIDC_ADMIN_GROUP: mealie-admins
|
OIDC_ADMIN_GROUP: mealie-admins
|
||||||
OIDC_AUTO_REDIRECT: false # Optional: The login page will be bypassed and you will be sent directly to your Identity Provider.
|
OIDC_AUTO_REDIRECT: true # Optional: The login page will be bypassed and you will be sent directly to your Identity Provider.
|
||||||
OIDC_REMEMBER_ME: true # Option
|
OIDC_REMEMBER_ME: true # Option
|
||||||
ALLOW_PASSWORD_LOGIN: false
|
ALLOW_PASSWORD_LOGIN: false
|
||||||
env_file:
|
env_file:
|
||||||
|
|||||||
Reference in New Issue
Block a user