mirror of
				https://github.com/iiab/iiab.git
				synced 2025-03-09 15:40:17 +00:00 
			
		
		
		
	go with keyfile
This commit is contained in:
		
							parent
							
								
									f73585aea1
								
							
						
					
					
						commit
						f1f2ffa275
					
				
					 1 changed files with 22 additions and 12 deletions
				
			
		| 
						 | 
					@ -58,23 +58,33 @@
 | 
				
			||||||
  when: dnsmasq_install
 | 
					  when: dnsmasq_install
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# do this
 | 
					# do this
 | 
				
			||||||
- name: Copy NetworkManager.conf for has_NM
 | 
					#- name: Copy NetworkManager.conf for has_NM
 | 
				
			||||||
  template: dest=/etc/NetworkManager/NetworkManager.conf
 | 
					#  template: dest=/etc/NetworkManager/NetworkManager.conf
 | 
				
			||||||
            src=network/NetworkManager.conf
 | 
					#            src=network/NetworkManager.conf
 | 
				
			||||||
  when: has_NM and iiab_lan_iface == "br0"
 | 
					#  when: has_NM and iiab_lan_iface == "br0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#- name: Copy the bridge script for has_NM
 | 
				
			||||||
 | 
					#  template: dest=/etc/network/interfaces
 | 
				
			||||||
 | 
					#            src=network/systemd.j2
 | 
				
			||||||
 | 
					#  when: has_NM and not wan_in_interfaces and iiab_lan_iface == "br0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# or provide keyfile layout like the XO's used way back.
 | 
				
			||||||
 | 
					- name: Create uuid for NM
 | 
				
			||||||
 | 
					  shell: uuidgen
 | 
				
			||||||
 | 
					  register: uuid_response
 | 
				
			||||||
 | 
					  when: has_NM and not wan_in_interfaces and iiab_lan_iface == "br0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- name: Put the uuid in place
 | 
				
			||||||
 | 
					  set_fact:
 | 
				
			||||||
 | 
					    gen_uuid: "{{ uuid_response.stdout_lines[0] }}"
 | 
				
			||||||
 | 
					  when: has_NM and not wan_in_interfaces and iiab_lan_iface == "br0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# NM might have a watcher on this path and we don't have to restart NM
 | 
					# NM might have a watcher on this path and we don't have to restart NM
 | 
				
			||||||
- name: Copy the bridge script for has_NM
 | 
					- name: Copy the bridge script for has_NM
 | 
				
			||||||
  template: dest=/etc/network/interfaces
 | 
					  template: dest=/etc/NetworkManager/system-connections/
 | 
				
			||||||
            src=network/systemd.j2
 | 
					            src=network/bridge-br0
 | 
				
			||||||
  when: has_NM and not wan_in_interfaces and iiab_lan_iface == "br0"
 | 
					  when: has_NM and not wan_in_interfaces and iiab_lan_iface == "br0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# or provide keyfile layout like the XO's used way back.
 | 
					 | 
				
			||||||
#- name: Copy the bridge script for has_NM
 | 
					 | 
				
			||||||
#  template: dest=/etc/NetworkManager/system-connections/
 | 
					 | 
				
			||||||
#            src=network/bridge-br0
 | 
					 | 
				
			||||||
#  when: has_NM and not wan_in_interfaces and iiab_lan_iface == "br0"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
- name: Reload systemd
 | 
					- name: Reload systemd
 | 
				
			||||||
  shell: systemctl daemon-reload
 | 
					  shell: systemctl daemon-reload
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue