client: fix lpoptions, enable mozilla profiles

client/tasks/configuration.yml

@@ -12,7 +12,6 @@
 
 - name: ensure we have the correct printer
   template: src=lpoptions.j2 dest=/etc/cups/lpoptions owner=root group=root mode=0644
-  when: smb_domain == 'FSMPI' # not ported yet
 
 - 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
@@ -26,10 +25,10 @@
   copy: src=logrotate/rsyslog dest=/etc/logrotate.d/rsyslog owner=root group=root mode=0644
   when: client_do_rsyslog
 
-#- name: ensure iceweasel default profile stuff is installed
-#  copy: src=iceweasel/ dest=/usr/lib/firefox-esr/ owner=root group=root mode=0644
-#  when: client_provision_mozilla
-#
-#- name: ensure icedove default profile stuff is installed
-#  copy: src=icedove/ dest=/usr/lib/icedove/ owner=root group=root mode=0644
-#  when: client_provision_mozilla
+- name: ensure firefox default profile stuff is installed
+  copy: src=mozilla/firefox/ dest=/usr/lib/firefox-esr/ owner=root group=root mode=0644
+  when: client_provision_mozilla
+
+- name: ensure thunderbird default profile stuff is installed
+  copy: src=mozilla/thunderbird/ dest=/usr/lib/thunderbird/ owner=root group=root mode=0644
+  when: client_provision_mozilla

client/templates/lpoptions.j2

 {%- if inventory_hostname | regex_replace('[0-9]$', '') == "hoern" or inventory_hostname == "portal" -%}
 Default Hoern_Kopierer Duplex=DuplexNoTumble
+{%- elif inventory_hostname | regex_replace('[0-9]$', '') == "lxc" -%}
+Dest Kopierer_Briefpapier ColorModel=Gray KCRotate=On
+Default Kopierer_BW ColorModel=Gray
 {%- else -%}
 {%- set number = inventory_hostname | regex_replace('^[a-z]*', '') -%}
 Default Kopierer ColorModel=Gray Duplex=DuplexNoTumble OutputBin=MBDWN{{ number }}