diff options
| author | Daniel Pinto <danielpinto52@gmail.com> | 2020-06-03 22:09:42 +0100 |
|---|---|---|
| committer | Daniel Pinto <danielpinto52@gmail.com> | 2020-07-15 22:01:08 +0100 |
| commit | 34fa2c4d0d8117b75c5c52a7c825486eb0284ae0 (patch) | |
| tree | 572264180e98fe572d16a42d44f3b60fd4e9f52a /src/config | |
| parent | a7226ca06e20356abb057c29416a9ad969c8d29d (diff) | |
| download | tor-34fa2c4d0d8117b75c5c52a7c825486eb0284ae0.tar.gz tor-34fa2c4d0d8117b75c5c52a7c825486eb0284ae0.zip | |
Add support for patterns on %include #25140
Also adds generic tor_glob function to expand globs.
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/torrc.sample.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 51e1c3af4b..0690cbb931 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -242,11 +242,12 @@ #PublishServerDescriptor 0 ## Configuration options can be imported from files or folders using the %include -## option with the value being a path. If the path is a file, the options from the -## file will be parsed as if they were written where the %include option is. If -## the path is a folder, all files on that folder will be parsed following lexical -## order. Files starting with a dot are ignored. Files on subfolders are ignored. +## option with the value being a path. This path can have wildcards. Wildcards are +## expanded first, using lexical order. Then, for each matching file or folder, the following +## rules are followed: if the path is a file, the options from the file will be parsed as if +## they were written where the %include option is. If the path is a folder, all files on that +## folder will be parsed following lexical order. Files starting with a dot are ignored. Files +## on subfolders are ignored. ## The %include option can be used recursively. -#%include /etc/torrc.d/ -#%include /etc/torrc.custom +#%include /etc/torrc.d/*.conf |