Updated Ubuntu images

web-nginx-pgsql/centos/docker-entrypoint.sh

@@ -237,12 +237,6 @@ prepare_zbx_web_config() {
 
     ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
 
-    if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then
-        rm -f "/usr/share/zabbix/conf/zabbix.conf.php"
-    fi
-
-    ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php"
-
     PHP_CONFIG_FILE="/etc/php-fpm.d/zabbix.conf"
 
     update_config_var "$PHP_CONFIG_FILE" "php_value[max_execution_time]" "${ZBX_MAXEXECUTIONTIME:-"600"}"

web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf

@@ -1,10 +1,10 @@
-user www-data;
+#user nginx;
 worker_processes 5;
-#worker_rlimit_nofile 256000;
+worker_rlimit_nofile 256000;
 
-error_log /dev/fd/2 warn;
+error_log /dev/fd/2 error;
 
-pid        /var/run/nginx.pid;
+pid        /tmp/nginx.pid;
 
 events {
     worker_connections 5120;
@@ -21,6 +21,13 @@ http {
                     '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log /dev/fd/1 main;
+    error_log /dev/fd/2 error;
+
+    client_body_temp_path /tmp/client_body 1 2;
+    proxy_temp_path /tmp/proxy 1 2;
+    fastcgi_temp_path /tmp/fastcgi 1 2;
+    uwsgi_temp_path /tmp/uwsgi 1 2;
+    scgi_temp_path /tmp/scgi 1 2;
 
     client_body_timeout             5m;
     send_timeout                    5m;

web-nginx-pgsql/ubuntu/conf/etc/supervisor/supervisord.conf

@@ -1,17 +1,17 @@
 ; supervisor config file
 
 [unix_http_server]
-file = /var/run/supervisor.sock   ; (the path to the socket file)
+file = /tmp/supervisor.sock        ; (the path to the socket file)
 chmod = 0700                       ; sockef file mode (default 0700)
 username = zbx
 password = password
 
 [supervisord]
 logfile = /dev/stdout                        ; (main log file;default $CWD/supervisord.log)
-pidfile = /var/run/supervisord.pid           ; (supervisord pidfile;default supervisord.pid)
+pidfile = /tmp/supervisord.pid               ; (supervisord pidfile;default supervisord.pid)
 childlogdir = /tmp                           ; ('AUTO' child log dir, default $TEMP)
 critical = critical
-user = root
+;user = zabbix
 logfile_maxbytes = 0
 logfile_backupcount = 0
 loglevel = info
@@ -23,7 +23,7 @@ loglevel = info
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
-serverurl = unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl = unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
 ; The [include] section can just contain the "files" setting.  This
 ; setting can list multiple files (separated by whitespace or

web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf

@@ -1,5 +1,5 @@
 server {
-    listen          80;
+    listen          8080;
     server_name     zabbix;
     index           index.php;
 

web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf

@@ -1,5 +1,5 @@
 server {
-    listen          443 ssl http2;
+    listen          8443 ssl http2;
     server_name     zabbix;
     server_name_in_redirect off;