From dca3a2ffe82e79567398295ba1729b67112e34b3 Mon Sep 17 00:00:00 2001
From: "Adrien \"ze\" Urban" <aur@nbs-system.com>
Date: Wed, 2 Oct 2019 10:46:16 +0000
Subject: [PATCH 1/2] logstash-javapkg: give a unique id

Allow more specific dependencies when multiple states try to install the same
package.
---
 logstash/init.sls | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/logstash/init.sls b/logstash/init.sls
index 4411e19..bbeb0d9 100644
--- a/logstash/init.sls
+++ b/logstash/init.sls
@@ -11,11 +11,12 @@ logstash-pkg:
     {%- if logstash.use_upstream_repo %}
     - require:
       - pkgrepo: logstash-repo
-      - pkg: {{ logstash.java }}
+      - pkg: logstash-javapkg
     {%- endif %}
 
-{{ logstash.java }}:
-  pkg.installed
+logstash-javapkg:
+  pkg.installed:
+  - name: {{ logstash.java }}
 
 # This gets around a user permissions bug with the logstash user/group
 # being able to read /var/log/syslog, even if the group is properly set for

From 62963c92f49086e61b11391b14ecd24ffc63121a Mon Sep 17 00:00:00 2001
From: "Adrien \"ze\" Urban" <aur@nbs-system.com>
Date: Wed, 2 Oct 2019 10:48:08 +0000
Subject: [PATCH 2/2] package: logstash-javapkg dependency

Installation is not conditional, depedency shouldn't either.
---
 logstash/init.sls | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/logstash/init.sls b/logstash/init.sls
index bbeb0d9..1184b1d 100644
--- a/logstash/init.sls
+++ b/logstash/init.sls
@@ -8,11 +8,11 @@ include:
 logstash-pkg:
   pkg.{{logstash.pkgstate}}:
     - name: {{logstash.pkg}}
-    {%- if logstash.use_upstream_repo %}
     - require:
-      - pkgrepo: logstash-repo
       - pkg: logstash-javapkg
-    {%- endif %}
+      {%- if logstash.use_upstream_repo %}
+      - pkgrepo: logstash-repo
+      {%- endif %}
 
 logstash-javapkg:
   pkg.installed: