Add conf.d support #88
Open
+435
−367
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LaakkonenJussi
force-pushed
the
jb61966
branch
3 times, most recently
from
6613f0e to
b7608d1
Compare
[util] Add conf.d support for connmand and vpnd. JB#61966 Add support for reading and processing of additional configuration files. Util is best suited for both daemons to avoid adding more internal dependencies to vpnd. The files are saved into the list with the full path if it is given as a parameter. Callback can be omitted for only getting the list of configuration files with the desired suffix in the given directory. Callback gets the full path of the config file for convenience.
[main] Support main.conf.d/ files for overriding configs. JB#61966 Use the util conf.d support to read additional configs. The values in these additional configs will override any existing configuration set in the main.conf or any previous conf.d files.
[vpn-settings] Add callback for processing configs Reformat init to allow processing of separate config files with a separate callback for the conf.d support.
[vpn] Use util conf.d to read additional configs. JB#61966
LaakkonenJussi
force-pushed
the
jb61966
branch
2 times, most recently
from
b5cdb27 to
a472224
Compare
[firewall-iptables] Read additional firewall configs with conf.d support. JB#61966 Read the configurations when starting and reloading the firewall. When starting read the files into a list and process each with the callback. When reloading use the internal processing of files to first check which files are added and removed and then process the content accordingly.
The config change made the device specific rules to be loaded differently (correctly), so these needed to be adapted into the tests. Also the access failure on g_dir_open() needed to be reported back as a proper error from the test stub.
LaakkonenJussi
force-pushed
the
jb61966
branch
from
a472224 to
69ce9d2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.