Merge pull request #55 from OneID/feature/gitfs-repo-options

Allow individual repo options for gitfs_remotes

pillar.example

@@ -5,6 +5,7 @@ salt:
       - roots
     gitfs_remotes:
       - git://github.com/saltstack-formulas/salt-formula.git
+        - base: develop
     file_roots:
       base:
         - /srv/salt

salt/files/master.d/_defaults.conf

@@ -484,7 +484,19 @@ fileserver_backend:
 {% if 'gitfs_remotes' in master -%}
 gitfs_remotes:
 {%- for remote in master['gitfs_remotes'] %}
-  - {{ remote }}{% endfor -%}
+{% if remote is mapping %}
+  {%- for repo, children in remote.iteritems() -%}
+    - {{ repo }}:
+  {%- for child in children %}
+    {% for key, value in child.iteritems() -%}
+      - {{ key }}: {{ value }}
+    {%- endfor %}
+  {%- endfor %}
+  {%- endfor %}
+  {%- else -%}
+    - {{ remote }}
+{%- endif %}
+{%- endfor %}
 {%- endif %}
 #
 #gitfs_remotes: