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:
		
							
								
								
									
										3
									
								
								roles/sys-svc-rdbms/templates/configuration.yml.j2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								roles/sys-svc-rdbms/templates/configuration.yml.j2
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| # Jinja2 configuration template | ||||
| # Define your variables here | ||||
|  | ||||
							
								
								
									
										5
									
								
								roles/sys-svc-rdbms/templates/env/mariadb.env.j2
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								roles/sys-svc-rdbms/templates/env/mariadb.env.j2
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,5 @@ | ||||
| MYSQL_DATABASE="{{ database_name }}" | ||||
| MYSQL_USER="{{ database_username }}" | ||||
| MYSQL_PASSWORD="{{ database_password }}" | ||||
| MYSQL_ROOT_PASSWORD="{{ database_password }}" | ||||
| MARIADB_AUTO_UPGRADE="1" | ||||
							
								
								
									
										4
									
								
								roles/sys-svc-rdbms/templates/env/postgres.env.j2
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								roles/sys-svc-rdbms/templates/env/postgres.env.j2
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,4 @@ | ||||
| POSTGRES_PASSWORD={{ database_password }} | ||||
| POSTGRES_USER={{ database_username }} | ||||
| POSTGRES_DB={{ database_name }} | ||||
| POSTGRES_INITDB_ARGS=--encoding=UTF8 --locale=C | ||||
							
								
								
									
										1
									
								
								roles/sys-svc-rdbms/templates/services/main.yml.j2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								roles/sys-svc-rdbms/templates/services/main.yml.j2
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| {% include 'roles/sys-svc-rdbms/templates/services/' + database_type + '.yml.j2' %} | ||||
							
								
								
									
										23
									
								
								roles/sys-svc-rdbms/templates/services/mariadb.yml.j2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								roles/sys-svc-rdbms/templates/services/mariadb.yml.j2
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,23 @@ | ||||
| {# This template needs to be included in docker-compose.yml, which depend on a mariadb database #} | ||||
| {% if not applications | get_app_conf(application_id, 'features.central_database', False) %} | ||||
|  | ||||
|   {{ database_host }}: | ||||
|     container_name: {{ application_id | get_entity_name }}-database | ||||
|     logging: | ||||
|       driver: journald | ||||
|     image: mariadb | ||||
|     restart: {{ DOCKER_RESTART_POLICY }} | ||||
|     env_file: | ||||
|       - {{database_env}} | ||||
|     command: "--transaction-isolation=READ-COMMITTED --binlog-format=ROW" | ||||
|     volumes: | ||||
|       - database:/var/lib/mysql | ||||
|     healthcheck: | ||||
|       test: [ "CMD", "sh", "-c", "/usr/bin/mariadb --user=$$MYSQL_USER --password=$$MYSQL_PASSWORD --execute 'SHOW DATABASES;'" ] | ||||
|       interval: 10s | ||||
|       timeout: 5s | ||||
|       retries: 18 | ||||
|     networks: | ||||
|       - default | ||||
| {% endif %} | ||||
| {{ "\n" }} | ||||
							
								
								
									
										22
									
								
								roles/sys-svc-rdbms/templates/services/postgres.yml.j2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								roles/sys-svc-rdbms/templates/services/postgres.yml.j2
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,22 @@ | ||||
| {# This template needs to be included in docker-compose.yml, which depend on a postgres database #} | ||||
|  | ||||
| {% if not applications | get_app_conf(application_id, 'features.central_database', False) %}   | ||||
|   {{ database_host }}: | ||||
|     image: postgres:{{applications['svc-db-postgres'].version}}-alpine | ||||
|     container_name: {{ application_id | get_entity_name }}-database | ||||
|     env_file: | ||||
|       - {{database_env}} | ||||
|     restart: {{ DOCKER_RESTART_POLICY }} | ||||
|     healthcheck: | ||||
|       test: ["CMD-SHELL", "pg_isready -U {{ database_name }}"] | ||||
|       interval: 10s | ||||
|       timeout: 5s | ||||
|       retries: 6 | ||||
|     volumes: | ||||
|       - type:   volume | ||||
|         source: database | ||||
|         target: /var/lib/postgresql/data | ||||
|     networks: | ||||
|       - default | ||||
| {% endif %} | ||||
| {{ "\n" }} | ||||
		Reference in New Issue
	
	Block a user