Compare commits
	
		
			3 commits
		
	
	
		
			b4caaf036d
			...
			9a83ebca6b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
							 | 
						9a83ebca6b | ||
| 
							 | 
						8ec701595a | ||
| 
							 | 
						cb37d52271 | 
					 5 changed files with 670 additions and 702 deletions
				
			
		
							
								
								
									
										1334
									
								
								inventory.yml
									
										
									
									
									
								
							
							
						
						
									
										1334
									
								
								inventory.yml
									
										
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							| 
						 | 
					@ -182,8 +182,8 @@
 | 
				
			||||||
      #SingleClick=false
 | 
					      #SingleClick=false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      [KDE Action Restrictions][$i]
 | 
					      [KDE Action Restrictions][$i]
 | 
				
			||||||
      #action/start_new_session=false
 | 
					      action/start_new_session=false
 | 
				
			||||||
      #action/switch_user=false
 | 
					      action/switch_user=false
 | 
				
			||||||
      #action/lock_screen=false
 | 
					      #action/lock_screen=false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- name: Start with empty session by default
 | 
					- name: Start with empty session by default
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,32 +29,6 @@
 | 
				
			||||||
    #     insertafter: '#auth_unix_rw = "polkit"'
 | 
					    #     insertafter: '#auth_unix_rw = "polkit"'
 | 
				
			||||||
    #   notify: reload libvirtd
 | 
					    #   notify: reload libvirtd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- name: Configure pam_mount for VM bind mounts
 | 
					 | 
				
			||||||
  ansible.builtin.blockinfile:
 | 
					 | 
				
			||||||
    dest: /etc/security/pam_mount.conf.xml
 | 
					 | 
				
			||||||
    marker: "<!-- {mark} ANSIBLE MANAGED BLOCK (bind mounts for VMs) -->"
 | 
					 | 
				
			||||||
    block: |
 | 
					 | 
				
			||||||
      <!-- bind mounts for the VMs, setting gid here does not work -->
 | 
					 | 
				
			||||||
      <volume
 | 
					 | 
				
			||||||
        path="~"
 | 
					 | 
				
			||||||
        mountpoint="/lmn/media/%(USER)/home"
 | 
					 | 
				
			||||||
        options="bind"
 | 
					 | 
				
			||||||
        ><not><or><user>root</user><user>ansible</user><user>Debian-gdm</user><user>sddm</user>{% if localuser %}<user>{{ localuser }}</user>{% endif %}</or></not>
 | 
					 | 
				
			||||||
      </volume>
 | 
					 | 
				
			||||||
      <volume
 | 
					 | 
				
			||||||
        path="/srv/samba/schools/default-school/share"
 | 
					 | 
				
			||||||
        mountpoint="/lmn/media/%(USER)/share"
 | 
					 | 
				
			||||||
        options="bind"
 | 
					 | 
				
			||||||
        ><not><or><user>root</user><user>ansible</user><user>Debian-gdm</user><user>sddm</user>{% if localuser %}<user>{{ localuser }}</user>{% endif %}</or></not>
 | 
					 | 
				
			||||||
      </volume>
 | 
					 | 
				
			||||||
      <volume
 | 
					 | 
				
			||||||
        path="/srv/samba/schools/default-school"
 | 
					 | 
				
			||||||
        mountpoint="/lmn/media/%(USER)/school"
 | 
					 | 
				
			||||||
        options="bind"
 | 
					 | 
				
			||||||
        ><not><or><user>root</user><user>ansible</user><user>Debian-gdm</user><user>sddm</user>{% if localuser %}<user>{{ localuser }}</user>{% endif %}</or></not>
 | 
					 | 
				
			||||||
      </volume>
 | 
					 | 
				
			||||||
    insertafter: "<!-- END ANSIBLE MANAGED BLOCK .* -->"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
