Skip to content

Commit d97eafe

Browse files
committed
Updates debian packaging.
1 parent 1ba4d93 commit d97eafe

File tree

7 files changed

+38
-5
lines changed

7 files changed

+38
-5
lines changed

.reuse/dep5

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ Files: debian/*
1818
Copyright: 2016 Intevation GmbH
1919
License: AGPL-3.0-or-later
2020

21+
Files: debian/systemd/intelmq.service
22+
Copyright: 2023 Filip Pokorný
23+
License: AGPL-3.0-or-later
24+
2125
Files: debian/cron.d/intelmq-update-database
2226
Copyright: 2020 gethvi <gethvi@tuta.io>
2327
License: AGPL-3.0-or-later

debian/conffiles

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/etc/intelmq/harmonization.conf
22
/etc/intelmq/runtime.yaml
3+
/etc/intelmq/intelmq.yaml

debian/control

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ Build-Depends: debhelper (>= 4.1.16),
1515
python3-requests-mock,
1616
python3-ruamel.yaml,
1717
python3-setuptools,
18-
python3-sphinx,
19-
python3-sphinx-rtd-theme,
2018
python3-termstyle (>= 0.1.10),
19+
python3-fastapi,
20+
python3-typing-extensions,
21+
python3-multipart,
22+
python3-gunicorn,
2123
python3-tz,
2224
quilt,
2325
rsync,
@@ -32,6 +34,7 @@ Architecture: all
3234
Depends: bash-completion,
3335
cron,
3436
jq,
37+
dbconfig-sqlite3 | dbconfig-no-thanks,
3538
python3-dateutil (>= 2.5),
3639
python3-dnspython (>= 2.0.0),
3740
python3-openssl,
@@ -40,12 +43,17 @@ Depends: bash-completion,
4043
python3-requests (>= 2.2.0),
4144
python3-ruamel.yaml,
4245
python3-termstyle (>= 0.1.10),
46+
python3-fastapi,
47+
python3-typing-extensions,
48+
python3-multipart,
49+
python3-uvicorn,
50+
python3-uvloop,
51+
python3-httptools,
4352
python3-tz,
4453
python3-importlib-metadata,
4554
redis-server,
4655
systemd,
4756
${misc:Depends},
48-
${sphinxdoc:Depends},
4957
${python3:Depends}
5058
Suggests: python3-geoip2 (>= 2.2.0),
5159
python3-imbox (>= 0.8),

debian/intelmq.install

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
debian/cron.d/intelmq-update-database etc/cron.d/
2+
debian/systemd/intelmq.service lib/systemd/system/
23
contrib/logrotate/intelmq etc/logrotate.d/
34
contrib/bash-completion/intelmqctl usr/share/bash-completion/completions/
45
contrib/bash-completion/intelmqdump usr/share/bash-completion/completions/
56
intelmq/bots/experts/modify/examples/* usr/share/doc/intelmq/bots/experts/modify/examples/
67
intelmq/etc/runtime.yaml etc/intelmq/
78
intelmq/etc/harmonization.conf etc/intelmq/
9+
intelmq/etc/intelmq.yaml etc/intelmq/

debian/rules

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ BOTDOCS := $(foreach bot,$(BOTS),$(wildcard $(bot)/*.md))
1717
# Wed, 23 Mar 2016 17:49:26 +0000
1818
export PYBUILD_NAME=intelmq
1919
%:
20-
dh $@ --with python3,sphinxdoc --without python2 --buildsystem=pybuild --with quilt --with systemd
20+
dh $@ --with python3 --without python2 --buildsystem=pybuild --with quilt --with systemd
2121

2222
build:
2323
if [ $(CODENAME) = 'xenial' ] || [ $(CODENAME) = 'jessie' ]; then\
2424
patch -p1 setup.py debian/patches/fix-dnspython-name.patch;\
2525
fi
26-
dh build --with python3,sphinxdoc --without python2 --buildsystem=pybuild --with quilt --with systemd
26+
dh build --with python3 --without python2 --buildsystem=pybuild --with quilt --with systemd
2727
# These tests frequently fail on Ubuntu and Debian systems.
2828
# On some systems this command will be executed twice, so -f
2929
rm -rf intelmq/tests/bots/collectors/tcp/
@@ -39,6 +39,7 @@ override_dh_auto_install: $(BOTDOCS)
3939
dh_auto_install
4040
# create directories
4141
mkdir -p debian/intelmq/var/log/intelmq
42+
mkdir -p debian/intelmq/var/lib/intelmq/server
4243
mkdir -p debian/intelmq/var/lib/intelmq/bots/file-output
4344
mkdir -p debian/intelmq/etc/logrotate.d
4445
mkdir -p debian/intelmq/var/lib/intelmq/bots/modify/

debian/systemd/intelmq.service

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[Unit]
2+
Description=IntelMQ server app
3+
After=network.target
4+
5+
[Service]
6+
User=intelmq
7+
Group=intelmq
8+
RuntimeDirectory=intelmq
9+
WorkingDirectory=/var/lib/intelmq/
10+
ExecStart=intelmq server start
11+
ExecReload=/bin/kill -s HUP $MAINPID
12+
KillMode=mixed
13+
TimeoutStopSec=5
14+
PrivateTmp=true
15+
16+
[Install]
17+
WantedBy=multi-user.target

intelmq/bots/collectors/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)