mirror of
				https://github.com/kevinveenbirkenbach/computer-playbook.git
				synced 2025-10-31 10:19:09 +00:00 
			
		
		
		
	web-app-bookwyrm, web-app-confluence:
- Fix BookWyrm email SSL/TLS handling (use ternary without 'not' for clarity) - Add truststore_enabled flag in Confluence config and vars - Wire JVM_SUPPORT_RECOMMENDED_ARGS to disable UPM signature check if truststore is disabled - Add placeholder style.css.j2 for Confluence See conversation: https://chatgpt.com/share/68b80024-7100-800f-a2fe-ba8b9f5cec05
This commit is contained in:
		| @@ -59,5 +59,5 @@ EMAIL_HOST_USER:                "{{ users['no-reply'].email }}" | ||||
| EMAIL_HOST_PASSWORD:            "{{ users['no-reply'].mailu_token }}" | ||||
| # TLS/SSL: If TLS is true → TLS; else → SSL | ||||
| EMAIL_USE_TLS:                  "{{ SYSTEM_EMAIL.TLS | ternary('true','false') }}" | ||||
| EMAIL_USE_SSL:                  "{{ not SYSTEM_EMAIL.TLS | ternary('true','false') }}" | ||||
| EMAIL_USE_SSL:                  "{{ SYSTEM_EMAIL.TLS | ternary('false','true') }}" | ||||
| EMAIL_DEFAULT_FROM:             "BookWyrm <{{ users['no-reply'].email }}>" | ||||
|   | ||||
| @@ -30,3 +30,4 @@ server: | ||||
|       - "confluence.{{ PRIMARY_DOMAIN }}" | ||||
| rbac: | ||||
|   roles: {} | ||||
| truststore_enabled: false | ||||
| @@ -7,4 +7,4 @@ FROM "{{ CONFLUENCE_IMAGE }}:{{ CONFLUENCE_VERSION }}" | ||||
| RUN mkdir -p {{ CONFLUENCE_HOME }} && \ | ||||
|     chown -R 2001:2001 {{ CONFLUENCE_HOME }} | ||||
| RUN printf "confluence.home={{ CONFLUENCE_HOME }}\n" \ | ||||
|   > /opt/atlassian/confluence/confluence/WEB-INF/classes/confluence-init.properties | ||||
|   > /opt/atlassian/confluence/confluence/WEB-INF/classes/confluence-init.properties | ||||
|   | ||||
| @@ -9,7 +9,7 @@ ATL_TOMCAT_SECURE={{ (WEB_PORT == 443) | lower }} | ||||
| JVM_MINIMUM_MEMORY={{ CONFLUENCE_JVM_MIN }} | ||||
| JVM_MAXIMUM_MEMORY={{ CONFLUENCE_JVM_MAX }} | ||||
|  | ||||
| JVM_SUPPORT_RECOMMENDED_ARGS=-Datlassian.home={{ CONFLUENCE_HOME }} | ||||
| JVM_SUPPORT_RECOMMENDED_ARGS=-Datlassian.home={{ CONFLUENCE_HOME }} -Datlassian.upm.signature.check.disabled={{ CONFLUENCE_TRUST_STORE_ENABLED | ternary('false','true')}} | ||||
|  | ||||
| ## Database | ||||
| ATL_DB_TYPE=postgresql | ||||
|   | ||||
							
								
								
									
										0
									
								
								roles/web-app-confluence/templates/style.css.j2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								roles/web-app-confluence/templates/style.css.j2
									
									
									
									
									
										Normal file
									
								
							| @@ -39,4 +39,8 @@ CONFLUENCE_TOTAL_MB:              "{{ ansible_memtotal_mb | int }}" | ||||
| CONFLUENCE_JVM_MAX_MB:            "{{ [ (CONFLUENCE_TOTAL_MB | int // 2), 12288 ] | min }}" | ||||
| CONFLUENCE_JVM_MIN_MB:            "{{ [ (CONFLUENCE_TOTAL_MB | int // 4), (CONFLUENCE_JVM_MAX_MB | int) ] | min }}" | ||||
| CONFLUENCE_JVM_MIN:               "{{ CONFLUENCE_JVM_MIN_MB }}m" | ||||
| CONFLUENCE_JVM_MAX:               "{{ CONFLUENCE_JVM_MAX_MB }}m" | ||||
| CONFLUENCE_JVM_MAX:               "{{ CONFLUENCE_JVM_MAX_MB }}m" | ||||
|  | ||||
|  | ||||
| ## Options  | ||||
| CONFLUENCE_TRUST_STORE_ENABLED:   "{{ applications | get_app_conf(application_id, 'truststore_enabled') }}" | ||||
		Reference in New Issue
	
	Block a user