Commit Graph

460 Commits

Author SHA1 Message Date
root
c8421dd575 Merge branch 'master' into trunk 2019-01-14 00:24:51 +02:00
root
47fccd88bc MIB path fix 2019-01-14 00:23:44 +02:00
root
0703f72f05 Merge branch 'master' into trunk 2019-01-14 00:13:03 +02:00
root
03a0139f1d MIB path fix 2019-01-14 00:11:40 +02:00
root
37beb4904e Merge branch 'master' into trunk 2019-01-13 03:23:09 +02:00
root
31340521c7 Added possibility to modify Zabbix Agent port number 2019-01-13 03:20:50 +02:00
root
da784b5db4 Added possibility to include additional JAR files for Zabbix Java Gateway 2019-01-13 03:11:11 +02:00
root
6465a70acc Merge branch 'master' into trunk 2019-01-13 02:22:21 +02:00
root
91a8d57873 Fixed multilang support on CentOS based images 2019-01-13 02:20:45 +02:00
root
3f30022956 Fixed multilang support on CentOS based images 2019-01-13 01:46:08 +02:00
root
782babee91 Merge branch 'master' into trunk 2019-01-13 01:16:19 +02:00
root
7cc5a15c92 Added curl to Appliance images 2019-01-13 01:14:00 +02:00
root
2bde2d04ad Merge branch 'master' into trunk 2019-01-13 00:50:33 +02:00
root
dd5b3a6174 Fixed PHP5 -> PHP7 2019-01-13 00:49:04 +02:00
root
fe900067cc Merge branch 'master' into trunk 2019-01-13 00:46:43 +02:00
root
1c814ad1f9 Fixed PHP5 -> PHP7 2019-01-13 00:45:11 +02:00
root
ef11ec0694 Merge branch 'master' into trunk 2019-01-13 00:26:01 +02:00
root
5c495624b3 Improve Appliance images. Possible to mount datadir 2019-01-13 00:22:49 +02:00
root
baddcb523c Improve Appliance images. Possible to mount datadir 2019-01-13 00:12:54 +02:00
root
5f7117097b Merge branch 'master' into trunk 2019-01-12 23:45:37 +02:00
root
854af68e9e Fix typos in docker-entrypoint.sh 2019-01-12 23:34:02 +02:00
root
f6cb17d97d Merge branch 'master' into trunk 2019-01-12 23:22:51 +02:00
root
5795897a3e Updated README information 2019-01-12 23:07:44 +02:00
root
07bd770154 Missing headers module for Apache on Ubuntu 2018-10-02 22:43:00 +05:00
Alexey Pustovalov
dd893c514c
Merge pull request #384 from zabbix/master
Master
2018-09-28 14:19:07 +03:00
root
805f1d294f Merge branch 'master' of https://github.com/zabbix/zabbix-docker 2018-09-28 14:17:52 +03:00
root
d813c8e3ba Updated Ubuntu SNMP MIBs directory 2018-09-28 14:17:05 +03:00
Alexey Pustovalov
3c4d6fb11c
Merge pull request #381 from zabbix/master
Master
2018-09-28 14:03:01 +03:00
Alexey Pustovalov
9721f5c9d5
Merge pull request #372 from v-zhuravlev/master
Added ping and traceroute to centos/ubuntu version of server
2018-09-28 14:02:06 +03:00
Alexey Pustovalov
8bbd31f16d
Merge pull request #378 from zabbix/master
Updated Apache config for non-SSL connections
2018-09-28 14:00:09 +03:00
root
9ab47299c1 Updated Apache config for non-SSL connections 2018-09-28 13:58:15 +03:00
Alexey Pustovalov
b31fd15e6d
Merge pull request #375 from zabbix/master
Fixed HTTPS on CentOS
2018-09-28 13:46:52 +03:00
root
ae8cd145b9 Fixed HTTPS on CentOS 2018-09-28 13:44:57 +03:00
v-zhuravlev
4cc23086fa removed redundant installation of fping/iksemel 2018-09-28 01:40:24 +03:00
v-zhuravlev
8a4defcf67 added ping and traceroute to centos/ubuntu version of server 2018-09-28 01:39:41 +03:00
Alexey Pustovalov
3b96a97391
Merge pull request #357 from zabbix/master
Fixed Apache SSL on CentOS
2018-08-15 12:26:02 +09:00
root
faee6eebe8 Fixed Apache SSL on CentOS 2018-08-15 12:24:39 +09:00
root
89e8995554 Fixed Zabbix agent on Ubuntu (bionic) 2018-08-14 11:03:02 +09:00
root
4c5fdc1b1b Fixed Zabbix agent on Ubuntu (bionic) 2018-08-14 11:01:00 +09:00
Alexey Pustovalov
25a917cee3
Merge pull request #349 from zabbix/master
Added max_input_vars param for PHP
2018-07-30 12:34:06 +09:00
root
67a750dcb0 Added max_input_vars param for PHP 2018-07-30 12:32:30 +09:00
Alexey Pustovalov
28f35b4a26
Merge pull request #346 from zabbix/master
Fixed issue with php-fpm sessions directory
2018-07-24 22:42:40 +09:00
Alexey Pustovalov
25ec7d9056 Fixed issue with php-fpm sessions directory 2018-07-24 22:40:31 +09:00
root
f0351b9444 Merge branch 'master' into trunk 2018-07-20 13:56:40 +09:00
root
0634b35a72 Fixed missing iksemel-dev in Epel repository 2018-07-20 13:55:20 +09:00
root
f4bb271f1c Updated Ubuntu to 18.04 (bionic) release 2018-07-20 12:56:36 +09:00
root
666242082d Updated Ubuntu to 18.04 (bionic) release 2018-07-20 12:52:59 +09:00
root
a8d3e59401 Updated Ubuntu to 18.04 (bionic) release 2018-07-20 12:16:54 +09:00
root
a37653be47 Updated Ubuntu to 18.04 (bionic) release 2018-07-20 11:23:08 +09:00
root
90b9592c94 Updated Ubuntu to 18.04 (bionic) release 2018-07-20 11:19:33 +09:00