Merge pull request #8 from babilen/dev-std-formula-layout

Switch to standard formula layout

locale/defaults.yaml

@@ -0,0 +1,4 @@
+locale:
+  config: '/etc/locale.conf'
+  pkgs: []
+  present: []

locale/init.sls

@@ -1,35 +1,33 @@
 # Installs and configures system locales
 
-{% from "locale/map.jinja" import map with context %}
+{% from "locale/map.jinja" import locale with context %}
 
+{% if locale.pkgs is iterable %}
 locale_pkgs:
   pkg.installed:
     - pkgs:
-      {%- for pkg in map.pkgs %}
+      {%- for pkg in locale.pkgs %}
         - {{ pkg }}
       {% endfor %}
+{% endif %}
 
-{%- set locales = salt['pillar.get']('locale:present', []) %}
-{%- set default = salt['pillar.get']('locale:default', 'en_US.UTF-8') %}
-
-{%- for locale in locales %}
-locale_present_{{ locale|replace('.', '_')|replace(' ', '_') }}:
+{%- for l in locale.present %}
+locale_present_{{ l|replace('.', '_')|replace(' ', '_') }}:
   locale.present:
-    - name: {{ locale }}
+    - name: {{ l }}
 {%- endfor %}
 
-{% if default is mapping %}
+{% if locale.default is defined %}
 locale_default:
   locale.system:
-    - name: {{ default.name }}
+    - name: {{ locale.default.name }}
     - require:
-      - locale: locale_present_{{ default.requires|replace('.', '_')|replace(' ', '_') }}
+      - locale: locale_present_{{ locale.default.requires|replace('.', '_')|replace(' ', '_') }}
 {% endif %}
 
-{%- set conf = salt['pillar.get']('locale:conf', {}) %}
-{%- if conf %}
-locale-conf-is-setup:
+{%- if locale.conf is defined %}
+locale_conf:
   file.managed:
-    - name: /etc/locale.conf
+    - name: {{ locale.config }}
     - contents_pillar: locale:conf
 {% endif %}

locale/map.jinja

@@ -1,4 +1,6 @@
-{% set map = salt['grains.filter_by']({
+{% import_yaml 'locale/defaults.yaml' as default_settings %}
+
+{% set os_family_map = salt['grains.filter_by']({
     'Debian': {
         'pkgs': ['locales'],
     },
@@ -13,3 +15,12 @@
     },
 
 }, grain='os_family', merge=salt['pillar.get']('locale:lookup')) %}
+
+{% do default_settings.locale.update(os_family_map) %}
+
+{% set locale = salt['pillar.get'](
+        'locale',
+        default=default_settings.locale,
+        merge=True
+    )
+%}