diff --git a/logstash/init.sls b/logstash/init.sls index 830b69c..10cbeda 100644 --- a/logstash/init.sls +++ b/logstash/init.sls @@ -1,13 +1,17 @@ {%- from 'logstash/map.jinja' import logstash with context %} +{% if logstash.install_pkg_src %} include: - .repo +{% endif %} logstash-pkg: pkg.{{logstash.pkgstate}}: - name: {{logstash.pkg}} + {% if logstash.install_pkg_src %} - require: - pkgrepo: logstash-repo + {% endif %} # 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 diff --git a/logstash/map.jinja b/logstash/map.jinja index 9fcd65a..187a8a8 100644 --- a/logstash/map.jinja +++ b/logstash/map.jinja @@ -1,11 +1,13 @@ {% set logstash = salt['grains.filter_by']({ 'Debian': { + 'install_pkg_src': True, 'pkg': 'logstash', 'svc': 'logstash', 'pkgstate': 'latest', 'indent': 4 }, 'RedHat': { + 'install_pkg_src': True, 'pkg': 'logstash', 'svc': 'logstash', 'pkgstate': 'latest',