Properly set the roundcube database password

roles/webmail/handlers/main.yml

@@ -1,5 +1,9 @@
 - name: reconfigure roundcube db
-  action: shell dbconfig-generate-include /etc/dbconfig-common/roundcube.conf /etc/roundcube/debian-db.php
+  command: /usr/sbin/dbconfig-generate-include /etc/dbconfig-common/roundcube.conf /etc/roundcube/debian-db.php
+  notify: set roundcube password
+
+- name: set roundcube password
+  command: sudo -u {{ db_admin_username }} psql -d {{ webmail_db_database }} -c "ALTER USER {{ webmail_db_username }} with password '{{ webmail_db_password }}';"
   notify: import sql carddav
 
 - name: import sql carddav

roles/webmail/tasks/roundcube.yml

@@ -17,11 +17,8 @@
 - name: Decompress carddav plugin source
   command: tar xzf carddav_{{ carddav_version }}.tar.gz chdir=/root creates=/root/rcmcarddav-carddav_{{ carddav_version }}
 
-- name: Create /usr/share/roundcube/plugins/carddav
-  file: state=directory path=/usr/share/roundcube/plugins/carddav
-
-- name: Copy carddav plugin files to /usr/share/roundcube/plugins/carddav
-  shell: cp -R rcmcarddav-carddav_{{ carddav_version }}/* /usr/share/roundcube/plugins/carddav/ chdir=/root
+- name: Move carddav plugin files to /usr/share/roundcube/plugins/carddav
+  command: mv rcmcarddav-carddav_{{ carddav_version }} /usr/share/roundcube/plugins/carddav chdir=/root creates=/usr/share/roundcube/plugins/carddav
 
 - name: Link carddav plugin into /var/lib/roundcube/plugins
   file: state=link src=/usr/share/roundcube/plugins/carddav dest=/var/lib/roundcube/plugins/carddav force=yes
@@ -29,9 +26,6 @@
 - name: Remove downloaded carddav plugin file
   file: state=absent path=/root/carddav_{{ carddav_version }}.tar.gz
 
-- name: Remove extracted carddav plugin files
-  file: state=absent path=/root/rcmcarddav-carddav_{{ carddav_version }} recurse=true
-
 - name: Configure the Apache HTTP server for roundcube
   template: src=etc_apache2_sites-available_roundcube.j2 dest=/etc/apache2/sites-available/roundcube group=www-data owner=www-data force=yes