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
-libapache2-mod-php5 5.6.27+dfsg-0+deb8u1
+libapache2-mod-php5 5.6.29+dfsg-0+deb8u1
-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
-php-pear 5.6.27+dfsg-0+deb8u1
+php-pear 5.6.29+dfsg-0+deb8u1
-php5-cli 5.6.27+dfsg-0+deb8u1
-php5-common 5.6.27+dfsg-0+deb8u1
-php5-gd 5.6.27+dfsg-0+deb8u1
+php5-cli 5.6.29+dfsg-0+deb8u1
+php5-common 5.6.29+dfsg-0+deb8u1
+php5-gd 5.6.29+dfsg-0+deb8u1
-php5-mcrypt 5.6.27+dfsg-0+deb8u1
-php5-mysql 5.6.27+dfsg-0+deb8u1
-php5-readline 5.6.27+dfsg-0+deb8u1
+php5-mcrypt 5.6.29+dfsg-0+deb8u1
+php5-mysql 5.6.29+dfsg-0+deb8u1
+php5-readline 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

diff --git a/pear/pear.conf b/pear/pear.conf
index b077a692a8fd9ef03f9c094867da5cbbde698cb5..28b6f5cb0c8163132214358aa1f755fabfa707ac 100644 (file)
--- a/pear/pear.conf
+++ b/pear/pear.conf
@@ -1,2 +1,2 @@
 #PEAR_Config 0.9
-a:31:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:14:"/usr/share/php";s:7:"ext_dir";s:22:"/usr/lib/php5/20131226";s:7:"doc_dir";s:18:"/usr/share/php/doc";s:7:"bin_dir";s:8:"/usr/bin";s:8:"data_dir";s:19:"/usr/share/php/data";s:7:"cfg_dir";s:18:"/usr/share/php/cfg";s:7:"www_dir";s:21:"/usr/share/php/htdocs";s:8:"test_dir";s:19:"/usr/share/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:43:"/build/php5-5.6.27+dfsg/pear-build-download";s:7:"php_bin";s:12:"/usr/bin/php";s:10:"php_prefix";s:0:"";s:10:"php_suffix";s:0:"";s:7:"php_ini";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:12:"/usr/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:18:"/etc/pear/pearkeys";}
\ No newline at end of file
+a:31:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:14:"/usr/share/php";s:7:"ext_dir";s:22:"/usr/lib/php5/20131226";s:7:"doc_dir";s:18:"/usr/share/php/doc";s:7:"bin_dir";s:8:"/usr/bin";s:8:"data_dir";s:19:"/usr/share/php/data";s:7:"cfg_dir";s:18:"/usr/share/php/cfg";s:7:"www_dir";s:21:"/usr/share/php/htdocs";s:8:"test_dir";s:19:"/usr/share/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:43:"/build/php5-5.6.29+dfsg/pear-build-download";s:7:"php_bin";s:12:"/usr/bin/php";s:10:"php_prefix";s:0:"";s:10:"php_suffix";s:0:"";s:7:"php_ini";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:12:"/usr/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:18:"/etc/pear/pearkeys";}
\ No newline at end of file

diff --git a/php5/apache2/php.ini b/php5/apache2/php.ini
index a49a55950161a806320c309e13c0835425e2f7a4..fec9d2e22e139f9f914edede61e0632e2f21a4bf 100644 (file)
--- a/php5/apache2/php.ini
+++ b/php5/apache2/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/php5/cli/php.ini b/php5/cli/php.ini
index 8124e6e9dfc1d4bb3681b9efd80ccec6d332c204..5d0ea44fb39dcc17bdfd785cbf1b9836cefc07a6 100644 (file)
--- 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 ad7a3749e61ec6be66becfedb03121cf9a1cdedd..35b48a7c1551fc477a3cecb218c91d4cf875bb33 100644 (file)
--- 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: <path_to_keyfile>
+#    certfile: <path_to_certfile>
+#    ssl_version: PROTOCOL_TLSv1_2
+
 
 ######         Thread settings        #####
 ###########################################