Merge pull request #300 from jle35/require/pkgrepo

fix(upstream): require_in/require use_upstream

Author: sticky-note

postgres/server/init.sls

@@ -20,8 +20,6 @@ postgresql-server:
     - pkgs: {{ pkgs | json }}
 {%- if postgres.use_upstream_repo == true %}
     - refresh: True
-    - require:
-      - pkgrepo: postgresql-repo
 {%- endif %}
   {%- if postgres.fromrepo %}
     - fromrepo: {{ postgres.fromrepo }}

postgres/upstream.sls

@@ -28,6 +28,8 @@ postgresql-repo:
     {{- format_kwargs(postgres.pkg_repo) }}
     - require:
       - pkg: postgresql-pkg-deps
+    - require_in:
+      - pkg: postgresql-server
 
   {%- else -%}