fix(os): fixes for freebsd/archlinux

Author: noelmcloughlin

file_roots/install/salt.sls

@@ -1,7 +1,3 @@
 base:
   '*':
-   {%- if grains.os_family not in ('MacOS', 'Arch') %}
-    - salt.pkgrepo
-   {%- endif %}
-    - salt.minion
-    - salt.formulas
+    - salt

pillar_roots/saltstack-formulas/postgres.sls

@@ -6,8 +6,10 @@ postgres:
   # Set False to use distro packaged postgresql.
   # Set True to use upstream postgresql.org repo for YUM/APT/ZYPP
   use_upstream_repo: False
+        {%- if grains.os_family not in ('FreeBSD',) %}
   pkgs_extra:
     - postgresql-contrib
+        {%- endif %}
 
   #following is used by 'remove' states.
   upstream:
@@ -67,7 +69,7 @@ postgres:
   config_backup: ".backup@{{ salt['status.time']('%y-%m-%d_%H:%M:%S') }}"
   {%- endif %}
 
-  {%- if grains['init'] == 'unknown' %}
+  {%- if 'init' in grains and grains['init'] == 'unknown' %}
 
   # If Salt is unable to detect init system running in the scope of state run,
   # probably we are trying to bake a container/VM image with PostgreSQL.

salter.sh

@@ -514,7 +514,7 @@ developer-definitions() {
     fork['uri']="https://github.com"
     fork['entity']="noelmcloughlin"
     fork['branch']="fixes"
-    fork['solutions']="salter packages-formula golang-formula postgres-formula"
+    fork['solutions']="salter packages-formula golang-formula postgres-formula salt-formula"
 }
 
 solution-definitions() {