Nicer ordering.
This commit is contained in:
		
							parent
							
								
									de52a1eb33
								
							
						
					
					
						commit
						25dd1161e4
					
				
					 1 changed files with 9 additions and 7 deletions
				
			
		| 
						 | 
					@ -11,6 +11,14 @@
 | 
				
			||||||
  blockinfile:
 | 
					  blockinfile:
 | 
				
			||||||
    dest: /etc/security/pam_mount.conf.xml
 | 
					    dest: /etc/security/pam_mount.conf.xml
 | 
				
			||||||
    block: |
 | 
					    block: |
 | 
				
			||||||
 | 
					      <volume
 | 
				
			||||||
 | 
					        fstype="fuse"
 | 
				
			||||||
 | 
					        path="sshfs#%(USER)@{{ home_server }}:"
 | 
				
			||||||
 | 
					        mountpoint="/home/%(USER)"
 | 
				
			||||||
 | 
					        options="allow_other,default_permissions,reconnect,password_stdin,disable-hardlink"
 | 
				
			||||||
 | 
					        ssh="0" noroot="0"
 | 
				
			||||||
 | 
					      ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <volume
 | 
					      <volume
 | 
				
			||||||
        fstype="cifs"
 | 
					        fstype="cifs"
 | 
				
			||||||
        server="{{ smb_server }}"
 | 
					        server="{{ smb_server }}"
 | 
				
			||||||
| 
						 | 
					@ -18,6 +26,7 @@
 | 
				
			||||||
        mountpoint="/media/%(USER)/winhome"
 | 
					        mountpoint="/media/%(USER)/winhome"
 | 
				
			||||||
        options="dir_mode=0750,file_mode=0640"
 | 
					        options="dir_mode=0750,file_mode=0640"
 | 
				
			||||||
      ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume>
 | 
					      ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <volume
 | 
					      <volume
 | 
				
			||||||
        fstype="cifs"
 | 
					        fstype="cifs"
 | 
				
			||||||
        server="{{ smb_server }}"
 | 
					        server="{{ smb_server }}"
 | 
				
			||||||
| 
						 | 
					@ -25,13 +34,6 @@
 | 
				
			||||||
        mountpoint="/media/%(USER)/winshare"
 | 
					        mountpoint="/media/%(USER)/winshare"
 | 
				
			||||||
        options="dir_mode=0750,file_mode=0640"
 | 
					        options="dir_mode=0750,file_mode=0640"
 | 
				
			||||||
      ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume>
 | 
					      ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume>
 | 
				
			||||||
      <volume
 | 
					 | 
				
			||||||
        fstype="fuse"
 | 
					 | 
				
			||||||
        path="sshfs#%(USER)@{{ home_server }}:"
 | 
					 | 
				
			||||||
        mountpoint="/home/%(USER)"
 | 
					 | 
				
			||||||
        options="allow_other,default_permissions,reconnect,password_stdin"
 | 
					 | 
				
			||||||
        ssh="0" noroot="0"
 | 
					 | 
				
			||||||
      ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume>
 | 
					 | 
				
			||||||
    insertafter: "<!-- Volume definitions -->"
 | 
					    insertafter: "<!-- Volume definitions -->"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- name: make sure .ssh exists
 | 
					- name: make sure .ssh exists
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue