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

New URL for feed download. #982

Merged
merged 4 commits into from
Feb 17, 2020
Merged
Show file tree
Hide file tree
Changes from 3 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Force NVT update in migrate_219_to_220 [#895](https://github.com/greenbone/gvmd/pull/895)
- Use temp tables to speed up migrate_213_to_214 [#911](https://github.com/greenbone/gvmd/pull/911)
- Allow "Start Task" alert method for SecInfo events [#960](https://github.com/greenbone/gvmd/pull/960)
- New Community Feed download URL in sync tools [#982](https://github.com/greenbone/gvmd/pull/982)

### Fixed
- Add NULL check in nvts_feed_version_epoch [#768](https://github.com/greenbone/gvmd/pull/768)
Expand Down
6 changes: 3 additions & 3 deletions tools/greenbone-certdata-sync.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2011-2018 Greenbone Networks GmbH
# Copyright (C) 2011-2020 Greenbone Networks GmbH
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
Expand Down Expand Up @@ -135,9 +135,9 @@ else
fi

if [ -z "$COMMUNITY_CERT_RSYNC_FEED" ]; then
COMMUNITY_CERT_RSYNC_FEED=rsync://feed.openvas.org:/cert-data
COMMUNITY_CERT_RSYNC_FEED=rsync://feed.community.greenbone.net:/cert-data
# An alternative syntax which might work if the above doesn't:
# COMMUNITY_CERT_RSYNC_FEED=rsync@feed.openvas.org::cert-data
# COMMUNITY_CERT_RSYNC_FEED=rsync@feed.community.greenbone.net::cert-data
fi

fi
Expand Down
10 changes: 5 additions & 5 deletions tools/greenbone-scapdata-sync.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2011-2018 Greenbone Networks GmbH
# Copyright (C) 2011-2020 Greenbone Networks GmbH
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
Expand Down Expand Up @@ -139,9 +139,9 @@ else
fi

if [ -z "$COMMUNITY_SCAP_RSYNC_FEED" ]; then
COMMUNITY_SCAP_RSYNC_FEED=rsync://feed.openvas.org:/scap-data
COMMUNITY_SCAP_RSYNC_FEED=rsync://feed.community.greenbone.net:/scap-data
# An alternative syntax which might work if the above doesn't:
# COMMUNITY_SCAP_RSYNC_FEED=rsync@feed.openvas.org::scap-data
# COMMUNITY_SCAP_RSYNC_FEED=rsync@feed.community.greenbone.net::scap-data
fi

fi
Expand Down Expand Up @@ -354,9 +354,9 @@ do_help () {

do_rsync_community_feed () {
if [ -z "$COMMUNITY_SCAP_RSYNC_FEED" ]; then
COMMUNITY_SCAP_RSYNC_FEED=rsync://feed.openvas.org:/scap-data
COMMUNITY_SCAP_RSYNC_FEED=rsync://feed.community.greenbone.net:/scap-data
# An alternative syntax which might work if the above doesn't:
# COMMUNITY_SCAP_RSYNC_FEED=rsync@feed.openvas.org::scap-data
# COMMUNITY_SCAP_RSYNC_FEED=rsync@feed.communiy.greenbone.net::scap-data
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# COMMUNITY_SCAP_RSYNC_FEED=rsync@feed.communiy.greenbone.net::scap-data
# COMMUNITY_SCAP_RSYNC_FEED=rsync@feed.community.greenbone.net::scap-data

fi

if [ -z "$RSYNC" ]; then
Expand Down