Merge branch 'master' of git.fsmpi.rwth-aachen.de:infra/ansible

client/tasks/desktop.yml

@@ -242,60 +242,6 @@
     - desktop
     - fsmpi
 
-- name: ensure aufs and pam-mount are available
-  apt: name=aufs-tools,libpam-mount state=latest
-  tags:
-    - aufs
-    - packages
-
-- name: ensure aufs mountpoints are available
-  file: path=/{{ item }} state=directory
-  with_items:
-    - aufs-rw
-    - aufs-home
-  tags:
-    - aufs
-    - mount
-
-- name: ensure aufs-rw is a tmpfs
-  mount: fstype=tmpfs name=/aufs-rw opts=nosuid,noexec,nodev,rw src=tmpfs state=mounted
-  tags:
-    - aufs
-    - config
-    - mount
-
-- name: deployment of our pam-mount config
-  copy: src=aufs/pam_mount.conf.xml dest=/etc/security/pam_mount.conf.xml
-  notify:
-    - restart kdm
-  tags:
-    - aufs
-    - config
-
-- name: ensure activation of pam-mount (auth)
-  lineinfile: dest=/etc/pam.d/common-auth line="auth  optional                        pam_mount.so"
-  notify:
-    - restart kdm
-  tags:
-    - aufs
-    - config
-
-- name: ensure activation of pam-mount (session)
-  lineinfile: dest=/etc/pam.d/common-session line="session  optional                        pam_mount.so"
-  notify:
-    - restart kdm
-  tags:
-    - aufs
-    - config
-
-- name: ensure activation of pam-mount (password)
-  lineinfile: dest=/etc/pam.d/common-password insertbefore=BOF line="password  optional                        pam_mount.so"
-  notify:
-    - restart kdm
-  tags:
-    - aufs
-    - config
-
 # granting all users access to sound card
 - name: grant user access to soundcard
   copy: src=udev_audio-perm.rules dest=/etc/udev/rules.d/50-audio-perm.rules owner=root group=root mode=0644

client/files/aufs/pam_mount.conf.xml → guest-overlay/files/pam_mount.conf.xml

@@ -15,7 +15,11 @@
 
 <!-- Volume definitions -->
 
-			<volume path="none" sgrp="gast" fstype="aufs" mountpoint="/aufs-home" options="br:/aufs-rw=rw:/home=ro,udba=reval" />
+<volume sgrp="gast" fstype="squashfs" path="/guests/provision.squashfs" mountpoint="/guests/provision" options="noatime,ro,loop" />
+
+<volume sgrp="gast" fstype="tmpfs" path="tmpfs" mountpoint="/guests/temporary" options="noatime,noexec,rw" />
+
+<volume path="none" sgrp="gast" fstype="aufs" mountpoint="/guests/home" options="br:/guests/temporary=rw:/guests/provision=ro,udba=reval" />
 
 <!-- pam_mount parameters: General tunables -->
 
@@ -41,5 +45,6 @@
 
 <mkmountpoint enable="1" remove="true" />
 
+<umount>umount -l %(MNTPT)</umount> 
 
 </pam_mount>

guest-overlay/files/provision/gast/.bash_logout

+# ~/.bash_logout: executed by bash(1) when login shell exits.
+
+# when leaving the console clear the screen to increase privacy
+
+if [ "$SHLVL" = 1 ]; then
+    [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
+fi

guest-overlay/files/provision/gast/.bashrc

+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    #alias grep='grep --color=auto'
+    #alias fgrep='fgrep --color=auto'
+    #alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# some more ls aliases
+#alias ll='ls -l'
+#alias la='ls -A'
+#alias l='ls -CF'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi

guest-overlay/files/provision/gast/.config/oxygen-gtk/argb-apps.conf

+# argb-apps.conf
+# Put your user-specific ARGB app settings here
+

guest-overlay/files/provision/gast/.config/user-dirs.dirs

+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+# 
+XDG_DESKTOP_DIR="$HOME/Desktop"
+XDG_DOWNLOAD_DIR="$HOME/Downloads"
+XDG_TEMPLATES_DIR="$HOME/Templates"
+XDG_PUBLICSHARE_DIR="$HOME/Public"
+XDG_DOCUMENTS_DIR="$HOME/Documents"
+XDG_MUSIC_DIR="$HOME/Music"
+XDG_PICTURES_DIR="$HOME/Pictures"
+XDG_VIDEOS_DIR="$HOME/Videos"

guest-overlay/files/provision/gast/.config/user-dirs.locale

+en_US
\ No newline at end of file

guest-overlay/files/provision/gast/.kde/Autostart/schrank.desktop

+/usr/local/share/schrank/schrank.desktop
\ No newline at end of file

guest-overlay/files/provision/gast/.kde/share/apps/dolphin/view_properties/global/.directory

+[Dolphin]
+Timestamp=2015,5,10,23,12,18
+Version=3

guest-overlay/files/provision/gast/.kde/share/apps/dolphin/view_properties/remote/.directory

+[Dolphin]
+Timestamp=2015,5,10,23,12,18
+Version=3
+ViewMode=1
+VisibleRoles=Details_text,Details_date,CustomizedDetails

guest-overlay/files/provision/gast/.kde/share/apps/dolphin/view_properties/search/SVCIa2mLAnEZVVmbuE7mQBEC8Lw=/.directory

+[Dolphin]
+Timestamp=2015,5,10,23,12,18
+Version=3
+ViewMode=1
+VisibleRoles=Details_text,Details_artist,Details_album,CustomizedDetails

guest-overlay/files/provision/gast/.kde/share/apps/dolphin/view_properties/search/csf1oPsh6cb9KCV5jBQlDjwWVMg=/.directory

+[Dolphin]
+Timestamp=2015,5,10,23,12,18
+Version=3
+ViewMode=1
+VisibleRoles=Details_text,Details_path,CustomizedDetails

guest-overlay/files/provision/gast/.kde/share/apps/dolphin/view_properties/search/ggB6TNGNecKbpMzbuWl4wj4thlo=/.directory

+[Dolphin]
+PreviewsShown=true
+Timestamp=2015,5,10,23,12,18
+Version=3
+VisibleRoles=Icons_text,Icons_imageSize

guest-overlay/files/provision/gast/.kde/share/apps/dolphin/view_properties/search/px--MEqcJrhfFsGYE9oQ7PJoxdc=/.directory

+[Dolphin]
+PreviewsShown=true
+Timestamp=2015,5,10,23,12,18
+Version=3