mirror of
				https://github.com/kevinveenbirkenbach/computer-playbook.git
				synced 2025-11-04 12:18:17 +00:00 
			
		
		
		
	Optimized categories and passed all unit tests
This commit is contained in:
		
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@@ -5,7 +5,7 @@ USERS_OUT           := ./group_vars/all/03_users.yml
 | 
				
			|||||||
USERS_SCRIPT        := ./cli/build/defaults/users.py
 | 
					USERS_SCRIPT        := ./cli/build/defaults/users.py
 | 
				
			||||||
INCLUDES_SCRIPT     := ./cli/build/role_include.py
 | 
					INCLUDES_SCRIPT     := ./cli/build/role_include.py
 | 
				
			||||||
 | 
					
 | 
				
			||||||
INCLUDE_GROUPS := $(shell python3 main.py meta invokable_paths -s "-" --no-signal | tr '\n' ' ')
 | 
					INCLUDE_GROUPS := $(shell python3 main.py meta categories invokable -s "-" --no-signal | tr '\n' ' ')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Directory where these include-files will be written
 | 
					# Directory where these include-files will be written
 | 
				
			||||||
INCLUDES_OUT_DIR    := ./tasks/groups
 | 
					INCLUDES_OUT_DIR    := ./tasks/groups
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -102,7 +102,11 @@ roles:
 | 
				
			|||||||
    invokable: true
 | 
					    invokable: true
 | 
				
			||||||
  svc:
 | 
					  svc:
 | 
				
			||||||
    title: "Services"
 | 
					    title: "Services"
 | 
				
			||||||
    description: "Docker infrastructure services (DBMS, LDAP, Redis, etc.)"
 | 
					    description: "Infrastructure services like databases"
 | 
				
			||||||
 | 
					    invokable: false
 | 
				
			||||||
 | 
					    db:  
 | 
				
			||||||
 | 
					      title: "Databases"
 | 
				
			||||||
 | 
					      description: "Database applications (DBMS, LDAP, Redis, etc.)"
 | 
				
			||||||
      icon: "fas fa-database"
 | 
					      icon: "fas fa-database"
 | 
				
			||||||
      invokable: true
 | 
					      invokable: true
 | 
				
			||||||
    opt:
 | 
					    opt:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -107,5 +107,6 @@
 | 
				
			|||||||
    - drv
 | 
					    - drv
 | 
				
			||||||
    - gen
 | 
					    - gen
 | 
				
			||||||
    - net
 | 
					    - net
 | 
				
			||||||
 | 
					    - svc-db
 | 
				
			||||||
  loop_control:
 | 
					  loop_control:
 | 
				
			||||||
    label: "{{ item }}-roles.yml"
 | 
					    label: "{{ item }}-roles.yml"
 | 
				
			||||||
@@ -13,6 +13,7 @@
 | 
				
			|||||||
- name: "Include server roles"
 | 
					- name: "Include server roles"
 | 
				
			||||||
  include_tasks: "./tasks/groups/{{ item }}-roles.yml"
 | 
					  include_tasks: "./tasks/groups/{{ item }}-roles.yml"
 | 
				
			||||||
  loop:
 | 
					  loop:
 | 
				
			||||||
 | 
					    - svc-db
 | 
				
			||||||
    - util-srv
 | 
					    - util-srv
 | 
				
			||||||
    - web-svc # Services need to run before applications
 | 
					    - web-svc # Services need to run before applications
 | 
				
			||||||
    - web-app
 | 
					    - web-app
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user