Merge pull request #142 from bbinet/fix-file-mode

Fix file mode for file.managed state

README.rst

@@ -352,7 +352,7 @@ Ensure presence of file by specifying it's source:
             source: http://example.com/test.txt
             user: root
             group: root
-            file_mode: 700
+            mode: 700
             dir_mode: 700
             encoding: utf-8
             hash: <<md5 hash>>
@@ -371,7 +371,7 @@ Ensure presence of file by specifying it's contents:
               line2
             user: root
             group: root
-            file_mode: 700
+            mode: 700
             dir_mode: 700
             encoding: utf-8
             hash: <<md5 hash>>

linux/system/file.sls

@@ -17,8 +17,8 @@
     - makedirs: {{ file.get('makedirs', 'True') }}
     - user: {{ file.get('user', 'root') }}
     - group: {{ file.get('group', 'root') }}
-    {%- if file.file_mode is defined %}
-    - file_mode: {{ file.file_mode }}
+    {%- if file.mode is defined %}
+    - mode: {{ file.mode }}
     {%- endif %}
     {%- if file.dir_mode is defined %}
     - dir_mode: {{ file.dir_mode }}