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

Refactor zabbix web #1235

Merged
merged 23 commits into from
Jun 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4efc621
Single common task to install zabbix-web
eb4x Mar 26, 2024
f22855e
Remove mysql install tasks
eb4x May 8, 2024
e17762b
Improve when condition logic for os_family
eb4x May 8, 2024
f2ccb55
Swap out remi for appstream php:8.0/common
eb4x May 8, 2024
873f5ea
Make it clear tasks are a workaround
eb4x May 18, 2024
614d61a
Remove zabbix 5.0 related task
eb4x May 18, 2024
85ed950
Remove tasks and checks guarding against EL7
eb4x May 18, 2024
b5986ee
Move delegated_dbhost to first block
eb4x May 24, 2024
e2b4e79
Bump mysql container image, add workarounds
eb4x May 24, 2024
c3deb66
Increase similarity in init-mysql between roles
eb4x May 24, 2024
c56cf4e
Provide the default port for database servers
eb4x May 25, 2024
25e7480
Remove unused zabbix_selinux_dependencies
eb4x May 25, 2024
12173d9
Group selinux booleans, and apply regardless
eb4x May 25, 2024
bece271
Install selinux packages regardless
eb4x May 25, 2024
a86fb55
RedHat: zabbix_web_php_dependencies goes unused
eb4x May 8, 2024
3cb8643
Single task for installing zabbix-apache-conf
eb4x Jun 9, 2024
3e1036b
Single task for installing zabbix-nginx-conf
eb4x Jun 9, 2024
3d8e0ac
Move installation of debian php deps
eb4x Jun 9, 2024
542f21f
Move installation of debian php-pgsql
eb4x Jun 9, 2024
780c9c7
RedHat: Remove zabbix-{{ ..._http_server }}-conf
eb4x Jun 9, 2024
99dd628
zabbix_underscore_version goes unused
eb4x Jun 9, 2024
0d9a25d
Remove useless when conditions and notifies
eb4x Jun 10, 2024
8859729
Merge branch 'main' into refactor_zabbix_web
pyrodie18 Jun 11, 2024
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
Prev Previous commit
Next Next commit
Move installation of debian php-pgsql
There is a corresponding php-mysql package, and we might aswell
make sure that is installed based on zabbix_server_database.
  • Loading branch information
eb4x committed Jun 9, 2024
commit 542f21f3048161dd23b570c83ad1cdc85da3e46a
18 changes: 0 additions & 18 deletions roles/zabbix_web/tasks/Debian.yml
Original file line number Diff line number Diff line change
@@ -4,21 +4,3 @@
zabbix_underscore_version: "{{ zabbix_web_version | regex_replace('\\.', '_') }}"
tags:
- always

- name: "Debian | Install PgSQL Dependencies"
ansible.builtin.apt:
pkg: "php{{ zabbix_web_php_installed_version }}-pgsql"
state: "present"
update_cache: true
cache_valid_time: 0
environment:
http_proxy: "{{ zabbix_http_proxy | default(None) | default(omit) }}"
https_proxy: "{{ zabbix_https_proxy | default(None) | default(omit) }}"
register: zabbix_web_php_dependencies_install
until: zabbix_web_php_dependencies_install is succeeded
become: true
when: zabbix_server_database == 'pgsql'
tags:
- install
- dependencies
- database
2 changes: 2 additions & 0 deletions roles/zabbix_web/tasks/apache.yml
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@
become: true
tags:
- install
- dependencies
- database

- name: "Apache | Get Apache version"
ansible.builtin.shell: |
4 changes: 3 additions & 1 deletion roles/zabbix_web/vars/Debian.yml
Original file line number Diff line number Diff line change
@@ -48,6 +48,8 @@ _zabbix_web_apache_packages:
- zabbix-apache-conf
_zabbix_web_apache_php_dependencies:
- "libapache2-mod-php{{ zabbix_web_php_installed_version }}"
- "php{{ zabbix_web_php_installed_version }}-{{ zabbix_server_database }}"
_zabbix_web_nginx_packages:
- zabbix-nginx-conf
_zabbix_web_nginx_php_dependencies: []
_zabbix_web_nginx_php_dependencies:
- "php{{ zabbix_web_php_installed_version }}-{{ zabbix_server_database }}"