Skip to content
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.

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

Fix/276 move package variables to defaults #326

Merged
merged 2 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions roles/icinga2/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
icinga2_packages: ["icinga2"]
icinga2_state: started
icinga2_enabled: true
icinga2_confd: true
Expand Down
2 changes: 1 addition & 1 deletion roles/icinga2/tasks/install_on_Debian.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Apt - install package icinga2
ansible.builtin.apt:
pkg: "{{ icinga2_packages }}"
pkg: "{{ icinga2_packages + icinga2_packages_dependencies }}"
state: present
4 changes: 2 additions & 2 deletions roles/icinga2/tasks/install_on_RedHat.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- name: Yum - install package icinga2
ansible.builtin.yum:
name: "{{ icinga2_packages }}"
name: "{{ icinga2_packages + icinga2_packages_dependencies }}"
state: present

- name: Yum - install package icinga2-selinux
ansible.builtin.yum:
name: icinga2-selinux
Expand Down
2 changes: 1 addition & 1 deletion roles/icinga2/tasks/install_on_Suse.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: Zypper - install package icinga2
community.general.zypper:
name: "{{ icinga2_packages }}"
name: "{{ icinga2_packages + icinga2_packages_dependencies }}"
state: present

- name: Zypper - install package icinga2-selinux
Expand Down
2 changes: 1 addition & 1 deletion roles/icinga2/vars/Debian.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
icinga2_packages: ["icinga2"]
icinga2_packages_dependencies: []
icinga2_user: nagios
icinga2_group: nagios
icinga2_config_path: /etc/icinga2
Expand Down
2 changes: 1 addition & 1 deletion roles/icinga2/vars/RedHat.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
icinga2_packages: ["icinga2"]
icinga2_packages_dependencies: []
icinga2_user: icinga
icinga2_group: icinga
icinga2_config_path: /etc/icinga2
Expand Down
2 changes: 1 addition & 1 deletion roles/icinga2/vars/Suse-12.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
icinga2_packages: ["icinga2","libboost_regex1_54_0"]
icinga2_packages_dependencies: ["libboost_regex1_54_0"]
icinga2_user: icinga
icinga2_group: icinga
icinga2_config_path: /etc/icinga2
Expand Down
2 changes: 1 addition & 1 deletion roles/icinga2/vars/Suse.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
icinga2_packages: ["icinga2","libboost_regex1_66_0"]
icinga2_packages_dependencies: ["libboost_regex1_66_0"]
icinga2_user: icinga
icinga2_group: icinga
icinga2_config_path: /etc/icinga2
Expand Down
3 changes: 3 additions & 0 deletions roles/icingaweb2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Workaround Missing README

Issue: https://github.com/ansible/galaxy/issues/2438
1 change: 1 addition & 0 deletions roles/icingaweb2/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
icingaweb2_packages: ["icingaweb2", "icingacli"]
icingaweb2_config_dir: /etc/icingaweb2
icingaweb2_group: icingaweb2
icingaweb2_modules_config_dir: "{{ icingaweb2_config_dir }}/modules"
Expand Down
2 changes: 1 addition & 1 deletion roles/icingaweb2/tasks/install_on_debian.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- name: Debian - Install Icinga Web 2 packages
ansible.builtin.apt:
name: "{{ icingaweb2_packages }}"
name: "{{ icingaweb2_packages + icingaweb2_packages_dependencies }}"
state: present
update_cache: True
2 changes: 1 addition & 1 deletion roles/icingaweb2/tasks/install_on_redhat.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: RedHat - Install Icinga Web 2 packages
ansible.builtin.yum:
name: "{{ icingaweb2_packages }}"
name: "{{ icingaweb2_packages + icingaweb2_packages_dependencies }}"
state: present
2 changes: 1 addition & 1 deletion roles/icingaweb2/tasks/install_on_suse.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Suse - Install Icinga Web 2 packages
community.general.zypper:
name: "{{ icingaweb2_packages }}"
name: "{{ icingaweb2_packages + icingaweb2_packages_dependencies }}"
state: present
2 changes: 1 addition & 1 deletion roles/icingaweb2/vars/debian-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
icingaweb2_httpd_user: www-data
icingaweb2_fragments_path: /var/tmp/icingaweb
icingaweb2_packages: ["icingaweb2","icingacli","libapache2-mod-php"]
icingaweb2_packages_dependencies: ["libapache2-mod-php"]
2 changes: 1 addition & 1 deletion roles/icingaweb2/vars/debian.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
icingaweb2_httpd_user: www-data
icingaweb2_fragments_path: /var/tmp/icingaweb
icingaweb2_packages: ["icingaweb2", "icingacli"]
icingaweb2_packages_dependencies: []
2 changes: 1 addition & 1 deletion roles/icingaweb2/vars/redhat.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
icingaweb2_httpd_user: apache
icingaweb2_fragments_path: /var/tmp/icingaweb
icingaweb2_packages: ["icingaweb2", "icingacli", "icingaweb2-selinux"]
icingaweb2_packages_dependencies: ["icingaweb2-selinux"]
2 changes: 1 addition & 1 deletion roles/icingaweb2/vars/suse.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
icingaweb2_httpd_user: wwwrun
icingaweb2_fragments_path: /var/tmp/icingaweb
icingaweb2_packages: ["icingaweb2", "icingacli"]
icingaweb2_packages_dependencies: []