Skip to content
This repository has been archived by the owner on May 23, 2020. It is now read-only.

Avoid conflicts with zabbix_version var #77

Merged
merged 5 commits into from
Feb 4, 2020
Merged

Avoid conflicts with zabbix_version var #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d04cf5
galaxy_install_info added to .gitignore
santiagomr Dec 2, 2019
d681cf9
Merge branch 'master' of https://github.com/dj-wasabi/ansible-zabbix-web
santiagomr Jan 27, 2020
4f59612
add variable zabbix_web_version
Dec 23, 2019
b01c182
Merged .gitignore
santiagomr Jan 29, 2020
967966f
Update README.md
santiagomr Feb 4, 2020
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ __pycache__
.virtualenv
*.pyc
.vscode/
meta/.galaxy_install_info
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ See the following list of supported Operating Systems with the Zabbix releases.
* Scientific Linux 7.x
* Ubuntu 14.04, 16.04, 18.04
* Debian 8, 9

### Zabbix 4.0

* CentOS 7.x
Expand Down Expand Up @@ -158,7 +158,7 @@ The following is an overview of all available configuration defaults for this ro

### Overall Zabbix

* `zabbix_version`: This is the version of zabbix. Default: 4.2, Can be overridden to 4.0, 3.4, 3.2, 3.0, 2.4, or 2.2.
* `zabbix_web_version`: This is the version of zabbix. Default: 4.4, Can be overridden to 4.0, 3.4, 3.2, 3.0, 2.4, or 2.2. Previously the variable `zabbix_version` was used directly but it could cause [some inconvenience](https://github.com/dj-wasabi/ansible-zabbix-agent/pull/303). That variable is maintained by retrocompativility.
* `zabbix_repo_yum`: A list with Yum repository configuration.
* `zabbix_web_package_state`: Default: _present_. Can be overridden to "latest" to update packages when needed.

Expand All @@ -173,7 +173,7 @@ The following is an overview of all available configuration defaults for this ro
* `zabbix_apache_vhost_port`: On which port the Apache Virtual Host is available.
* `zabbix_apache_vhost_listen_ip`: On which interface the Apache Virtual Host is available.
* `zabbix_apache_can_connect_ldap`: True / False. Set SELinux boolean to allow httpd to connect to LDAP. Default is False.
* `zabbix_php_install`: True / False. Switch for extra install of packages for PHP, currently on for Debian/Ubuntu. Default is true.
* `zabbix_php_install`: True / False. Switch for extra install of packages for PHP, currently on for Debian/Ubuntu. Default is true.
* `zabbix_web_max_execution_time`:
* `zabbix_web_memory_limit`:
* `zabbix_web_post_max_size`:
Expand Down
3 changes: 2 additions & 1 deletion defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
# defaults file for zabbix-web

zabbix_version: 4.4
zabbix_web_version: 4.4
zabbix_version: "{{ zabbix_web_version }}"
zabbix_repo: zabbix
zabbix_web_package_state: present
zabbix_selinux: False
Expand Down