Merge pull request #2198 from certtools/fix-2197

intelmqsetup: Fix #2197
certtools · Jul 7, 2022 · 3b15e09 · 3b15e09
2 parents 5c770e1 + d7ced2e
commit 3b15e09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -108,6 +108,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).

diff --git a/intelmq/bin/intelmqsetup.py b/intelmq/bin/intelmqsetup.py
@@ -33,6 +33,7 @@
 
 try:
     import intelmq_api
+    import intelmq_api.version
 except ImportError:
     intelmq_api = None
 
@@ -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: