Skip to content

Commit 9744617

Browse files
Merge pull request #200 from tribe29/revert-199-feature-new-pass-hashing
Revert "Add support for new password hashing algorithm to agent role"
2 parents ed00484 + f0893df commit 9744617

File tree

3 files changed

+3
-62
lines changed

3 files changed

+3
-62
lines changed

changelogs/fragments/new-passwd-hashing.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

roles/server/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ checkmk_server_server_stable_os:
1111
- RedHat-8
1212

1313
checkmk_server_edition: cre
14-
checkmk_server_version: 2.1.0p17
14+
checkmk_server_version: 2.1.0p13
1515
checkmk_server_verify_setup: 'true'
1616

1717
checkmk_server_download_user: []

roles/server/tasks/sites.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
tags:
8282
- destroy-sites
8383

84-
- name: "Update Site Admin Password for Checkmk < 2.1."
84+
- name: "Update Site Admin Password."
8585
become: true
8686
ansible.builtin.shell: |
8787
set -o pipefail
@@ -90,21 +90,6 @@
9090
executable: /bin/bash
9191
no_log: true
9292
loop: "{{ checkmk_server_sites }}"
93-
when: (item.state != "absent") and (item.version | regex_replace('p.*', '') is version('2.1', '<'))
94-
tags:
95-
- set-site-admin-pw
96-
97-
# In the future this should be done with 'cmk-passwd' available from 2.1.0p16 (https://checkmk.com/werk/14389)
98-
# To keep things simple, we do it in a more generic way here, which works in all 2.1 releases
99-
- name: "Update Site Admin Password for Checkmk >= 2.1."
100-
become: true
101-
ansible.builtin.shell: |
102-
set -o pipefail
103-
echo '{{ item.admin_pw }}' | htpasswd -i -B -C 12 /omd/sites/{{ item.name }}/etc/htpasswd cmkadmin
104-
args:
105-
executable: /bin/bash
106-
no_log: true
107-
loop: "{{ checkmk_server_sites }}"
108-
when: (item.state != "absent") and (item.version | regex_replace('p.*', '') is version('2.1', '>='))
93+
when: item.state != "absent"
10994
tags:
11095
- set-site-admin-pw

0 commit comments

Comments
 (0)