mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-07-24 17:21:09 +02:00
Activated redis for oauth2 for large cookies
This commit is contained in:
parent
5e315f9603
commit
c8be88e3b1
@ -5,7 +5,7 @@ services:
|
|||||||
{% include 'roles/cmp-rdbms/templates/services/main.yml.j2' %}
|
{% include 'roles/cmp-rdbms/templates/services/main.yml.j2' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{# Load Redis #}
|
{# Load Redis #}
|
||||||
{% if applications | is_docker_service_enabled(application_id, 'redis') %}
|
{% if applications | is_docker_service_enabled(application_id, 'redis') or applications | get_app_conf(application_id, 'features.oauth2', False) %}
|
||||||
{% include 'roles/svc-db-redis/templates/service.yml.j2' %}
|
{% include 'roles/svc-db-redis/templates/service.yml.j2' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{# Load OAuth2 Proxy #}
|
{# Load OAuth2 Proxy #}
|
||||||
|
@ -1,7 +1,11 @@
|
|||||||
{# This template needs to be included in docker-compose.yml which contain a database and additional volumes #}
|
{# This template needs to be included in docker-compose.yml which contain a database and additional volumes #}
|
||||||
volumes:
|
volumes:
|
||||||
{% if not applications | get_app_conf(application_id, 'features.central_database', False) and applications | get_app_conf(application_id, 'docker.services.database.enabled', False) %}
|
{% if applications | is_docker_service_enabled(application_id, 'database') and not applications | get_app_conf(application_id, 'features.central_database', False) %}
|
||||||
database:
|
database:
|
||||||
name: {{ database_volume }}
|
name: {{ database_volume }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if applications | is_docker_service_enabled(application_id, 'redis') or applications | get_app_conf(application_id, 'features.oauth2', False) %}
|
||||||
|
redis:
|
||||||
|
name: {{ application_id | get_entity_name }}
|
||||||
|
{% endif %}
|
||||||
{{ "\n" }}
|
{{ "\n" }}
|
@ -24,6 +24,5 @@
|
|||||||
- .:/var/www
|
- .:/var/www
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
||||||
redis:
|
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
@ -14,6 +14,5 @@
|
|||||||
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
name: {{ baserow_volume }}
|
name: {{ baserow_volume }}
|
||||||
redis:
|
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
@ -1,7 +1,6 @@
|
|||||||
{% include 'roles/docker-compose/templates/base.yml.j2' %}
|
{% include 'roles/docker-compose/templates/base.yml.j2' %}
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
||||||
redis:
|
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
||||||
{{ discourse_network }}:
|
{{ discourse_network }}:
|
||||||
|
@ -63,7 +63,6 @@
|
|||||||
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
funkwhale_static_root:
|
funkwhale_static_root:
|
||||||
redis:
|
|
||||||
music:
|
music:
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
@ -16,7 +16,6 @@
|
|||||||
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
||||||
redis:
|
|
||||||
config:
|
config:
|
||||||
logs:
|
logs:
|
||||||
data:
|
data:
|
||||||
|
@ -100,7 +100,7 @@
|
|||||||
- "{{docker_compose.directories.volumes}}overrides/rspamd:/overrides:ro"
|
- "{{docker_compose.directories.volumes}}overrides/rspamd:/overrides:ro"
|
||||||
depends_on:
|
depends_on:
|
||||||
- front
|
- front
|
||||||
- redis
|
- redis
|
||||||
- antivirus
|
- antivirus
|
||||||
- resolver
|
- resolver
|
||||||
dns:
|
dns:
|
||||||
@ -181,8 +181,6 @@
|
|||||||
name: {{ mailu_dkim }}
|
name: {{ mailu_dkim }}
|
||||||
dovecot_mail:
|
dovecot_mail:
|
||||||
name: {{ mailu_dovecot_mail }}
|
name: {{ mailu_dovecot_mail }}
|
||||||
redis:
|
|
||||||
name: {{ mailu_redis }}
|
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
||||||
radicale:
|
radicale:
|
||||||
|
@ -44,7 +44,6 @@
|
|||||||
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
||||||
redis:
|
|
||||||
data:
|
data:
|
||||||
name: "{{ mastodon_volume }}"
|
name: "{{ mastodon_volume }}"
|
||||||
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
@ -71,6 +71,5 @@
|
|||||||
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
name: {{ nextcloud_volume }}
|
name: {{ nextcloud_volume }}
|
||||||
redis:
|
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
||||||
|
@ -42,7 +42,7 @@ nextcloud_cron_name: "{{ applications | get_app_conf(
|
|||||||
nextcloud_talk_name: "{{ applications | get_app_conf(application_id, 'docker.services.talk.name', True) }}"
|
nextcloud_talk_name: "{{ applications | get_app_conf(application_id, 'docker.services.talk.name', True) }}"
|
||||||
nextcloud_talk_image: "{{ applications | get_app_conf(application_id, 'docker.services.talk.image', True) }}"
|
nextcloud_talk_image: "{{ applications | get_app_conf(application_id, 'docker.services.talk.image', True) }}"
|
||||||
nextcloud_talk_version: "{{ applications | get_app_conf(application_id, 'docker.services.talk.version', True) }}"
|
nextcloud_talk_version: "{{ applications | get_app_conf(application_id, 'docker.services.talk.version', True) }}"
|
||||||
nextcloud_talk_enabled: "{{ applications | get_app_conf(application_id, 'docker.services.talk.enabled', True) }}"
|
nextcloud_talk_enabled: "{{ applications | is_docker_service_enabled(application_id, 'talk') }}"
|
||||||
nextcloud_talk_stun_port: "{{ ports.public.stun[application_id] }}"
|
nextcloud_talk_stun_port: "{{ ports.public.stun[application_id] }}"
|
||||||
# nextcloud_talk_domain: "{{ domains[application_id].talk }}"
|
# nextcloud_talk_domain: "{{ domains[application_id].talk }}"
|
||||||
|
|
||||||
|
@ -21,4 +21,7 @@ allowed_groups = {{ applications | get_app_conf(oauth2_proxy_applicat
|
|||||||
email_domains = ["*"]
|
email_domains = ["*"]
|
||||||
{% else %}
|
{% else %}
|
||||||
email_domains = "{{ primary_domain }}"
|
email_domains = "{{ primary_domain }}"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
session_store_type = "redis"
|
||||||
|
redis_connection_url = "redis://redis:6379"
|
@ -19,7 +19,6 @@
|
|||||||
assets:
|
assets:
|
||||||
data:
|
data:
|
||||||
name: {{ peertube_volume }}
|
name: {{ peertube_volume }}
|
||||||
redis:
|
|
||||||
config:
|
config:
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
@ -30,7 +30,6 @@
|
|||||||
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
||||||
redis:
|
|
||||||
data:
|
data:
|
||||||
name: {{ pixelfed_volume }}
|
name: {{ pixelfed_volume }}
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
# Compose Configuration
|
# Compose Configuration
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
|
||||||
redis:
|
|
||||||
data:
|
data:
|
||||||
name: "{{ snipe_it_volume }}"
|
name: "{{ snipe_it_volume }}"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user