Skip to content

Commit

Permalink
Version 1.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
marcinbojko committed Sep 25, 2020
1 parent 2be88f7 commit e3a3638
Show file tree
Hide file tree
Showing 19 changed files with 916 additions and 25 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## Version 1.4.3 2020-09-25

* [CentOS] bump SystemCenter Agent to 1.0.3.1028
* [CentOS] bump Zabbix repository version to 4.4
* [CentOS] fixes in `provision.sh` script for CentOS7/CentOS8
* [Windows] upgrade `puppet-agent` package to version 5.5.21

## Version 1.4.2 2020-07-04

* [BREAKING CHANGE] added support for packer >= 1.6.0. This also means previous versions of packer are not supported anymore.
Expand Down
15 changes: 10 additions & 5 deletions extra/files/gen2-centos/provision.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#!/bin/bash

INSTALL_UPDATES=true
INSTALL_PUPPET=true
INSTALL_HYPERV=true
INSTALL_WEBMIN=true
INSTALL_ZABBIX=true
STAMP_FILE="/etc/packerinfo"

usage() { echo "Usage: $0 [-u <true|false> INSTALL_UPDATES ] [-p <true|false> INSTALL_PUPPET] [-w <true|false> INSTALL_WEBMIN] [-h <true|false> INSTALL_HYPERV] " 1>&2; }
usage() { echo "Usage: $0 [-u <true|false> INSTALL_UPDATES ] [-p <true|false> INSTALL_PUPPET] [-w <true|false> INSTALL_WEBMIN] [-h <true|false> INSTALL_HYPERV] [-z <true|false> INSTALL_ZABBIX]" 1>&2; }

while getopts :u:p:h:w: option
while getopts :u:p:h:w:z: option
do
case "${option}"
in
Expand Down Expand Up @@ -81,13 +82,17 @@ fi
# zabbix
if [ "$INSTALL_ZABBIX" == true ]; then
echo "Provisioning phase 2 - Zabbix agent"
# zabbix 4.2 repository
yum -y -e 0 install https://repo.zabbix.com/zabbix/4.2/rhel/7/x86_64/zabbix-release-4.2-2.el7.noarch.rpm
# zabbix 4.4 repository
yum -y -e 0 install https://repo.zabbix.com/zabbix/4.4/rhel/7/x86_64/zabbix-release-4.4-1.el7.noarch.rpm
yum-config-manager -y -q --disable zabbix-non-supported|grep -i "enabled ="
yum-config-manager -y -q --enable zabbix --setopt="zabbix.priority=20"|grep -i "enabled ="
yum -y -e 0 makecache fast
yum -y -e 0 install zabbix-agent
systemctl enable zabbix-agent
mkdir -p /etc/systemd/system/zabbix-agent.service.d
touch /etc/systemd/system/zabbix-agent.service.d/override.conf
printf "[Service]\nUser=root\nGroup=root\n" >/etc/systemd/system/zabbix-agent.service.d/override.conf
systemctl daemon-reload
else
echo "Provisioning phase 2 - skipping Zabbix agent"
fi
Expand Down Expand Up @@ -209,4 +214,4 @@ if [ -e $STAMP_FILE ]; then
fi
echo "creationDate: $(date +%Y-%m-%d_%H:%M)" >>$STAMP_FILE
echo "Provisioning phase 4 - Done"
echo "Provisioning done - all phases"
echo "Provisioning done - all phases"
Loading

0 comments on commit e3a3638

Please sign in to comment.