diff --git a/.env b/.env index 29ce60d..5eb6a30 100644 Binary files a/.env and b/.env differ diff --git a/bind9/guiotte.db b/bind9/guiotte.db index 7a0c53c..6d596e9 100644 --- a/bind9/guiotte.db +++ b/bind9/guiotte.db @@ -29,3 +29,4 @@ git.guiotte.fr. IN CNAME dm.guiotte.fr. db.guiotte.fr. IN CNAME dm.guiotte.fr. flix.guiotte.fr. IN CNAME dm.guiotte.fr. task.guiotte.fr. IN CNAME dm.guiotte.fr. +todo.guiotte.fr. IN CNAME dm.guiotte.fr. diff --git a/ddclient/ddclient.conf b/ddclient/ddclient.conf index 3f93114..a8b4d38 100644 Binary files a/ddclient/ddclient.conf and b/ddclient/ddclient.conf differ diff --git a/docker-compose.yml b/docker-compose.yml index d5369bc..eec5c71 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ x-common-environment: &common-environment PUID: 1000 PGID: 1000 - TZ: Europe/Paris + TZ: &tz Europe/Paris services: @@ -422,6 +422,30 @@ services: - taskchampion-data:/taskchampion-data + vikunja: + image: vikunja/vikunja + container_name: vikunja + restart: unless-stopped + environment: + <<: *common-environment + VIKUNJA_SERVICE_PUBLICURL: https://todo.guiotte.fr + VIKUNJA_DATABASE_PATH: /db/vikunja.db + VIKUNJA_SERVICE_JWTSECRET: ${VIKUNJA_SERVICE_JWTSECRET} + VIKUNJA_SERVICE_TIMEZONE: *tz + VIKUNJA_MAILER_ENABLED: true + VIKUNJA_MAILER_HOST: ${MAIL_SERVER} + VIKUNJA_MAILER_PORT: ${MAIL_SMTP_PORT} + VIKUNJA_MAILER_USERNAME: ${MAIL_USERNAME} + VIKUNJA_MAILER_PASSWORD: ${MAIL_PASSWORD} + VIKUNJA_MAILER_FORCESSL: ${MAIL_USE_SSL} + VIKUNJA_SERVICE_ENABLEREGISTRATION: true + + + volumes: + - vikunja-data:/app/vikunja/files + - vikunja-db:/db + + volumes: money-data: lychee-db: @@ -449,6 +473,8 @@ volumes: nocodb-db: jellyfin-config: taskchampion-data: + vikunja-data: + vikunja-db: secrets: diff --git a/swag/nginx/proxy-confs/vikunja.subdomain.conf b/swag/nginx/proxy-confs/vikunja.subdomain.conf new file mode 100644 index 0000000..aada9d7 --- /dev/null +++ b/swag/nginx/proxy-confs/vikunja.subdomain.conf @@ -0,0 +1,63 @@ +## Version 2024/07/16 +# REMOVE THIS LINE BEFORE SUBMITTING: The structure of the file (all of the existing lines) should be kept as close as possible to this template. +# REMOVE THIS LINE BEFORE SUBMITTING: Look through this file for and replace them. Review other sample files to see how things are done. +# REMOVE THIS LINE BEFORE SUBMITTING: The comment lines at the top of the file (below this line) should explain any prerequisites for using the proxy such as DNS or app settings. +# make sure that your container is named +# make sure that your dns has a cname set for + +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name todo.*; + + include /config/nginx/ssl.conf; + + client_max_body_size 0; + + # enable for ldap auth (requires ldap-location.conf in the location block) + #include /config/nginx/ldap-server.conf; + + # enable for Authelia (requires authelia-location.conf in the location block) + #include /config/nginx/authelia-server.conf; + + # enable for Authentik (requires authentik-location.conf in the location block) + #include /config/nginx/authentik-server.conf; + + location / { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable for ldap auth (requires ldap-server.conf in the server block) + #include /config/nginx/ldap-location.conf; + + # enable for Authelia (requires authelia-server.conf in the server block) + #include /config/nginx/authelia-location.conf; + + # enable for Authentik (requires authentik-server.conf in the server block) + #include /config/nginx/authentik-location.conf; + + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app vikunja; + set $upstream_port 3456; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + + # REMOVE THIS LINE BEFORE SUBMITTING: Additional proxy settings such as headers go below this line, leave the blank line above. + } + + # REMOVE THIS LINE BEFORE SUBMITTING: Some proxies require one or more additional location blocks for things like API or RPC endpoints. + # REMOVE THIS LINE BEFORE SUBMITTING: If the proxy you are making a sample for does not require an additional location block please remove the commented out section below. + # location ~ (/)?/api { + # include /config/nginx/proxy.conf; + # include /config/nginx/resolver.conf; + # set $upstream_app ; + # set $upstream_port ; + # set $upstream_proto ; + # proxy_pass $upstream_proto://$upstream_app:$upstream_port; + # + # # REMOVE THIS LINE BEFORE SUBMITTING: Additional proxy settings such as headers go below this line, leave the blank line above. + # } +}