Merge pull request #2385 from sebkuf/fix_default_parameters

Added parameter for outputfile in initdb script

Author: sebix

CHANGELOG.md

@@ -68,6 +68,8 @@ CHANGELOG
 ### Tools
 - `intelmqsetup`:
   - SECURITY: fixed a low-risk bug causing the tool to change owner of `/` if run with the `INTELMQ_PATHS_NO_OPT` environment variable set. This affects only the PIP package as the DEB/RPM packages don't contain this tool. (PR#2355 by Kamil Mańkowski, fixes #2354)
+- `intelmq_psql_initdb`:
+  - Added parameter `-o` to set the output file destination. (by Sebastian Kufner)
 
 ### Known Errors
 - `intelmq.parsers.html_table` may not process invalid URLs in patched Python version due to changes in `urllib`. See #2382

intelmq/bin/intelmq_psql_initdb.py

@@ -14,6 +14,7 @@
 import os
 import sys
 import tempfile
+import argparse
 
 from intelmq import HARMONIZATION_CONF_FILE
 
@@ -22,6 +23,14 @@
            'source.abuse_contact', 'source.asn', 'source.ip', 'source.fqdn',
            'time.observation', 'time.source']
 
+DESCRIPTION = """
+Generates a SQL command file with commands to create the events table.
+
+Reads the harmonization configuration and generates an SQL command from it.
+The SQL file is saved by default in `/tmp/initdb.sql` or a temporary name
+if the other one exists.
+"""
+
 
 def generate(harmonization_file=HARMONIZATION_CONF_FILE):
     FIELDS = {}
@@ -80,7 +89,17 @@ def generate(harmonization_file=HARMONIZATION_CONF_FILE):
 
 
 def main():
-    OUTPUTFILE = "/tmp/initdb.sql"
+    parser = argparse.ArgumentParser(
+        description=DESCRIPTION,
+        formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    parser.add_argument('-o', '--outputfile',
+                        help='Defines the Ouputfile',
+                        default='/tmp/initdb.sql'
+                        )
+    args = parser.parse_args()
+
+    OUTPUTFILE = args.outputfile
     fp = None
     try:
         if os.path.exists(OUTPUTFILE):