Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop the old feed sync scripts #2350

Merged
merged 1 commit into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ endif (NOT CMAKE_BUILD_TYPE)

OPTION (ENABLE_COVERAGE "Enable support for coverage analysis" OFF)
OPTION (DEBUG_FUNCTION_NAMES "Print function names on entry and exit" OFF)
# the shell based scripts got replaced by https://github.com/greenbone/greenbone-feed-sync/
OPTION (INSTALL_OLD_SYNC_SCRIPTS "Install shell based feed sync scripts" OFF)
if (INSTALL_OLD_SYNC_SCRIPTS)
message (DEPRECATION "The version of greenbone-feed-sync included in gvmd is deprecated in favor of the newer Python version (https://github.com/greenbone/greenbone-feed-sync/) and will be removed in the next major version.")
endif (INSTALL_OLD_SYNC_SCRIPTS)

## Retrieve git revision (at configure time)
include (GetGit)
Expand Down Expand Up @@ -69,7 +64,7 @@ if (PROJECT_DEV_VERSION)
set (PROJECT_VERSION_SUFFIX "~dev${PROJECT_DEV_VERSION}")
endif (PROJECT_DEV_VERSION)

set (PROJECT_VERSION_STRING
set (PROJECT_VERSION_STRING
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_SUFFIX}${GIT_REVISION}")

## CPack configuration
Expand Down Expand Up @@ -276,9 +271,6 @@ configure_file (doc/example-gvm-manage-certs.conf.in doc/example-gvm-manage-cert
configure_file (VERSION.in VERSION)
configure_file (src/gvmd_log_conf.cmake_in src/gvmd_log.conf)
configure_file (src/schema_formats/XML/GMP.xml.in src/schema_formats/XML/GMP.xml @ONLY)
configure_file (tools/greenbone-feed-sync.in tools/greenbone-feed-sync @ONLY)
configure_file (tools/greenbone-scapdata-sync.in tools/greenbone-scapdata-sync @ONLY)
configure_file (tools/greenbone-certdata-sync.in tools/greenbone-certdata-sync @ONLY)
configure_file (tools/gvm-manage-certs.in tools/gvm-manage-certs @ONLY)

## Code coverage
Expand Down Expand Up @@ -436,23 +428,6 @@ install (FILES tools/cert_bund_getbyname.xsl tools/dfn_cert_getbyname.xsl
DESTINATION ${GVM_CERT_RES_DIR}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)

if (INSTALL_OLD_SYNC_SCRIPTS)
install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-feed-sync
DESTINATION ${SBINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync
DESTINATION ${SBINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync
DESTINATION ${SBINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
endif (INSTALL_OLD_SYNC_SCRIPTS)

install (FILES ${CMAKE_SOURCE_DIR}/tools/gvm-lsc-deb-creator
${CMAKE_SOURCE_DIR}/tools/gvm-lsc-exe-creator
${CMAKE_SOURCE_DIR}/tools/gvm-lsc-rpm-creator
Expand Down
30 changes: 3 additions & 27 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,33 +275,9 @@ The UUIDs of all created users can be found using
The `gvmd Data`, `SCAP` and `CERT` Feeds should be kept up-to-date by calling the
`greenbone-feed-sync` script regularly (e.g. via a cron entry).

There are currently two synchronization methods available: The older
shell-based one included in the gvmd repository and a newer Python-based one
that also handles the VT synchronization.

### Python-based sync tool

The currently recommended way of synchronizing the gvmd data feeds is the
Python tool "greenbone-feed-sync", which can be found at
https://github.com/greenbone/greenbone-feed-sync together with instruction
for its installation and usage.

When upgrading to the new synchronization tool, the old script should be
removed to avoid conflicts as both are named "greenbone-feed-sync".

### Legacy shell script

The legacy feed sync script is deprecated and will be removed in the next major
release of gvmd.

Therefore, installation of it is now disabled by default but can be enabled for
backward compatibility with the CMake option `-DINSTALL_OLD_SYNC_SCRIPTS=ON`.

The legacy script has to be run for each type of data:

greenbone-feed-sync --type GVMD_DATA
greenbone-feed-sync --type SCAP
greenbone-feed-sync --type CERT
The currently recommended way of synchronizing the feeds is the Python tool
**greenbone-feed-sync**, which can be found at [https://github.com/greenbone/greenbone-feed-sync](https://github.com/greenbone/greenbone-feed-sync)
together with instruction for its installation and usage.

Please note: The `CERT` feed sync depends on data provided by the `SCAP` feed
and should be called after syncing the latter.
Expand Down
24 changes: 0 additions & 24 deletions tools/greenbone-certdata-sync.in

This file was deleted.

Loading
Loading