Merge pull request #356 from neuhaus/encfs_optional

Create main user without "fuse" group, instead add it later

roles/common/tasks/encfs.yml

@@ -8,12 +8,12 @@
 - name: Create encrypted directory
   file: state=directory path=/encrypted
 
-- name: Create decrypted directory
-  file: state=directory path=/decrypted
-
 - name: Add mail user to fuse group
   user: name=mail append=yes groups=fuse
 
+- name: Add main user to fuse group
+  user: name={{ main_user_name }} append=yes groups=fuse
+
 # Check if the /encrypted directory is empty
 - name: Check for existing encfs
   shell: ls /encrypted/*

roles/common/tasks/main.yml

@@ -60,6 +60,12 @@
   notify: restart apache
   when: ansible_distribution_release == 'trusty'
 
+- name: Create decrypted directory (even if encfs isn't used)
+  file: state=directory path=/decrypted
+
+- name: Set decrypted directory permissions
+  file: state=directory path=/decrypted group=mail mode=775
+
 - include: encfs.yml tags=encfs
 - include: users.yml tags=users
 - include: ssl.yml tags=ssl

roles/common/tasks/users.yml

@@ -1,2 +1,2 @@
 - name: Create main user account
-  user: name={{ main_user_name }} state=present shell={{ main_user_shell }} groups=sudo,fuse
+  user: name={{ main_user_name }} state=present shell={{ main_user_shell }} groups=sudo