Skip to content

Commit

Permalink
Revert to 2d02c87
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel Joos committed Aug 30, 2024
1 parent e21b607 commit eb4a754
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 39 deletions.
30 changes: 0 additions & 30 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,40 +30,10 @@ jobs:
tag: "latest"
- image: "debian"
tag: "bullseye"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0c684ef44136c4eee7cbdb074fedf7f75574b1d2
- image: "debian"
tag: "buster"
- image: "enterpriselinux"
tag: "8"
- image: "enterpriselinux"
tag: "latest"
<<<<<<< HEAD
>>>>>>> bf7ea27 (chore(ci): update fedora versions (#2))
=======
>>>>>>> 0c684ef44136c4eee7cbdb074fedf7f75574b1d2
- image: "fedora"
tag: "38"
- image: "fedora"
tag: "39"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0c684ef44136c4eee7cbdb074fedf7f75574b1d2
# TODO no packages for fedora 40 yet: https://download.bareos.org/current/
# pipeline will fail for now. replace 38 as soon as 40 is ready and working.
- image: "fedora"
tag: "latest"
- image: "ubuntu"
tag: "latest"
<<<<<<< HEAD
>>>>>>> bf7ea27 (chore(ci): update fedora versions (#2))
=======
>>>>>>> 0c684ef44136c4eee7cbdb074fedf7f75574b1d2
- image: "ubuntu"
tag: "focal"
- image: "ubuntu"
Expand Down
18 changes: 9 additions & 9 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- name: Import assert.yml
ansible.builtin.import_tasks:
file: assert.yml
run_once: true
run_once: yes
delegate_to: localhost

- name: Install requirements
Expand Down Expand Up @@ -67,16 +67,16 @@
- name: Place TLS certificates
ansible.builtin.copy:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
dest: "{{ item.dst }}"
owner: bareos
group: bareos
mode: "0640"
backup: true
backup: "{{ bareos_dir_backup_configurations }}"
loop:
- src: "{{ bareos_webui_tls_ca_cert_src }}"
dest: "{{ bareos_webui_tls_ca_cert_dest }}"
- src: "{{ bareos_webui_tls_cert_chain_src }}"
dest: "{{ bareos_webui_tls_cert_chain_dest }}"
- src: bareos_webui_tls_ca_cert_src
dest: bareos_webui_tls_ca_cert_dest
- src: bareos_webui_tls_cert_chain_src
dest: bareos_webui_tls_cert_chain_dest
when:
- bareos_webui_tls_enable
- bareos_webui_tls_ca_cert_src != ""
Expand All @@ -85,8 +85,8 @@
- name: Set SELinux boolean httpd_can_network_connect
ansible.posix.seboolean:
name: httpd_can_network_connect
state: true
persistent: true
state: yes
persistent: yes
when:
- ansible_selinux.status is defined
- ansible_selinux.status == "enabled"
Expand Down

0 comments on commit eb4a754

Please sign in to comment.