File tree Expand file tree Collapse file tree 8 files changed +64
-4
lines changed
test/integration/default/controls Expand file tree Collapse file tree 8 files changed +64
-4
lines changed Original file line number Diff line number Diff line change 4545 setting_dbsocket = '/var/run/mysqld/mysqld.sock'
4646 when 'fedora'
4747 server_file_group = 'zabbixsrv'
48+ when 'suse'
49+ setting_dbsocket = '/run/mysql/mysql.sock'
4850 end
4951
5052 # TODO: Conditional content to consider for inclusion below
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ include:
1212# Here we just add a requisite declaration to ensure correct order
1313extend:
1414 zabbix_agent_repo:
15- {% if salt[' grains.get' ](' os_family' ) == ' Debian' -% }
15+ {% if salt[' grains.get' ](' os_family' ) in [ ' Debian' , ' Suse ' ] -% }
1616 pkgrepo:
1717 - require_in:
1818 - pkg: zabbix- agent
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ include:
1212# Here we just add a requisite declaration to ensure correct order
1313extend:
1414 zabbix_frontend_repo:
15- {% if salt[' grains.get' ](' os_family' ) == ' Debian' -% }
15+ {% if salt[' grains.get' ](' os_family' ) in [ ' Debian' , ' Suse ' ] -% }
1616 pkgrepo:
1717 - require_in:
1818 - pkg: zabbix- frontend- php
Original file line number Diff line number Diff line change @@ -124,6 +124,52 @@ RedHat:
124124 pkgs :
125125 - MySQL-python
126126
127+ Suse :
128+ version_repo : 5.0
129+ user : zabbix
130+ group : zabbix
131+ shell : /sbin/nologin
132+ agent :
133+ pkgs :
134+ - zabbix-agent
135+ service : zabbix-agent
136+ config : /etc/zabbix/zabbix_agentd.conf
137+ pidfile : /run/zabbix/zabbix_agentd.pid
138+ logfile : /var/log/zabbix/zabbix_agentd.log
139+ includes :
140+ - /etc/zabbix/zabbix_agentd.d/*.conf
141+ server :
142+ pkgs :
143+ - zabbix-server-mysql
144+ service : zabbix-server
145+ config : /etc/zabbix/zabbix_server.conf
146+ dbsocket : /run/mysql/mysql.sock
147+ pidfile : /run/zabbix/zabbix_server.pid
148+ logfile : /var/log/zabbix/zabbix_server.log
149+ snmptrapperfile : /var/log/snmptrap/snmptrap.log
150+ fpinglocation : /usr/sbin/fping
151+ fping6location : /usr/sbin/fping
152+ frontend :
153+ pkgs :
154+ - zabbix-web-mysql
155+ config : /etc/zabbix/web/zabbix.conf.php
156+ proxy :
157+ pkgs :
158+ - zabbix-proxy-sqlite3
159+ service : zabbix-proxy
160+ config : /etc/zabbix/zabbix_proxy.conf
161+ dbname : /var/lib/zabbix/zabbix_proxy.db
162+ pidfile : /run/zabbix/zabbix_proxy.pid
163+ logfile : /var/log/zabbix/zabbix_proxy.log
164+ mysql :
165+ pkgs :
166+ - MySQL-python
167+ pgsql :
168+ pkgs :
169+ - postgresql
170+ sql_file : /usr/share/doc/packages/zabbix-server-pgsql/create.sql.gz
171+
172+
127173FreeBSD :
128174 version_repo : 2.2
129175 user : zabbix
Original file line number Diff line number Diff line change @@ -34,6 +34,8 @@ Amazon Linux AMI-2018: {}
3434
3535# os: SUSE
3636Leap-15 : {}
37+ SLES-15 : {}
38+ SLES-12 : {}
3739
3840# os: FreeBSD
3941FreeBSD-12 : {}
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ include:
1212# Here we just add a requisite declaration to ensure correct order
1313extend:
1414 zabbix_proxy_repo:
15- {% if salt[' grains.get' ](' os_family' ) == ' Debian' -% }
15+ {% if salt[' grains.get' ](' os_family' ) in [ ' Debian' , ' Suse ' ] -% }
1616 pkgrepo:
1717 - require_in:
1818 - pkg: zabbix- proxy
Original file line number Diff line number Diff line change 5353 - gpgcheck: 1
5454 - gpgkey: https:// repo.zabbix.com/ RPM - GPG - KEY - ZABBIX - 79EA5ED4
5555
56+ {%- elif salt[' grains.get' ](' os_family' ) == ' Suse' % }
57+ {{ id_prefix }}_repo:
58+ pkgrepo.managed:
59+ - name: zabbix
60+ - humanname: " Zabbix Official Repository"
61+ - baseurl: https:// repo.zabbix.com/ zabbix/ {{ zabbix.version_repo }}/ sles/ {{ grains[' osmajorrelease' ] }}/ x86_64/
62+ - gpgcheck: 1
63+ - gpgkey: https:// repo.zabbix.com/ zabbix/ {{ zabbix.version_repo }}/ sles/ {{ grains[' osmajorrelease' ] }}/ x86_64/ repodata/ repomd.xml.key
64+ - gpgautoimport: True
65+
5666{%- else % }
5767{{ id_prefix }}_repo: {}
5868{%- endif % }
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ include:
1212# Here we just add a requisite declaration to ensure correct order
1313extend:
1414 zabbix_server_repo:
15- {% if salt[' grains.get' ](' os_family' ) == ' Debian' -% }
15+ {% if salt[' grains.get' ](' os_family' ) in [ ' Debian' , ' Suse ' ] -% }
1616 pkgrepo:
1717 - require_in:
1818 - pkg: zabbix- server
You can’t perform that action at this time.
0 commit comments