From 19d212e5dc2cf4812be13aaaa321054bf58d5211 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sun, 18 Dec 2016 12:59:10 +0100 Subject: [PATCH] committing changes in /etc after apt run Package changes: -apt 1.0.9.8.3 -apt-utils 1.0.9.8.3 +apt 1.0.9.8.4 +apt-utils 1.0.9.8.4 -libapt-inst1.5 1.0.9.8.3 -libapt-pkg4.12 1.0.9.8.3 +libapt-inst1.5 1.0.9.8.4 +libapt-pkg4.12 1.0.9.8.4 -php5-cli 5.6.27+dfsg-0+deb8u1 -php5-common 5.6.27+dfsg-0+deb8u1 -php5-curl 5.6.27+dfsg-0+deb8u1 -php5-fpm 5.6.27+dfsg-0+deb8u1 -php5-gd 5.6.27+dfsg-0+deb8u1 -php5-intl 5.6.27+dfsg-0+deb8u1 +php5-cli 5.6.29+dfsg-0+deb8u1 +php5-common 5.6.29+dfsg-0+deb8u1 +php5-curl 5.6.29+dfsg-0+deb8u1 +php5-fpm 5.6.29+dfsg-0+deb8u1 +php5-gd 5.6.29+dfsg-0+deb8u1 +php5-intl 5.6.29+dfsg-0+deb8u1 -php5-mcrypt 5.6.27+dfsg-0+deb8u1 -php5-mysql 5.6.27+dfsg-0+deb8u1 +php5-mcrypt 5.6.29+dfsg-0+deb8u1 +php5-mysql 5.6.29+dfsg-0+deb8u1 -salt-common 2016.11.0+ds-1 -salt-minion 2016.11.0+ds-1 +salt-common 2016.11.1+ds-1 +salt-minion 2016.11.1+ds-1 --- php5/cli/php.ini | 28 ++++++++++++++++++++++++++++ salt/minion | 9 +++++++++ 2 files changed, 37 insertions(+) diff --git a/php5/cli/php.ini b/php5/cli/php.ini index 8124e6e..5d0ea44 100644 --- a/php5/cli/php.ini +++ b/php5/cli/php.ini @@ -1208,6 +1208,19 @@ mysqlnd.collect_statistics = On ; http://php.net/mysqlnd.collect_memory_statistics mysqlnd.collect_memory_statistics = Off +; Records communication from all extensions using mysqlnd to the specified log +; file. +; http://php.net/mysqlnd.debug +;mysqlnd.debug = + +; Defines which queries will be logged. +; http://php.net/mysqlnd.log_mask +;mysqlnd.log_mask = 0 + +; Default size of the mysqlnd memory pool, which is used by result sets. +; http://php.net/mysqlnd.mempool_default_size +;mysqlnd.mempool_default_size = 16000 + ; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. ; http://php.net/mysqlnd.net_cmd_buffer_size ;mysqlnd.net_cmd_buffer_size = 2048 @@ -1217,6 +1230,15 @@ mysqlnd.collect_memory_statistics = Off ; http://php.net/mysqlnd.net_read_buffer_size ;mysqlnd.net_read_buffer_size = 32768 +; Timeout for network requests in seconds. +; http://php.net/mysqlnd.net_read_timeout +;mysqlnd.net_read_timeout = 31536000 + +; SHA-256 Authentication Plugin related. File with the MySQL server public RSA +; key. +; http://php.net/mysqlnd.sha256_server_public_key +;mysqlnd.sha256_server_public_key = + [OCI8] ; Connection: Enables privileged connections using external @@ -1932,6 +1954,12 @@ ldap.max_links = -1 ; Useful for internal debugging only. ;opcache.protect_memory=0 +; Validate cached file permissions. +; opcache.validate_permission=0 + +; Prevent name collisions in chroot'ed environment. +; opcache.validate_root=0 + [curl] ; A default value for the CURLOPT_CAINFO option. This is required to be an ; absolute path. diff --git a/salt/minion b/salt/minion index ad7a374..35b48a7 100644 --- a/salt/minion +++ b/salt/minion @@ -633,6 +633,15 @@ # "salt-key -f master.pub" on the Salt master. #master_finger: '' +# Use TLS/SSL encrypted connection between master and minion. +# Can be set to a dictionary containing keyword arguments corresponding to Python's +# 'ssl.wrap_socket' method. +# Default is None. +#ssl: +# keyfile: +# certfile: +# ssl_version: PROTOCOL_TLSv1_2 + ###### Thread settings ##### ########################################### -- 2.39.5