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

Commit

Permalink
Merge pull request #172 from UdelaRInterior/zabbix-versions
Browse files Browse the repository at this point in the history
Avoid conflicts with zabbix_version var
  • Loading branch information
dj-wasabi authored Feb 4, 2020
2 parents 89909aa + 53f839d commit c153c0e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ __pycache__
.virtualenv
requirements.txt
.vscode/
meta/.galaxy_install_info
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ See the following list of supported Operating systems with the Zabbix releases:

Installing this role is very simple: `ansible-galaxy install dj-wasabi.zabbix-server`

Please be aware that this role only installs the Zabbix Server and not the Zabbix Web. If you do want to have a Zabbix Web, please execute the following command: `ansible-galaxy install dj-wasabi.zabbix-web`
Please be aware that this role only installs the Zabbix Server and not the Zabbix Web. If you do want to have a Zabbix Web, please execute the following command: `ansible-galaxy install dj-wasabi.zabbix-web`

Default username/password for the Zabbix Web interface is the default one installed by Zabbix.

Expand All @@ -170,13 +170,13 @@ The following is an overview of all available configuration default for this rol

### Overall Zabbix

* `zabbix_version`: This is the version of zabbix. Default: 3.4. Can be overridden to 3.2, 3.0, 2.4, or 2.2.
* `zabbix_server_version`: This is the version of zabbix. Default: 4.4. Can be overridden to 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_repo`: Default: _zabbix_
* _epel_ install agent from EPEL repo
* _zabbix_ (default) install agent from Zabbix repo
* _other_ install agent from pre-existing or other repo
* `zabbix_server_package_state`: Default: _present_. Can be overridden to "latest" to update packages when needed.
* `zabbix_server_package_state`: Default: _present_. Can be overridden to "latest" to update packages when needed.

### Zabbix Server

Expand Down
3 changes: 2 additions & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
# defaults file;
# zabbix role specific

zabbix_version: 4.4
zabbix_server_version: 4.4
zabbix_version: "{{ zabbix_server_version }}"
zabbix_repo: zabbix

zabbix_server_package_state: present
Expand Down

0 comments on commit c153c0e

Please sign in to comment.