mirror of
				https://github.com/kevinveenbirkenbach/computer-playbook.git
				synced 2025-10-31 18:29:21 +00:00 
			
		
		
		
	Refactor: migrate cmp/* and srv/* roles into sys-stk/* and sys-svc/* namespaces
- Removed obsolete 'cmp' category, introduced 'stk' category (fa-bars-staggered icon). - Renamed roles: * cmp-db-docker → sys-stk-back-stateful * cmp-docker-oauth2 → sys-stk-back-stateless * srv-domain-provision → sys-stk-front * cmp-db-docker-proxy → sys-stk-full-stateful * cmp-docker-proxy → sys-stk-full-stateless * cmp-rdbms → sys-svc-rdbms - Updated all include_role references, vars, templates and README.md files. - Adjusted run_once comments and variable paths accordingly. - Updated all web-app roles to use new sys-stk/* and sys-svc/* roles. Conversation: https://chatgpt.com/share/68b0ba66-09f8-800f-86fc-76c47009d431
This commit is contained in:
		
							
								
								
									
										20
									
								
								roles/sys-svc-rdbms/vars/database.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								roles/sys-svc-rdbms/vars/database.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,20 @@ | ||||
| # Helper variables | ||||
| _dbtype:                          "{{ (database_type | d('') | trim) }}" | ||||
| _database_id:                     "{{ ('svc-db-' ~ _dbtype) if _dbtype else '' }}" | ||||
| _database_central_name:           "{{ (applications | get_app_conf(_database_id, 'docker.services.' ~ _dbtype ~ '.name', False, '')) if _dbtype else '' }}" | ||||
| _database_consumer_id:            "{{ database_application_id | d(application_id) }}" | ||||
| _database_consumer_entity_name:   "{{ _database_consumer_id | get_entity_name }}" | ||||
| _database_central_enabled:        "{{ (applications | get_app_conf(_database_consumer_id, 'features.central_database', False)) if _dbtype else False }}" | ||||
|  | ||||
| # Definition | ||||
|  | ||||
| database_name:      "{{ _database_consumer_entity_name }}" | ||||
| database_instance:  "{{ _database_central_name if _database_central_enabled else database_name }}" # This could lead to bugs at dedicated database @todo cleanup | ||||
| database_host:      "{{ _database_central_name if _database_central_enabled else 'database' }}"    # This could lead to bugs at dedicated database @todo cleanup | ||||
| database_username:  "{{ _database_consumer_entity_name }}" | ||||
| database_password:  "{{ applications | get_app_conf(_database_consumer_id, 'credentials.database_password', true) }}" | ||||
| database_port:      "{{ (ports.localhost.database[_database_id] | d('')) if _dbtype else '' }}" | ||||
| database_env:       "{{ docker_compose.directories.env }}{{ database_type }}.env" | ||||
| database_url_jdbc:  "jdbc:{{ database_type if database_type == 'mariadb' else 'postgresql' }}://{{ database_host }}:{{ database_port }}/{{ database_name }}" | ||||
| database_url_full:  "{{ database_type }}://{{ database_username }}:{{ database_password }}@{{ database_host }}:{{ database_port }}/{{ database_name }}" | ||||
| database_volume:    "{{ _database_consumer_entity_name ~ '_' if not _database_central_enabled }}{{ database_host }}" | ||||
							
								
								
									
										2
									
								
								roles/sys-svc-rdbms/vars/main.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								roles/sys-svc-rdbms/vars/main.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,2 @@ | ||||
| # Docker | ||||
| docker_pull_git_repository: false # Deactivated here to don't inhire this | ||||
		Reference in New Issue
	
	Block a user