From 6455fd3d7a81087889cf532151a208e4ada69a58 Mon Sep 17 00:00:00 2001 From: Shiham Abdul Rahman Date: Mon, 12 Sep 2022 15:50:58 +0500 Subject: [PATCH] idk what i did now --- .gitignore | 2 + Dockerfile | 5 ++- configdir/etc/zabbix/web/zabbix.conf.php | 54 ++++++++++++++++++++++++ docker-compose.yml | 2 +- 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 .gitignore mode change 100644 => 100755 configdir/etc/zabbix/web/zabbix.conf.php diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..12dd1e2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +datadir/* + diff --git a/Dockerfile b/Dockerfile index 47d510e..10a12c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,10 @@ RUN apt upgrade -y COPY startservices.sh . RUN chmod +x startservices.sh -RUN rm /etc/nginx/sites-enabled/default +RUN rm -v /etc/nginx/sites-enabled/default +RUN rm -v /usr/share/zabbix/conf/zabbix.conf.php +RUN ln -sv /etc/zabbix/web/zabbix.conf.php /usr/share/zabbix/conf/zabbix.conf.php +RUN chmod 775 /usr/share/zabbix/conf/zabbix.conf.php RUN mkdir /run/php/ diff --git a/configdir/etc/zabbix/web/zabbix.conf.php b/configdir/etc/zabbix/web/zabbix.conf.php old mode 100644 new mode 100755 index e69de29..d93e21c --- a/configdir/etc/zabbix/web/zabbix.conf.php +++ b/configdir/etc/zabbix/web/zabbix.conf.php @@ -0,0 +1,54 @@ + 'http://localhost:9200', +// 'text' => 'http://localhost:9200' +//]; +// Value types stored in Elasticsearch. +//$HISTORY['types'] = ['uint', 'text']; + +// Used for SAML authentication. +// Uncomment to override the default paths to SP private key, SP and IdP X.509 certificates, and to set extra settings. +//$SSO['SP_KEY'] = 'conf/certs/sp.key'; +//$SSO['SP_CERT'] = 'conf/certs/sp.crt'; +//$SSO['IDP_CERT'] = 'conf/certs/idp.crt'; +//$SSO['SETTINGS'] = []; diff --git a/docker-compose.yml b/docker-compose.yml index ca8b4d5..5847922 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: - $PWD/configdir/etc/zabbix/zabbix_server.conf:/etc/zabbix/zabbix_server.conf - $PWD/configdir/etc/zabbix/nginx.conf:/etc/zabbix/nginx.conf - $PWD/configdir/etc/php/7.4/fpm/php-fpm.conf:/etc/php/7.4/fpm/php-fpm.conf -# - $PWD/configdir/etc/zabbix/web/zabbix.conf.php:/etc/zabbix/web/zabbix.conf.php + - $PWD/configdir/etc/zabbix/web/zabbix.conf.php:/etc/zabbix/web/zabbix.conf.php ports: - 8000:80 restart: always