Improve ansible stuff and prepare caddy
This commit is contained in:
		
							parent
							
								
									2d8c670110
								
							
						
					
					
						commit
						3b9ed6a4f4
					
				
					 10 changed files with 83 additions and 42 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,6 @@
 | 
			
		|||
- import_tasks: steps/create-service-directory.yml
 | 
			
		||||
- import_tasks: steps/template-docker-compose.yml
 | 
			
		||||
- import_tasks: steps/template-service-env.yml
 | 
			
		||||
- import_tasks: steps/template-site-config.yml
 | 
			
		||||
- include_tasks: steps/template-site-config.yml
 | 
			
		||||
  when: svc.domain is defined
 | 
			
		||||
- import_tasks: steps/start-service.yml
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,3 +1,25 @@
 | 
			
		|||
- name: Build service
 | 
			
		||||
  ansible.builtin.command:
 | 
			
		||||
    cmd: docker compose build --pull
 | 
			
		||||
    chdir: "{{ service_path }}"
 | 
			
		||||
  when:
 | 
			
		||||
    - "'local-dev' != inventory_hostname"
 | 
			
		||||
    - docker_update is defined
 | 
			
		||||
    - docker_update
 | 
			
		||||
  register: cmd_result
 | 
			
		||||
  changed_when: True
 | 
			
		||||
 | 
			
		||||
- name: Pull service
 | 
			
		||||
  ansible.builtin.command:
 | 
			
		||||
    cmd: docker compose pull --ignore-buildable
 | 
			
		||||
    chdir: "{{ service_path }}"
 | 
			
		||||
  when:
 | 
			
		||||
    - "'local-dev' != inventory_hostname"
 | 
			
		||||
    - docker_update is defined
 | 
			
		||||
    - docker_update
 | 
			
		||||
  register: cmd_result
 | 
			
		||||
  changed_when: True
 | 
			
		||||
 | 
			
		||||
- name: Start service
 | 
			
		||||
  ansible.builtin.command:
 | 
			
		||||
    cmd: docker compose up -d
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,9 @@
 | 
			
		|||
- name: Template caddy config
 | 
			
		||||
- name: Template caddy site
 | 
			
		||||
  ansible.builtin.template:
 | 
			
		||||
    src: caddy_site.conf.j2
 | 
			
		||||
    dest: "{{ (caddy_config_path, svc.domain + '.conf') | path_join }}"
 | 
			
		||||
    mode: "0644"
 | 
			
		||||
  when: svc.domain is defined
 | 
			
		||||
 | 
			
		||||
- name: Register caddy site
 | 
			
		||||
  ansible.builtin.set_fact:
 | 
			
		||||
    managed_sites: "{{ managed_sites + [svc.domain + '.conf'] }}"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue