From ab62cb85a331a9de098067c603770cd2e0086263 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sun, 4 Oct 2015 04:26:41 +0200 Subject: [PATCH] Fixing pulseaudio placement and call on cron. --- roles/base/files/pulseaudio-perms.sh | 27 -------------------------- roles/base/tasks/main.yml | 8 ++++---- roles/{base => domain}/tasks/audio.yml | 11 +---------- roles/domain/tasks/main.yml | 5 +++++ 4 files changed, 10 insertions(+), 41 deletions(-) delete mode 100644 roles/base/files/pulseaudio-perms.sh rename roles/{base => domain}/tasks/audio.yml (66%) diff --git a/roles/base/files/pulseaudio-perms.sh b/roles/base/files/pulseaudio-perms.sh deleted file mode 100644 index 9025660..0000000 --- a/roles/base/files/pulseaudio-perms.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -domaingroup="domain users" -localgroups="pulse pulse-access" - -baseusers="bglug" -domainusers="$(getent group "${domaingroup}" | awk 'BEGIN { FS = ":" } ; { print $4 }' | sed -e 's/,/ /g')" - -users="${baseusers} ${domainusers}" - -for group in ${localgroups}; do - actualusers=$(getent group '${group}' | awk 'BEGIN { FS = ":" }; { print $4 }' | sed -e 's/,/ /g') - - # Removing users not in the group - for user in ${actualusers}; do - whuser=${user//[[:space:]]/} - echo "removing ${user}" - [[ "${users}" =~ "${whuser}" ]] || gpasswd -d "${whuser}" "${group}" - unset whuser - done - - # Adding users to group - for user in ${users}; do - whuser=${user//[[:space:]]/} - [[ "${actualusers}" =~ "${whuser}" ]] || gpasswd -a "${whuser}" "${group}" - done -done diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index b018e67..769a9b0 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -35,10 +35,10 @@ - pkgs - packages -- include: audio.yml - tags: - - base - - audio +#- include: audio.yml +# tags: +# - base +# - audio - include: system.yml tags: diff --git a/roles/base/tasks/audio.yml b/roles/domain/tasks/audio.yml similarity index 66% rename from roles/base/tasks/audio.yml rename to roles/domain/tasks/audio.yml index be1cfdf..ea9cd33 100644 --- a/roles/base/tasks/audio.yml +++ b/roles/domain/tasks/audio.yml @@ -26,18 +26,9 @@ shell: chmod -x /usr/bin/start-pulseaudio-x11 sudo: yes -# Need to manage additions to pulse and pulse-access groups -- name: Copying script to manage users in pulse and pulse-access - copy: - src: pulseaudio-perms.sh - dest: '/var/lib/{{ ansible_local.domain.domainfull }}/bin/pulseaudio-perms.sh' - mode: 0755 - owner: root - group: root - - name: Adding pulseaudio fixing script at reboot. lineinfile: - line: '@reboot root /var/lib/{{ ansible_local.domain.domainfull }}/bin/pulseaudio-perms.sh >/dev/null 2>&1' + line: '@reboot root curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/pulseaudio-perms.sh | bash >/dev/null 2>&1' dest: /etc/cron.d/pulseaudio-perms create: yes state: present diff --git a/roles/domain/tasks/main.yml b/roles/domain/tasks/main.yml index 5d4e449..7c0bce6 100644 --- a/roles/domain/tasks/main.yml +++ b/roles/domain/tasks/main.yml @@ -11,6 +11,11 @@ - domain - nss +- include: audio.yml + tags: + - domain + - audio + - include: gui-changes.yml tags: - domain