Skip to content

Commit f967b96

Browse files
committed
Merge branch 'cherry-pick-c4216930' into 'master_8.1.x'
CP V8.1 - Story #14814: Add Rocky Linux 9 support. Story #14814: Add Rocky Linux 9 support. Unofficial support for testing or development purposes. See merge request vitam/vitam!10674 & vitam/vitam!10678 (cherry picked from commit c421693) ebf0172 Story #14814: Add Rocky Linux 9 support. 320bdee Story #14558: Clean Code for Rocky support. Co-authored-by: Julien Georges <julien.georges@culture.gouv.fr> See merge request vitam/vitam!10675
2 parents 941c629 + c2a54d1 commit f967b96

File tree

29 files changed

+154
-154
lines changed

29 files changed

+154
-154
lines changed

deployment/ansible-vitam-exploitation/roles/checks/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131

3232
- import_tasks: check_crypto_policies.yml
3333
when:
34-
- ansible_distribution == "AlmaLinux"
34+
- ansible_os_family in ['RedHat', 'Rocky']
3535
- inventory_hostname in groups['hosts_mongodb_data'] or inventory_hostname in groups['hosts_mongodb_offer']

deployment/ansible-vitam-exploitation/roles/cleaning_offers/tasks/purge_swift.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
- name: Update CA truststore
8080
command: update-ca-trust
8181

82-
when: ansible_os_family == "RedHat"
82+
when: ansible_os_family in ['RedHat', 'Rocky']
8383

8484
- name: List swift buckets for {{ vitam_prefix_offer|default(vitam_site_name) }}
8585
shell: swift --insecure list --prefix {{ vitam_prefix_offer|default(vitam_site_name) }};

deployment/ansible-vitam-extra/roles/bootstrap_repo/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
notify:
4444
- purge yum cache
4545

46-
when: ansible_os_family == "RedHat"
46+
when: ansible_os_family in ['RedHat', 'Rocky']
4747

4848
- block:
4949

deployment/ansible-vitam-extra/roles/ihm-recette-clone-tests/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
until: result is succeeded
2020
delay: "{{ packages_install_retries_delay }}"
2121

22-
when: ansible_os_family == "RedHat"
22+
when: ansible_os_family in ['RedHat', 'Rocky']
2323

2424
- block:
2525

deployment/ansible-vitam-extra/roles/openldap_server/tasks/configure_ldap.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
src: ldap
3333
dest: "/etc/sysconfig/ldap"
3434
mode: 0755
35-
when: openldap_server_enable_ssl and ansible_os_family == 'RedHat'
35+
when: openldap_server_enable_ssl and ansible_os_family in ['RedHat', 'Rocky']
3636
notify:
3737
- restart slapd
3838

deployment/ansible-vitam-extra/roles/openldap_server/tasks/install_ldap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
until: result is succeeded
1313
delay: "{{ packages_install_retries_delay }}"
1414
with_items: "{{ openldap_server_pkgs }}"
15-
when: ansible_os_family == 'RedHat'
15+
when: ansible_os_family in ['RedHat', 'Rocky']
1616

1717
- name: Install the OpenLDAP and required packages for Debian/Ubuntu
1818
apt:
@@ -40,7 +40,7 @@
4040
template:
4141
src: slapd.conf.j2
4242
dest: "{{ openldap_server_app_path }}/slapd.conf"
43-
when: ansible_os_family == "RedHat"
43+
when: ansible_os_family in ['RedHat', 'Rocky']
4444
notify:
4545
- restart slapd
4646

deployment/ansible-vitam-extra/roles/openldap_server/templates/ldap.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ URI ldap://localhost
1818
#TIMELIMIT 15
1919
#DEREF never
2020
TLS_CACERTDIR /etc/openldap/cacerts
21-
{% if ansible_os_family == 'RedHat' %}
21+
{% if ansible_os_family in ['RedHat', 'Rocky'] %}
2222
TLS_CACERT /etc/openldap/certs/cert.crt
2323
{% endif %}
2424
{% if ansible_os_family == 'Debian' %}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
openldap_server_pkgs:
2+
- openldap-servers
3+
- openldap-clients
4+
- libselinux-python
5+
- openssl
6+
- python-ldap
7+
8+
openldap_server_app_path: "/etc/openldap/"
9+
openldap_server_user: ldap
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
3+
libpcap_pkg: libpcap

deployment/ansible-vitam-extra/roles/reverse/handlers/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Best way to do that is to use openssl rsa but after it the certificate headers are missing
55
# We should investigate more on this subject as sed should not be used for that...
66
- name: extract certificate
7-
shell: "openssl pkcs12 -nodes -in /etc/{{ apache_service }}/certs/keystore_client_{{ vitam_site_name }}.p12 {{ '-provider legacy' if ansible_distribution == 'AlmaLinux' else '-legacy' }} -passin pass:'{{ keystores.client_external.reverse }}' -out /etc/{{ apache_service }}/certs/keystore_client_{{ vitam_site_name }}.pem && sed -i 's/ PRIVATE KEY/ RSA PRIVATE KEY/g' /etc/{{ apache_service }}/certs/keystore_client_{{ vitam_site_name }}.pem"
7+
shell: "openssl pkcs12 -nodes -in /etc/{{ apache_service }}/certs/keystore_client_{{ vitam_site_name }}.p12 {{ '-provider legacy' if ansible_distribution in ['AlmaLinux', 'Rocky'] else '-legacy' }} -passin pass:'{{ keystores.client_external.reverse }}' -out /etc/{{ apache_service }}/certs/keystore_client_{{ vitam_site_name }}.pem && sed -i 's/ PRIVATE KEY/ RSA PRIVATE KEY/g' /etc/{{ apache_service }}/certs/keystore_client_{{ vitam_site_name }}.pem"
88

99
- name: set certificate attributes
1010
file:

0 commit comments

Comments
 (0)