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.

Sign up for GitHub

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

intelmqsetup: Fix #2197 #2198

Merged
merged 2 commits into from
Jul 7, 2022
Merged

intelmqsetup: Fix #2197 #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b23db6
doc: add missing changelog for PR#2114
wagner-intevation Jun 29, 2022
d7ced2e
bug: intelmqsetup: fix #2197
wagner-intevation Jun 29, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ CHANGELOG

### Tools
- `intelmqctl`: fix process manager initialization if run non-interactively, as intelmqdump does it (PR#2189 by Sebastian Wagner, fixes 2188).
- `intelmqsetup`: Revised installation of manager by building the static files at setup, not build time, making it behave more meaningful. Requires intelmq-manager >= 3.1.0 (PR#2198 by Sebastian Wagner, fixes #2197).

### Contrib
- logrotate: Move compress and ownership rules to the IntelMQ-blocks to prevent that they apply to other files (PR#2111 by Sebastian Wagner, fixes #2110).
Expand Down
3 changes: 2 additions & 1 deletion intelmq/bin/intelmqsetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

try:
import intelmq_api
import intelmq_api.version
except ImportError:
intelmq_api = None

Expand Down Expand Up @@ -320,7 +321,7 @@ def main():
intelmqsetup_core(ownership=not args.skip_ownership,
state_file=args.state_file)
if intelmq_api and not args.skip_api:
print(f'Running setup for intelmq-api (version {intelmq_api.version}).')
print(f'Running setup for intelmq-api (version {intelmq_api.version.__version__}).')
intelmqsetup_api(ownership=not args.skip_ownership,
webserver_user=args.webserver_user)
if not args.skip_webserver:
Expand Down