Skip to content

update cerebro/prevent errors/add ldap auth #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Naugrimm wants to merge 7 commits into
base: master
Choose a base branch
from
Open

update cerebro/prevent errors/add ldap auth #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
04e96a2
Add option to skip verifying the archive hash
jeffrysleddens Apr 19, 2019
89cc8c9
skip_verify check for boolean instead of string
jeffrysleddens May 2, 2019
2f05bcc
New config options for ldap auth
jeffrysleddens May 2, 2019
c9d0639
dependencies for cerebro
jeffrysleddens May 2, 2019
b196490
prevent error if pillar data is not set
Naugrimm Jun 12, 2019
79a5436
prevent wrong encoding of dictionary
Naugrimm Jun 12, 2019
274646a
update default version
Naugrimm Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions cerebro/binaries.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion cerebro/config.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions cerebro/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cerebro:
# binaries
version: '0.6.5'
hash: 'e0fab203496c3216561070df0b2dbd90ade83dfa0dc2fb380a88369958dc1e28'
version: '0.8.3'
hash: 'fdda73f7d56c4ead29590a8b1567d0bbfc3b39c14d2b7bde75a440954e2f435b'
home: /opt/cerebro
# user
user: cerebro
Expand Down
2 changes: 1 addition & 1 deletion cerebro/service.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 6 additions & 2 deletions cerebro/templates/application.conf.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down