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

client/tasks/desktop.yml

@@ -108,12 +108,6 @@
     - packages
     - internet
 
-- name: ensure the bird is named intuitively
-  file: state=link src=/usr/bin/icedove dest=/usr/bin/thunderbird
-  tags:
-    - config
-    - internet
-
 - name: ensure multimedia applications are installed
   apt: name={{ item }} state=latest
   with_items:
@@ -242,6 +236,13 @@
     - desktop
     - fsmpi
 
+- name: ensure we have the correct printer
+  template: src=lpoptions.j2 dest=/etc/cups/lpoptions owner=root group=root mode=0644
+  tags:
+    - desktop
+    - fsmpi
+    - 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

guest-overlay/templates/lpoptions.j2 → client/templates/lpoptions.j2

-{%- if inventory_hostname | regex_replace('[0-9]$', '') == "hoern" -%}
-Default Hoern_Kopierer
+{%- if inventory_hostname | regex_replace('[0-9]$', '') == "hoern" or inventory_hostname == "portal" -%}
+Default Hoern_Kopierer Duplex=DuplexNoTumble
 {%- else -%}
 {%- set number = inventory_hostname | regex_replace('^[a-z]*', '') -%}
-Default Kopierer KmManagment=MG{{ number }}
-Dest Backup OutputBin=MBDWN0{{ number }} KmManagment=MG{{ number }}
+Default Kopierer ColorModel=Gray Duplex=DuplexNoTumble OutputBin=MBDWN{{ number }}
 {%- endif -%}

guest-overlay/handlers/main.yml

+---
+# file: roles/guest-overlay/handlers/main.yml
+
+- name: restart kdm
+  service: name=kdm state=restarted

guest-overlay/tasks/main.yml

@@ -40,6 +40,7 @@
 
 - name: ensure the squasfs is created
   local_action: command mksquashfs "{{ role_path }}/files/provision" "{{ role_path }}/files/provision.squashfs"
+  run_once: True
   tags:
     - guest-overlay
     - squashfs
@@ -58,12 +59,6 @@
     - provision
     - squashfs
 
-#- name: ensure we have the correct printer
-#  template: src=lpoptions.j2 dest=/guests/provision/gast/.cups/lpoptions owner=gast group=gast mode=0750
-#  tags:
-#    - guest-overlay
-#    - config
-
 - name: deployment of our pam-mount config
   copy: src=pam_mount.conf.xml dest=/etc/security/pam_mount.conf.xml
   notify: