File bind-replace-varrun-with-run.patch of Package bind.29919
Index: bind-9.16.6/bin/named/named.rst
===================================================================
--- bind-9.16.6.orig/bin/named/named.rst
+++ bind-9.16.6/bin/named/named.rst
@@ -225,7 +225,7 @@ Files
``/etc/named.conf``
The default configuration file.
-``/var/run/named/named.pid``
+``/run/named/named.pid``
The default process-id file.
See Also
Index: bind-9.16.6/bin/nsupdate/nsupdate.rst
===================================================================
--- bind-9.16.6.orig/bin/nsupdate/nsupdate.rst
+++ bind-9.16.6/bin/nsupdate/nsupdate.rst
@@ -104,7 +104,7 @@ Options
Local-host only mode. This sets the server address to localhost
(disabling the ``server`` so that the server address cannot be
overridden). Connections to the local server will use a TSIG key
- found in ``/var/run/named/session.key``, which is automatically
+ found in ``/run/named/session.key``, which is automatically
generated by ``named`` if any local master zone has set
``update-policy`` to ``local``. The location of this key file can be
overridden with the ``-k`` option.
@@ -342,7 +342,7 @@ Files
``/etc/resolv.conf``
used to identify default name server
-``/var/run/named/session.key``
+``/run/named/session.key``
sets the default TSIG key for use in local-only mode
``K{name}.+157.+{random}.key``
Index: bind-9.16.6/bin/tests/named.conf
===================================================================
--- bind-9.16.6.orig/bin/tests/named.conf
+++ bind-9.16.6/bin/tests/named.conf
@@ -41,7 +41,7 @@ options {
named-xfer "/usr/libexec/named-xfer"; // _PATH_XFER
dump-file "named_dump.db"; // _PATH_DUMPFILE
- pid-file "/var/run/named.pid"; // _PATH_PIDFILE
+ pid-file "/run/named.pid"; // _PATH_PIDFILE
statistics-file "named.stats"; // _PATH_STATS
memstatistics-file "named.memstats"; // _PATH_MEMSTATS
@@ -206,7 +206,7 @@ controls {
// 'inet' lines without a 'port' defaults to 'port 953'
// 'keys' must be used and the list must have at least one entry
inet * port 52 allow { any; } keys { "key2"; };
- unix "/var/run/ndc" perm 0600 owner 0 group 0; // ignored by named.
+ unix "/run/ndc" perm 0600 owner 0 group 0; // ignored by named.
inet 10.0.0.1 allow { any; key foo; } keys { "key4";};
inet 10.0.0.2 allow { none; } keys { "key-1"; "key-2"; };
inet 10.0.0.2 allow { none; };
Index: bind-9.16.6/bin/tests/system/dnstap/good-dnstap-in-options.conf
===================================================================
--- bind-9.16.6.orig/bin/tests/system/dnstap/good-dnstap-in-options.conf
+++ bind-9.16.6/bin/tests/system/dnstap/good-dnstap-in-options.conf
@@ -1,5 +1,5 @@
options {
- dnstap-output unix "/var/run/named/dnstap.sock";
+ dnstap-output unix "/run/named/dnstap.sock";
dnstap-identity hostname;
dnstap { client response; };
};
Index: bind-9.16.6/bin/tests/system/dnstap/good-dnstap-in-view.conf
===================================================================
--- bind-9.16.6.orig/bin/tests/system/dnstap/good-dnstap-in-view.conf
+++ bind-9.16.6/bin/tests/system/dnstap/good-dnstap-in-view.conf
@@ -1,5 +1,5 @@
options {
- dnstap-output unix "/var/run/named/dnstap.sock";
+ dnstap-output unix "/run/named/dnstap.sock";
dnstap-identity hostname;
};
Index: bind-9.16.6/contrib/dlz/modules/ldap/testing/slapd.conf
===================================================================
--- bind-9.16.6.orig/contrib/dlz/modules/ldap/testing/slapd.conf
+++ bind-9.16.6/contrib/dlz/modules/ldap/testing/slapd.conf
@@ -6,8 +6,8 @@ include /etc/ldap/schema/d
# these files hold the slapd process ID and program args when
# slapd is started.
-pidfile /var/run/slapd/slapd.pid
-argsfile /var/run/slapd/slapd.args
+pidfile /run/slapd/slapd.pid
+argsfile /run/slapd/slapd.args
modulepath /usr/lib/ldap
moduleload back_hdb
Index: bind-9.16.6/contrib/dnspriv/nginx.conf
===================================================================
--- bind-9.16.6.orig/contrib/dnspriv/nginx.conf
+++ bind-9.16.6/contrib/dnspriv/nginx.conf
@@ -11,7 +11,7 @@
# user bind bind;
worker_processes auto;
-pid /var/run/nginx.pid;
+pid /run/nginx.pid;
events {
worker_connections 1024;
Index: bind-9.16.6/contrib/scripts/nanny.pl
===================================================================
--- bind-9.16.6.orig/contrib/scripts/nanny.pl
+++ bind-9.16.6/contrib/scripts/nanny.pl
@@ -11,7 +11,7 @@
# A simple nanny to make sure named stays running.
-$pid_file_location = '/var/run/named.pid';
+$pid_file_location = '/run/named.pid';
$nameserver_location = 'localhost';
$dig_program = 'dig';
$named_program = 'named';
Index: bind-9.16.6/doc/arm/reference.rst
===================================================================
--- bind-9.16.6.orig/doc/arm/reference.rst
+++ bind-9.16.6/doc/arm/reference.rst
@@ -1205,7 +1205,7 @@ default is used.
``pid-file``
This is the pathname of the file the server writes its process ID in. If not
- specified, the default is ``/var/run/named/named.pid``. The PID file
+ specified, the default is ``/run/named/named.pid``. The PID file
is used by programs that send signals to the running name
server. Specifying ``pid-file none`` disables the use of a PID file;
no file is written and any existing one is removed. Note
@@ -1236,7 +1236,7 @@ default is used.
``session-keyfile``
This is the pathname of the file into which to write a TSIG session key
generated by ``named`` for use by ``nsupdate -l``. If not specified,
- the default is ``/var/run/named/session.key``. (See :ref:`dynamic_update_policies`,
+ the default is ``/run/named/session.key``. (See :ref:`dynamic_update_policies`,
and in particular the discussion of the ``update-policy`` statement's
``local`` option, for more information about this feature.)
@@ -5586,7 +5586,7 @@ A pre-defined ``update-policy`` rule can
generates a TSIG session key when starting and stores it in a file;
this key can then be used by local clients to update the zone while
``named`` is running. By default, the session key is stored in the file
-``/var/run/named/session.key``, the key name is "local-ddns", and the
+``/run/named/session.key``, the key name is "local-ddns", and the
key algorithm is HMAC-SHA256. These values are configurable with the
``session-keyfile``, ``session-keyname``, and ``session-keyalg`` options,
respectively. A client running on the local system, if run with
Index: bind-9.16.6/doc/man/named.8in
===================================================================
--- bind-9.16.6.orig/doc/man/named.8in
+++ bind-9.16.6/doc/man/named.8in
@@ -246,7 +246,7 @@ in the script used to start the \fBnamed
.B \fB/etc/named.conf\fP
The default configuration file.
.TP
-.B \fB/var/run/named/named.pid\fP
+.B \fB/run/named/named.pid\fP
The default process\-id file.
.UNINDENT
.SH SEE ALSO
Index: bind-9.16.6/doc/man/nsupdate.1in
===================================================================
--- bind-9.16.6.orig/doc/man/nsupdate.1in
+++ bind-9.16.6/doc/man/nsupdate.1in
@@ -104,7 +104,7 @@ the key specified is not an HMAC\-MD5 ke
Local\-host only mode. This sets the server address to localhost
(disabling the \fBserver\fP so that the server address cannot be
overridden). Connections to the local server will use a TSIG key
-found in \fB/var/run/named/session.key\fP, which is automatically
+found in \fB/run/named/session.key\fP, which is automatically
generated by \fBnamed\fP if any local master zone has set
\fBupdate\-policy\fP to \fBlocal\fP\&. The location of this key file can be
overridden with the \fB\-k\fP option.
@@ -352,7 +352,7 @@ DNSKEY and NSEC records.)
.B \fB/etc/resolv.conf\fP
used to identify default name server
.TP
-.B \fB/var/run/named/session.key\fP
+.B \fB/run/named/session.key\fP
sets the default TSIG key for use in local\-only mode
.TP
.B \fBK{name}.+157.+{random}.key\fP
