diff options
| author | Daniel Pinto <danielpinto52@gmail.com> | 2017-05-18 23:44:16 +0100 |
|---|---|---|
| committer | Daniel Pinto <danielpinto52@gmail.com> | 2017-05-18 23:44:16 +0100 |
| commit | ba3a5f82f11388237a3ba4995ddf0b6ffaaf492a (patch) | |
| tree | c0cf4342524cd040e24fe9cc420bb70e21c0a9d5 /src/config/torrc.sample.in | |
| parent | ec6b2bbf9bb561e34f9fbe6663d1eb691604348d (diff) | |
| download | tor-ba3a5f82f11388237a3ba4995ddf0b6ffaaf492a.tar.gz tor-ba3a5f82f11388237a3ba4995ddf0b6ffaaf492a.zip | |
Add support for %include funcionality on torrc #1922
config_get_lines is now split into two functions:
- config_get_lines which is the same as before we had %include
- config_get_lines_include which actually processes %include
Diffstat (limited to 'src/config/torrc.sample.in')
| -rw-r--r-- | src/config/torrc.sample.in | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 37777443ac..8f3597f3f6 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -209,3 +209,12 @@ ## address manually to your friends, uncomment this line: #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. +## The %include option can be used recursively. +#%include /etc/torrc.d/ +#%include /etc/torrc.custom + |