Skip to content

Commit

Permalink
Merge pull request #1042 from jjnicola/new-url
Browse files Browse the repository at this point in the history
[9.0] New URL for feed download.
  • Loading branch information
mattmundell authored Apr 9, 2020
2 parents d04e7bc + 71a5969 commit bde4470
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Add a delay for re-requesting scan information via osp [#1009](https://github.com/greenbone/gvmd/pull/1009)
- Count only best OS matches for OS asset hosts [#1028](https://github.com/greenbone/gvmd/pull/1028)
- Clean up NVTs set to name in cleanup-result-nvts [#1038](https://github.com/greenbone/gvmd/pull/1038)
- New Community Feed download URL in sync tools [#1042](https://github.com/greenbone/gvmd/pull/1042)

### Fixed
- Consider results_trash when deleting users [#799](https://github.com/greenbone/gvmd/pull/799)
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
fi

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

0 comments on commit bde4470

Please sign in to comment.