diff --git a/cerebro/binaries.sls b/cerebro/binaries.sls index 246f0e0..11dd8b3 100644 --- a/cerebro/binaries.sls +++ b/cerebro/binaries.sls @@ -1,13 +1,24 @@ {% from 'cerebro/map.jinja' import cerebro with context %} +cerebro_dependencies: + pkg.installed: + - pkgs: + - default-jre-headless + cerebro_binaries: archive.extracted: - name: {{ cerebro.home }} - if_missing: {{ cerebro.home }} - source: https://github.com/lmenezes/cerebro/releases/download/v{{ cerebro.version }}/cerebro-{{ cerebro.version }}.tgz +{% if salt['pillar.get']("cerebro:skip_verify", False) == True %} + - skip_verify: True +{% else %} - source_hash: {{ cerebro.hash }} +{% endif %} - archive_format: tar - options: '--strip=1' - enforce_toplevel: False - user: {{ cerebro.user }} - group: {{ cerebro.group }} + - require: + - pkg: cerebro_dependencies diff --git a/cerebro/config.sls b/cerebro/config.sls index 0dd80ce..0042e57 100644 --- a/cerebro/config.sls +++ b/cerebro/config.sls @@ -6,7 +6,7 @@ config_cerebro: - source: salt://cerebro/templates/application.conf.jinja - template: jinja - context: - cerebro: {{ cerebro }} + cerebro: {{ cerebro|json }} - user: {{ cerebro.user }} - group: {{ cerebro.group }} - mode: 0755 diff --git a/cerebro/defaults.yaml b/cerebro/defaults.yaml index 8447062..ee16e33 100644 --- a/cerebro/defaults.yaml +++ b/cerebro/defaults.yaml @@ -1,7 +1,7 @@ cerebro: # binaries - version: '0.6.5' - hash: 'e0fab203496c3216561070df0b2dbd90ade83dfa0dc2fb380a88369958dc1e28' + version: '0.8.3' + hash: 'fdda73f7d56c4ead29590a8b1567d0bbfc3b39c14d2b7bde75a440954e2f435b' home: /opt/cerebro # user user: cerebro diff --git a/cerebro/service.sls b/cerebro/service.sls index 2fb48e2..121c66d 100644 --- a/cerebro/service.sls +++ b/cerebro/service.sls @@ -6,7 +6,7 @@ cerebro_systemd_unit: - source: salt://cerebro/templates/cerebro.service.jinja - template: jinja - context: - cerebro: {{ cerebro }} + cerebro: {{ cerebro|json }} module.run: - name: service.systemctl_reload - onchanges: diff --git a/cerebro/templates/application.conf.jinja b/cerebro/templates/application.conf.jinja index f978344..d570430 100644 --- a/cerebro/templates/application.conf.jinja +++ b/cerebro/templates/application.conf.jinja @@ -26,9 +26,13 @@ auth = { type: ldap settings: { url = "{{ cerebro.auth_ldap.url }}" - base-dn = "{{ cerebro.auth_ldap.base-dn }}" + base-dn = "{{ cerebro.auth_ldap.base_dn }}" method = "{{ cerebro.auth_ldap.method }}" - user-doman = "{{ cerebro.auth_ldap.user-domain }}" + user-template = "{{ cerebro.auth_ldap.user_template }}" + bind-dn = "{{ cerebro.auth_ldap.bind_dn }}" + bind-pw = "{{ cerebro.auth_ldap.bind_pw }}" + group-search { + } } {%- endif %} {%- endif %}