Merge pull request #2 from Temelio/develop

Use better default value for root datadir group

README.md

@@ -50,6 +50,19 @@ files. SSHD configuration is not managed inside the role.
 
 ### Default role variables
 
+    # Path management about sftp users home dir
+    sftp_data_dir_path: '/var/sftp'
+    sftp_data_dir_mode: '0750'
+    sftp_data_dir_owner: 'root'
+    sftp_data_dir_group: "{{ sftp_users_group_name }}"
+
+    # Sftp users management
+    sftp_users_group_name: 'sftp-users'
+    sftp_users_home_mode: '0750'
+    sftp_users_skeleton: '/etc/skel'
+    sftp_users_shell: '/usr/sbin/nologin'
+    sftp_users: []
+
 ### SFTP users format
 
     sftp_users:

defaults/main.yml

@@ -6,7 +6,7 @@
 sftp_data_dir_path: '/var/sftp'
 sftp_data_dir_mode: '0750'
 sftp_data_dir_owner: 'root'
-sftp_data_dir_group: 'root'
+sftp_data_dir_group: "{{ sftp_users_group_name }}"
 
 # Sftp users management
 sftp_users_group_name: 'sftp-users'

spec/installation_spec.rb

@@ -12,6 +12,16 @@
         end
     end
 
+    describe 'datadir directory' do
+        describe file('/var/sftp') do
+            it { should exist }
+            it { should be_directory }
+            it { should be_owned_by 'root' }
+            it { should be_grouped_into 'sftp-users' }
+            it { should be_mode 750 }
+        end
+    end
+
     describe 'first user configuration' do
 
         describe file('/var/sftp/sftp1/.ssh') do

tasks/main.yml

@@ -2,6 +2,13 @@
 
 # Main tasks file for sftp role
 
+- name: 'Manage sftp users group'
+  become: True
+  group:
+    name: "{{ sftp_users_group_name }}"
+    state: 'present'
+
+
 - name: 'Ensure data path exists'
   become: True
   file:
@@ -12,13 +19,6 @@
     state: 'directory'
 
 
-- name: 'Manage sftp users group'
-  become: True
-  group:
-    name: "{{ sftp_users_group_name }}"
-    state: 'present'
-
-
 - name: 'Manage sftp users creation'
   become: True
   user: