From 19846c0182472c607cea24274cef4cd3bfc2edee Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Sun, 21 May 2017 13:49:33 +0200
Subject: [PATCH] client: provide lpoptions globally
---
client/tasks/desktop.yml | 7 +++++++
{guest-overlay => client}/templates/lpoptions.j2 | 0
guest-overlay/tasks/main.yml | 6 ------
3 files changed, 7 insertions(+), 6 deletions(-)
rename {guest-overlay => client}/templates/lpoptions.j2 (100%)
mode change 100755 => 100644
diff --git a/client/tasks/desktop.yml b/client/tasks/desktop.yml
index 29f22f4..3d33d4a 100644
--- a/client/tasks/desktop.yml
+++ b/client/tasks/desktop.yml
@@ -236,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
diff --git a/guest-overlay/templates/lpoptions.j2 b/client/templates/lpoptions.j2
old mode 100755
new mode 100644
similarity index 100%
rename from guest-overlay/templates/lpoptions.j2
rename to client/templates/lpoptions.j2
diff --git a/guest-overlay/tasks/main.yml b/guest-overlay/tasks/main.yml
index 6670081..08f6bed 100644
--- a/guest-overlay/tasks/main.yml
+++ b/guest-overlay/tasks/main.yml
@@ -58,12 +58,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:
--
GitLab