123 -The default for \(dq\&use chroot\(dq\& is true, and is the safer choice (especially |
123 -The default for \(dq\&use chroot\(dq\& is true, and is the safer choice (especially |
124 +The default for "use chroot" is true, and is the safer choice (especially |
124 +The default for "use chroot" is true, and is the safer choice (especially |
125 if the module is not read\-only). |
125 if the module is not read\-only). |
126 .IP |
126 .IP |
127 When this parameter is enabled, rsync will not attempt to map users and groups |
127 When this parameter is enabled, rsync will not attempt to map users and groups |
128 @@ -231,12 +231,12 @@ |
128 --- Originals/rsyncd.conf.5 2016-07-13 16:09:42.215845487 -0700 |
129 used by these library functions (traditionally /etc/passwd and |
129 +++ rsync-3.1.2/rsyncd.conf.5 2016-07-13 16:53:18.177437237 -0700 |
130 /etc/group, but perhaps additional dynamic libraries as well). |
130 @@ -222,12 +222,12 @@ |
131 .IP |
131 being enabled (disabling name lookups). See below for what a chroot needs in |
132 -If you copy the necessary resources into the module\(cq\&s chroot area, you |
132 order for name lookups to succeed. |
|
133 .IP |
|
134 -If you copy library resources into the module\(cq\&s chroot area, you |
133 -should protect them through your OS\(cq\&s normal user/group or ACL settings (to |
135 -should protect them through your OS\(cq\&s normal user/group or ACL settings (to |
134 -prevent the rsync module\(cq\&s user from being able to change them), and then |
136 -prevent the rsync module\(cq\&s user from being able to change them), and then |
135 -hide them from the user\(cq\&s view via \(dq\&exclude\(dq\& (see how in the discussion of |
137 -hide them from the user\(cq\&s view via \(dq\&exclude\(dq\& (see how in the discussion of |
136 +If you copy the necessary resources into the module's chroot area, you |
138 +If you copy library resources into the module's chroot area, you |
137 +should protect them through your OS's normal user/group or ACL settings (to |
139 +should protect them through your OS's normal user/group or ACL settings (to |
138 +prevent the rsync module's user from being able to change them), and then |
140 +prevent the rsync module's user from being able to change them), and then |
139 +hide them from the user's view via "exclude" (see how in the discussion of |
141 +hide them from the user's view via "exclude" (see how in the discussion of |
140 that parameter). At that point it will be safe to enable the mapping of users |
142 that parameter). At that point it will be safe to enable the mapping of users |
141 -and groups by name using the \(dq\&numeric ids\(dq\& daemon parameter (see below). |
143 -and groups by name using this \(dq\&numeric ids\(dq\& daemon parameter. |
142 +and groups by name using the "numeric ids" daemon parameter (see below). |
144 +and groups by name using this "numeric ids" daemon parameter. |
143 .IP |
145 .IP |
144 Note also that you are free to setup custom user/group information in the |
146 Note also that you are free to setup custom user/group information in the |
145 chroot area that is different from your normal system. For example, you |
147 chroot area that is different from your normal system. For example, you |
146 @@ -250,7 +250,7 @@ |
148 @@ -250,7 +250,7 @@ |
147 the \fB\-\-numeric\-ids\fP command\-line option. By default, this parameter is |
149 the \fB\-\-numeric\-ids\fP command\-line option. By default, this parameter is |
796 +directory named "rsyncd.d" with the files "foo.conf", "bar.conf", and |
798 +directory named "rsyncd.d" with the files "foo.conf", "bar.conf", and |
797 +"baz.conf" inside it, this directive: |
799 +"baz.conf" inside it, this directive: |
798 .PP |
800 .PP |
799 .nf |
801 .nf |
800 &include /path/rsyncd.d |
802 &include /path/rsyncd.d |
|
803 --- Originals/rsyncd.conf.5 2016-07-21 14:55:35.736602459 -0700 |
|
804 +++ rsync-3.1.2/rsyncd.conf.5 2016-07-21 14:57:35.408104081 -0700 |
|
805 @@ -85,7 +85,7 @@ |
|
806 .PP |
|
807 The first parameters in the file (before a [module] header) are the |
|
808 global parameters. |
|
809 -Rsync also allows for the use of a \(dq\&[global]\(dq\& module name to indicate the |
|
810 +Rsync also allows for the use of a "global" module name to indicate the |
|
811 start of one or more global\-parameter sections (the name must be lower case). |
|
812 .PP |
|
813 You may also include any module parameters in the global part of the |
|
814 @@ -155,7 +155,7 @@ |
|
815 name contains whitespace, each internal sequence of whitespace will be |
|
816 changed into a single space, while leading or trailing whitespace will be |
|
817 discarded. |
|
818 -Also, the name cannot be \(dq\&global\(dq\& as that exact name indicates that |
|
819 +Also, the name cannot be "global" as that exact name indicates that |
|
820 global parameters follow (see above). |
|
821 .PP |
|
822 As with GLOBAL PARAMETERS, you may use references to environment variables in |
|
823 @@ -218,7 +218,7 @@ |
|
824 The default for "use chroot" is true, and is the safer choice (especially |
|
825 if the module is not read\-only). |
|
826 .IP |
|
827 -When this parameter is enabled, the \(dq\&numeric\-ids\(dq\& option will also default to |
|
828 +When this parameter is enabled, the "numeric-ids" option will also default to |
|
829 being enabled (disabling name lookups). See below for what a chroot needs in |
|
830 order for name lookups to succeed. |
|
831 .IP |
|
832 @@ -241,7 +241,7 @@ |
|
833 the \fB\-\-numeric\-ids\fP command\-line option. By default, this parameter is |
|
834 enabled for chroot modules and disabled for non\-chroot modules. |
|
835 Also keep in mind that uid/gid preservation requires the module to be |
|
836 -running as root (see \(dq\&uid\(dq\&) or for \(dq\&fake super\(dq\& to be configured. |
|
837 +running as root (see "uid") or for "fake super" to be configured. |
|
838 .IP |
|
839 A chroot\-enabled module should not have this parameter enabled unless you've |
|
840 taken steps to ensure that the module has the necessary resources it needs |
|
841 |