mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-09-09 19:57:16 +02:00
Compare commits
2 Commits
cbe9efbdc8
...
a100c9e63d
Author | SHA1 | Date | |
---|---|---|---|
a100c9e63d | |||
f254c9711d |
Binary file not shown.
Before Width: | Height: | Size: 162 KiB After Width: | Height: | Size: 162 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 701 KiB |
@@ -1,11 +1,11 @@
|
||||
{# Base template for all docker-compose.yml.j2 #}
|
||||
services:
|
||||
{# Load Database #}
|
||||
{% if applications[application_id].docker.database.enabled | default(false) | bool %}
|
||||
{% if applications[application_id].docker.services.database.enabled | default(false) | bool %}
|
||||
{% include 'roles/docker-central-database/templates/services/main.yml.j2' %}
|
||||
{% endif %}
|
||||
{# Load Redis #}
|
||||
{% if applications[application_id].docker.redis.enabled | default(false) | bool %}
|
||||
{% if applications[application_id].docker.services.redis.enabled | default(false) | bool %}
|
||||
{% include 'roles/docker-redis/templates/service.yml.j2' %}
|
||||
{% endif %}
|
||||
{# Load OAuth2 Proxy #}
|
||||
|
@@ -1,18 +1,18 @@
|
||||
{# This template needs to be included in docker-compose.yml containers, which depend on a database, redis and optional additional volumes #}
|
||||
{% if applications | is_feature_enabled('central_database', application_id)
|
||||
and not (applications[application_id].docker.redis.enabled
|
||||
and not (applications[application_id].docker.services.redis.enabled
|
||||
| default(false)
|
||||
| bool) %}
|
||||
depends_on: []
|
||||
{% else %}
|
||||
depends_on:
|
||||
{% if not applications | is_feature_enabled('central_database', application_id) %}
|
||||
{% if not applications | is_feature_enabled('central_database', application_id) %}
|
||||
database:
|
||||
condition: service_healthy
|
||||
{% endif %}
|
||||
{% if applications[application_id].docker.redis.enabled | default(false) | bool %}
|
||||
{% endif %}
|
||||
{% if applications[application_id].docker.services.redis.enabled | default(false) | bool %}
|
||||
redis:
|
||||
condition: service_healthy
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{{ "\n" }}
|
||||
|
@@ -3,7 +3,7 @@ images:
|
||||
features:
|
||||
matomo: true
|
||||
css: false
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
ldap: false
|
||||
oidc: true
|
||||
central_database: true
|
||||
|
@@ -7,7 +7,7 @@ credentials:
|
||||
features:
|
||||
matomo: true
|
||||
css: false
|
||||
portfolio_iframe: false # Deactivated mailu iframe loading until keycloak supports it
|
||||
portfolio_iframe: true # Deactivated mailu iframe loading until keycloak supports it
|
||||
oidc: true
|
||||
central_database: false # Deactivate central database for mailu, I don't know why the database deactivation is necessary
|
||||
domains:
|
||||
|
@@ -7,7 +7,7 @@ credentials:
|
||||
features:
|
||||
matomo: true
|
||||
css: true
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
oidc: true
|
||||
central_database: true
|
||||
domains:
|
||||
|
@@ -3,7 +3,7 @@ images:
|
||||
features:
|
||||
matomo: true
|
||||
css: false
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
central_database: true
|
||||
oauth2: false
|
||||
csp:
|
||||
|
@@ -15,7 +15,7 @@ setup: false # Set true in inventory
|
||||
features:
|
||||
matomo: false # Deactivated, because in html CSP restricts use
|
||||
css: true
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
oidc: true # Deactivated OIDC due to this issue https://github.com/matrix-org/synapse/issues/10492
|
||||
central_database: true
|
||||
csp:
|
||||
|
@@ -3,7 +3,7 @@ version: "4.5" # Latest LTS - Neces
|
||||
features:
|
||||
matomo: true
|
||||
css: false
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
central_database: true
|
||||
oidc: true
|
||||
csp:
|
||||
|
@@ -14,7 +14,7 @@ ldap:
|
||||
features:
|
||||
matomo: true
|
||||
css: false # Temporary deactivated. Needs to be optimized for production use.
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
ldap: true
|
||||
central_database: true
|
||||
oauth2: true
|
||||
|
@@ -2,7 +2,7 @@ version: "bookworm"
|
||||
features:
|
||||
matomo: true
|
||||
css: false
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
central_database: true
|
||||
oidc: true
|
||||
csp:
|
||||
|
@@ -7,7 +7,7 @@ oauth2_proxy:
|
||||
features:
|
||||
matomo: true
|
||||
css: true
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
central_database: true
|
||||
oauth2: true
|
||||
csp:
|
||||
|
@@ -5,6 +5,6 @@ oauth2_proxy:
|
||||
features:
|
||||
matomo: true
|
||||
css: true
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
ldap: true
|
||||
oauth2: true
|
@@ -6,7 +6,7 @@ oauth2_proxy:
|
||||
features:
|
||||
matomo: true
|
||||
css: false
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
central_database: true
|
||||
oauth2: true
|
||||
hostname: central-mariadb
|
||||
|
@@ -5,7 +5,7 @@ images:
|
||||
features:
|
||||
matomo: true
|
||||
css: false # Needs to be reactivated
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
central_database: true
|
||||
oidc: true
|
||||
csp:
|
||||
|
@@ -9,6 +9,7 @@ csp:
|
||||
script-src-elem:
|
||||
- https://cdn.jsdelivr.net
|
||||
- https://kit.fontawesome.com
|
||||
- https://code.jquery.com/
|
||||
style-src:
|
||||
- https://cdn.jsdelivr.net
|
||||
font-src:
|
||||
|
@@ -2,8 +2,8 @@
|
||||
"name": "simpleicons-server",
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"express": "^4.18.2",
|
||||
"simple-icons": "^9.0.0",
|
||||
"sharp": "^0.32.0"
|
||||
"express": "*",
|
||||
"simple-icons": "*",
|
||||
"sharp": "*"
|
||||
}
|
||||
}
|
||||
|
@@ -2,7 +2,7 @@ version: "latest"
|
||||
features:
|
||||
matomo: true
|
||||
css: false
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
central_database: true
|
||||
ldap: true
|
||||
oauth2: true
|
||||
|
@@ -1,7 +1,7 @@
|
||||
features:
|
||||
matomo: true
|
||||
css: true
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
csp:
|
||||
flags:
|
||||
script-src:
|
||||
|
@@ -9,7 +9,7 @@ flavor: 'taigaio' # Potential flavors: robrotheram, taigaio
|
||||
features:
|
||||
matomo: true
|
||||
css: false
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
oidc: false
|
||||
central_database: true
|
||||
docker:
|
||||
|
@@ -9,7 +9,7 @@ plugins:
|
||||
features:
|
||||
matomo: true
|
||||
css: false
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
oidc: true
|
||||
central_database: true
|
||||
version: latest
|
||||
|
@@ -10,7 +10,7 @@ oauth2_proxy:
|
||||
features:
|
||||
matomo: true
|
||||
css: true
|
||||
portfolio_iframe: false
|
||||
portfolio_iframe: true
|
||||
central_database: true
|
||||
oauth2: true
|
||||
domains:
|
||||
|
Reference in New Issue
Block a user