Skip to content

Commit

Permalink
DEP: remove deprecated database update scripts
Browse files Browse the repository at this point in the history
The deprecated shell scripts
- `update-asn-data`
- `update-geoip-data`
- `update-tor-nodes`
- `update-rfiprisk-data`
have been removed in favor of the built-in update-mechanisms (see the bots' documentation). A crontab file for calling all new update command can be found in `contrib/cron-jobs/intelmq-update-database`.

#1404
  • Loading branch information
Sebastian Wagner authored and Wagner committed Jun 21, 2021
1 parent 8fc3bc4 commit 282b4a0
Show file tree
Hide file tree
Showing 15 changed files with 14 additions and 48 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@ Update allowed classification fields to 2020-01-28 version (#1409, #1476).
### Contrib
- eventdb:
- Added `separate-raws-table.sql` (PR#1985 by Sebastian Wagner).
- cron-jobs: Removed the deprecated update scripts (PR#1997 by Sebastian Wagner, #1404):
- `update-asn-data`
- `update-geoip-data`
- `update-tor-nodes`
- `update-rfiprisk-data`
in favor of the built-in update-mechanisms (see the bots' documentation). A crontab file for calling all new update command can be found in `contrib/cron-jobs/intelmq-update-database`.

### Known issues
- ParserBot: erroneous raw line recovery in error handling (#1850).
Expand Down
8 changes: 8 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ IntelMQ now uses YAML for the runtime configuration and therefore needs the `rua
The command `e` for deleting single entries by given IDs has been merged into the command `d` ("delete"), which can now delete either entries by ID or the whole file.
The command `v` for editing entries has been renamed to `e` ("edit").

#### Cronjobs
The deprecated shell scripts
- `update-asn-data`
- `update-geoip-data`
- `update-tor-nodes`
- `update-rfiprisk-data`
have been removed in favor of the built-in update-mechanisms (see the bots' documentation). A crontab file for calling all new update command can be found in `contrib/cron-jobs/intelmq-update-database`.

### Bots

Both the XMPP collector bot and the XMPP output bot were removed. This [was evaluated on the mailinglist](https://lists.cert.at/pipermail/intelmq-users/2020-October/000177.html)
Expand Down
1 change: 0 additions & 1 deletion contrib/cron-jobs/update-asn-data

This file was deleted.

1 change: 0 additions & 1 deletion contrib/cron-jobs/update-geoip-data

This file was deleted.

1 change: 0 additions & 1 deletion contrib/cron-jobs/update-tor-nodes

This file was deleted.

9 changes: 0 additions & 9 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,6 @@ override_dh_auto_install: $(BOTDOCS)
sed -i -e '/#!\/usr\/bin\//d' intelmq/bin/*.py
sed -i -f debian/sedfile intelmq/etc/* docs/user/intelmqctl.rst docs/user/bots.rst setup.py contrib/logrotate/intelmq contrib/logcheck/logcheck.logfiles
python3 setup.py install --root=debian/intelmq --prefix=/usr
# these are already in /usr/bin/
#rm %{buildroot}/%{python3_sitelib}/intelmq/bots/experts/maxmind_geoip/update-geoip-data
#rm %{buildroot}/%{python3_sitelib}/intelmq/bots/experts/asn_lookup/update-asn-data
#rm %{buildroot}/%{python3_sitelib}/intelmq/bots/experts/tor_nodes/update-tor-nodes
# and rename those in /usr/bin
mv debian/intelmq/usr/bin/update-geoip-data debian/intelmq/usr/bin/intelmq-update-geoip-data
mv debian/intelmq/usr/bin/update-asn-data debian/intelmq/usr/bin/intelmq-update-asn-data
mv debian/intelmq/usr/bin/update-tor-nodes debian/intelmq/usr/bin/intelmq-update-tor-nodes
mv debian/intelmq/usr/bin/update-rfiprisk-data debian/intelmq/usr/bin/intelmq-update-rfiprisk-data
# create directories
mkdir -p debian/intelmq/var/log/intelmq
mkdir -p debian/intelmq/var/lib/intelmq/bots/file-output
Expand Down
6 changes: 0 additions & 6 deletions intelmq/bots/experts/asn_lookup/update-asn-data

This file was deleted.

2 changes: 0 additions & 2 deletions intelmq/bots/experts/asn_lookup/update-asn-data.license

This file was deleted.

6 changes: 0 additions & 6 deletions intelmq/bots/experts/maxmind_geoip/update-geoip-data

This file was deleted.

2 changes: 0 additions & 2 deletions intelmq/bots/experts/maxmind_geoip/update-geoip-data.license

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions intelmq/bots/experts/tor_nodes/update-tor-nodes

This file was deleted.

2 changes: 0 additions & 2 deletions intelmq/bots/experts/tor_nodes/update-tor-nodes.license

This file was deleted.

4 changes: 0 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@
'intelmq_psql_initdb = intelmq.bin.intelmq_psql_initdb:main',
'intelmq.bots.experts.sieve.validator = intelmq.bots.experts.sieve.validator:main',
'intelmqsetup = intelmq.bin.intelmqsetup:main',
'update-asn-data = intelmq.bots.experts.asn_lookup.expert:BOT.update_database',
'update-geoip-data = intelmq.bots.experts.maxmind_geoip.expert:BOT.update_database',
'update-rfiprisk-data = intelmq.bots.experts.recordedfuture_iprisk.expert:BOT.update_database',
'update-tor-nodes = intelmq.bots.experts.tor_nodes.expert:BOT.update_database',
] + BOTS,
},
)

0 comments on commit 282b4a0

Please sign in to comment.