Combine sync scripts and add GVMd data sync #1155
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
This changes the CERT and SCAP sync scripts so they are essentially the same except for the feed names, URLs and paths. Also, some initializations have been moved around so they can be run after parsing the arguments so a type argument can be added to the generic script later.
The sync script will fetch all the gvmd content from the feed, not just the current version, because the gvmd feed directory also includes the timestamp, sha256sums and signature.
This script handles both SCAP and CERT feed syncs.
The date now is only written to the lockfile if the flock was successful.
This allows downloading the data objects feed automatically and also moves the directory so the rsync cannot delete other gvmd data.
The sync specifically fetches the data objects for gvmd not all, so the feed is renamed accordingly.
To remove duplicated code, the scripts greenbone-certdata-sync and greenbone-scapdata-sync scripts now just call greenbone-gvmd-feed-sync.
2 tasks
The type GVMD_DATA was missing.
mattmundell
approved these changes
Jun 29, 2020
2 tasks
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.
This PR combines the sync scripts into one generic one to reduce the amount of duplicated code and adds a way to sync the gvmd data objects (configs, port lists and report formats).
The data objects feed directory is also moved to avoid conflicts with other gvmd data like imported report formats or gnupg keys.
Checklist: