kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-09-24 19:16:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(services): add CPU/RAM/PIDs defaults for heavy roles and align service names

Browse Source 
Add per-service resource overrides (cpus, mem_reservation, mem_limit, pids_limit) for ollama, mariadb, postgres, confluence, gitlab, jira, keycloak, nextcloud; light formatting fixes in wordpress.

Rename service keys from generic 'application/web' to concrete names (jira, confluence, gitlab, keycloak) and update compose templates accordingly.

Jira: introduce JIRA_STORAGE_PATH and switch mounts/README accordingly.

https://chatgpt.com/share/68d2d96c-9bf4-800f-bbec-d4f2c0051c06
This commit is contained in:
Kevin Veen-Birkenbach
2025-09-23 21:43:50 +02:00
parent ff7b7aeb2d
commit 426ba32c11
17 changed files with 77 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
roles/web-app-confluence/config/main.yml
View File

@@ -3,10 +3,14 @@ docker:
services:
database:
enabled: true
application:
image: atlassian/confluence
version: latest
name: confluence
confluence:
image: atlassian/confluence
version: latest
name: confluence
cpus: "3.0"
mem_reservation: "6g"
mem_limit: "8g"
pids_limit: 2048
volumes:
data: "confluence_data"
features:

2
roles/web-app-confluence/templates/docker-compose.yml.j2
View File

@@ -1,5 +1,5 @@
{% include 'roles/docker-compose/templates/base.yml.j2' %}
application:
confluence:
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
image: "{{ CONFLUENCE_CUSTOM_IMAGE }}"
container_name: "{{ CONFLUENCE_CONTAINER }}"

6
roles/web-app-confluence/vars/main.yml
View File

@@ -28,9 +28,9 @@ CONFLUENCE_OIDC_SCOPES: "openid,email,profile"
CONFLUENCE_OIDC_UNIQUE_ATTRIBUTE: "{{ OIDC.ATTRIBUTES.USERNAME }}"
## Docker
CONFLUENCE_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.application.version') }}"
CONFLUENCE_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.application.image') }}"
CONFLUENCE_CONTAINER: "{{ applications | get_app_conf(application_id, 'docker.services.application.name') }}"
CONFLUENCE_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.confluence.version') }}"
CONFLUENCE_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.confluence.image') }}"
CONFLUENCE_CONTAINER: "{{ applications | get_app_conf(application_id, 'docker.services.confluence.name') }}"
CONFLUENCE_DATA_VOLUME: "{{ applications | get_app_conf(application_id, 'docker.volumes.data') }}"
CONFLUENCE_CUSTOM_IMAGE: "{{ CONFLUENCE_IMAGE }}_custom"