Enhance httpd spec include #3977
Merged
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
xiangce
reviewed
Dec 15, 2023
insights/specs/default.py
Outdated
| # "/etc/httpd/conf.d/*/*.conf", | ||
| # "/etc/httpd/conf.modules.d/*.conf" | ||
| # ] | ||
| # ) | ||
| httpd_conf_scl_httpd24 = glob_file( |
There was a problem hiding this comment.
Better update the httpd_conf_scl_httpd24 and httpd_conf_scl_jbcs_httpd24 as well.
xiangce
requested changes
Dec 20, 2023
insights/specs/datasources/httpd.py
Outdated
| with open(conf) as cfp: | ||
| _includes = None | ||
| for line in cfp.readlines()[::-1]: | ||
| if ("Include" in line or "IncludeOptional" in line) and (line.strip().startswith("Include") or line.strip().startswith("IncludeOptional")): |
There was a problem hiding this comment.
If startswith is must-be-checked, better only keep it in the condition, since the in is overlapped by startswith
line = line.strip()
if line.startswith(("Include, "IncludeOptional")): # --> it seems `line.startswith("Include")`: is enough, right?
insights/specs/datasources/httpd.py
Outdated
| for line in cfp.readlines()[::-1]: | ||
| if "ServerRoot" in line and line.strip().startswith("ServerRoot"): | ||
| server_root = line.strip().split()[-1].strip().strip('"\'') | ||
| elif ("Include" in line or "IncludeOptional" in line) and (line.strip().startswith("Include") or line.strip().startswith("IncludeOptional")): |
There was a problem hiding this comment.
The same comment as above.
insights/specs/datasources/httpd.py
Outdated
| # Add it only when it exists | ||
| all_paths.add(main_httpd_conf) | ||
| for line in cfp.readlines()[::-1]: | ||
| if "ServerRoot" in line and line.strip().startswith("ServerRoot"): |
There was a problem hiding this comment.
The same comment as above
line = line.strip()
if line.startswith("ServerRoot"):
| server_root = line.strip().split()[-1].strip().strip('"\'') | ||
| elif ("Include" in line or "IncludeOptional" in line) and (line.strip().startswith("Include") or line.strip().startswith("IncludeOptional")): | ||
| includes = line.strip().split()[-1].strip('"\'') | ||
| all_paths.update(_get_all_include_conf(server_root, includes)) |
There was a problem hiding this comment.
Would you mind adding a comment about, e.g.: For multiple "Include" directives, all of them will be included
insights/specs/datasources/httpd.py
Outdated
| _paths.add(conf) | ||
| with open(conf) as cfp: | ||
| _includes = None | ||
| for line in cfp.readlines()[::-1]: |
There was a problem hiding this comment.
If all multiple "Include" directives will be included, the [::-1] operation is not required, please remove it.
insights/specs/datasources/httpd.py
Outdated
| _paths.add(conf) | ||
| with open(conf) as cfp: | ||
| _includes = None | ||
| for line in cfp.readlines()[::-1]: |
There was a problem hiding this comment.
If all multiple "Include" directives will be included, the [::-1] operation is not required, please remove it.
xiangce
approved these changes
Dec 25, 2023
Signed-off-by: jiazhang <[email protected]>
Signed-off-by: jiazhang <[email protected]>
Signed-off-by: jiazhang <[email protected]>
Signed-off-by: jiazhang <[email protected]>
Signed-off-by: jiazhang <[email protected]>
Signed-off-by: jiazhang <[email protected]>
xiangce
pushed a commit
that referenced
this pull request
Jan 4, 2024
Signed-off-by: jiazhang <[email protected]> (cherry picked from commit 3d3eefe)
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.
All Pull Requests:
Check all that apply:
Complete Description of Additions/Changes:
This PR is used to enhance httpd_conf spec so that it can handle
Includesituation.