fix(config): rename config file to .conf

Author: noelmcloughlin

mongodb/clean.sls

@@ -81,10 +81,11 @@ include:
       - {{ d.dir.var }}/{{ name }}
       - {{ d.dir.service }}/{{ name }}.service
       - /Library/LaunchAgents/{{ name if 'name' not in service else service.name }}.plist
-    - require:
-      - file: {{ formula }}-clean-prerequisites
+    # require:
+      # file: {{ formula }}-clean-prerequisites
   cmd.run:
     - name: systemctl daemon-reload >/dev/null 2>&1 || true
+    - onlyif: {{ grains.kernel|lower == 'linux' }}
     - onchange:
       - file: {{ formula }}-{{ comp }}-{{ package }}-{{ name }}-clean-service
 

mongodb/config/clean.sls

@@ -37,7 +37,7 @@ include:
     - names:
             {%- if 'service' in software and software['service'] is mapping %}
                 {%- set servicename = name if 'service' not in software else software.service.name %}
-      - {{ d.dir.etc }}/{{ servicename|replace('org.mongo.mongodb.', '') }}.yml
+      - {{ d.dir.etc }}/{{ servicename|replace('org.mongo.mongodb.', '') }}.conf
             {%- endif %}
             {%- if 'config_file' in software and 'config' in software and software['config'] is mapping %}
       - {{ software['config_file'] }}

mongodb/config/file.sls

@@ -33,7 +33,7 @@ include:
 
 {{ formula }}-config-file-{{ servicename }}-file-managed:
   file.managed:
-    - name: {{ d.dir.etc }}/{{ servicename|replace('org.mongo.mongodb.', '') }}.yml
+    - name: {{ d.dir.etc }}/{{ servicename|replace('org.mongo.mongodb.', '') }}.conf
     - source: {{ files_switch(['config.yml.jinja'],
                               lookup=formula ~ '-config-file-' ~ servicename ~ '-file-managed'
                  )

mongodb/files/default/macos.plist.jinja

@@ -12,6 +12,8 @@
     </array>
     <key>RunAtLoad</key>
     <true/>
+    <key>UserName</key>
+    <string>{{ user }}</string>
     <key>StandardErrorPath</key>
     <string>/dev/null</string>
     <key>StandardOutPath</key>

mongodb/install.sls

@@ -76,7 +76,7 @@ include:
                             {#- NATIVE PACKAGE INSTALL #}
 
                         {%- if package == 'native' %}
-                            {%- if d.use_upstream = 'repo' and 'repo' in d.pkg and d.pkg.repo %}
+                            {%- if d.use_upstream == 'repo' and 'repo' in d.pkg and d.pkg.repo %}
   pkgrepo.managed:
     {{- format_kwargs(d.pkg['repo']) }}
                             {%- endif %}
@@ -261,6 +261,7 @@ include:
         svc: {{ servicename|replace('org.mongo.mongodb.', '') }}
         config: {{ software['config_file'] }}
         binpath: {{ software['path'] }}
+        user: {{ d.default.user if 'user' not in software else software['user'] }}
 
                         {%- endif %}   {# linux/darwin #}
                     {%- endif %}       {# service #}

mongodb/map.jinja

@@ -20,19 +20,18 @@
         )
       )
     )
- %}
+%}
+{%- set d = salt['grains.filter_by']( {'defaults': defaults}, default='defaults', merge=_config) %}
 
 # depreciate two params
 {%- if 'software_component_matrix' in d %}
-    {%- do d.update({ 'components': d.software_component_matrix %}
+    {%- do d.update({ 'components': d.software_component_matrix }) %}
 {%- endif %}
 {%- if 'software_package_matrix' in d %}
-    {%- do d.update({ 'use_upstream': d.software_package_matrix %}
+    {%- do d.update({ 'use_upstream': d.software_package_matrix }) %}
 {%- endif %}
 
 # build dict
-{%- set d = salt['grains.filter_by']( {'defaults': defaults}, default='defaults', merge=_config) %}
-
 {%- for comp in d.components %}
     {%- if comp in d.pkg and d.pkg[comp] is mapping %}
         {%- for name,v in d.pkg[comp].items() %}