- name: Use umount script for proper cleanup
 | 
					- name: Use umount script for proper cleanup
 | 
				
			||||||
  ansible.builtin.blockinfile:
 | 
					  ansible.builtin.blockinfile:
 | 
				
			||||||
    dest: /etc/security/pam_mount.conf.xml
 | 
					    dest: /etc/security/pam_mount.conf.xml
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,19 +29,16 @@ if [[ "$CONNECTION_ID" = "VPN-Schule" ]]; then
 | 
				
			||||||
    umask 0002
 | 
					    umask 0002
 | 
				
			||||||
    mkdir -p /srv/samba/schools/default-school
 | 
					    mkdir -p /srv/samba/schools/default-school
 | 
				
			||||||
    chmod 777  /srv/samba/schools/default-school
 | 
					    chmod 777  /srv/samba/schools/default-school
 | 
				
			||||||
    mkdir -p "/lmn/media/${USERNAME}/share"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    mount -t cifs //server/default-school/ /srv/samba/schools/default-school \
 | 
					    mount -t cifs //server/default-school/ /srv/samba/schools/default-school \
 | 
				
			||||||
          -o "sec=krb5i,cruid=${USERID},user=${USERNAME},uid=${USERID},gid=${GROUPID},file_mode=0700,dir_mode=0700,mfsymlinks,nobrl,actimeo=600,cache=loose,echo_interval=10"
 | 
					          -o "sec=krb5i,cruid=${USERID},user=${USERNAME},uid=${USERID},gid=${GROUPID},file_mode=0700,dir_mode=0700,mfsymlinks,nobrl,actimeo=600,cache=loose,echo_interval=10"
 | 
				
			||||||
	  echo "after mount" >&2
 | 
						  echo "after mount" >&2
 | 
				
			||||||
    mount --bind /srv/samba/schools/default-school/share "/lmn/media/${USERNAME}/share"
 | 
					 | 
				
			||||||
    SUDO_USER=$USERNAME /usr/local/bin/install-printers.sh
 | 
					    SUDO_USER=$USERNAME /usr/local/bin/install-printers.sh
 | 
				
			||||||
  elif [[ "$NM_DISPATCHER_ACTION" = "pre-down" ]]; then
 | 
					  elif [[ "$NM_DISPATCHER_ACTION" = "pre-down" ]]; then
 | 
				
			||||||
    # FIXME: Only umount server when Wireguard-Connection was the only connection to server.
 | 
					    # FIXME: Only umount server when Wireguard-Connection was the only connection to server.
 | 
				
			||||||
    # Dirty fix (works only in fvs-IP-Range)
 | 
					    # Dirty fix (works only in fvs-IP-Range)
 | 
				
			||||||
    if ! (ip r s | grep "10.190." | grep -v wg0); then
 | 
					    if ! (ip r s | grep "10.190." | grep -v wg0); then
 | 
				
			||||||
      echo "Try to umount server shares"
 | 
					      echo "Try to umount server"
 | 
				
			||||||
      umount "/lmn/media/${USERNAME}/share"
 | 
					 | 
				
			||||||
      umount /srv/samba/schools/default-school
 | 
					      umount /srv/samba/schools/default-school
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,6 @@ set -eu
 | 
				
			||||||
 | 
					
 | 
				
			||||||
exit_script() {
 | 
					exit_script() {
 | 
				
			||||||
    echo "unmounting media - terminated by trap!" >> "/tmp/${SUDO_UID}-exit-mount.log"
 | 
					    echo "unmounting media - terminated by trap!" >> "/tmp/${SUDO_UID}-exit-mount.log"
 | 
				
			||||||
    findmnt "/lmn/media/${SUDO_USER}/share" && umount "/lmn/media/${SUDO_USER}/share"
 | 
					 | 
				
			||||||
    findmnt "/srv/samba/schools/default-school" && umount "/srv/samba/schools/default-school"
 | 
					    findmnt "/srv/samba/schools/default-school" && umount "/srv/samba/schools/default-school"
 | 
				
			||||||
    trap - SIGHUP SIGINT SIGTERM # clear the trap
 | 
					    trap - SIGHUP SIGINT SIGTERM # clear the trap
 | 
				
			||||||
    kill -- -$$ # Sends SIGTERM to child/sub processes
 | 
					    kill -- -$$ # Sends SIGTERM to child/sub processes
 | 
				
			||||||
| 
						 | 
					@ -14,11 +13,9 @@ findmnt /srv/samba/schools/default-school > /dev/null && exit 0
 | 
				
			||||||
umask 0002
 | 
					umask 0002
 | 
				
			||||||
mkdir -p /srv/samba/schools/default-school
 | 
					mkdir -p /srv/samba/schools/default-school
 | 
				
			||||||
chmod 777  /srv/samba/schools/default-school
 | 
					chmod 777  /srv/samba/schools/default-school
 | 
				
			||||||
mkdir -p "/lmn/media/${SUDO_USER}/share"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
mount -t cifs //server/default-school/ /srv/samba/schools/default-school \
 | 
					mount -t cifs //server/default-school/ /srv/samba/schools/default-school \
 | 
				
			||||||
      -o "sec=krb5i,cruid=${SUDO_UID},user=${SUDO_USER},uid=${SUDO_UID},gid=${SUDO_GID},file_mode=0700,dir_mode=0700,mfsymlinks,nobrl,actimeo=600,cache=loose,echo_interval=10"
 | 
					      -o "sec=krb5i,cruid=${SUDO_UID},user=${SUDO_USER},uid=${SUDO_UID},gid=${SUDO_GID},file_mode=0700,dir_mode=0700,mfsymlinks,nobrl,actimeo=600,cache=loose,echo_interval=10"
 | 
				
			||||||
mount --bind /srv/samba/schools/default-school/share "/lmn/media/${SUDO_USER}/share"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Einbindung erfolgreich!"
 | 
					echo "Einbindung erfolgreich!"
 | 
				
			||||||
echo "Dieses Fenster bitte nicht schließen!"
 | 
					echo "Dieses Fenster bitte nicht schließen!"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue