aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--LICENCE.md13
-rw-r--r--main.py15
2 files changed, 20 insertions, 8 deletions
diff --git a/LICENCE.md b/LICENCE.md
new file mode 100644
index 0000000..70a3cea
--- /dev/null
+++ b/LICENCE.md
@@ -0,0 +1,13 @@
+Copyright (c) 2019 Nico Wellpott <nico@magicbroccoli.de>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. \ No newline at end of file
diff --git a/main.py b/main.py
index 5f1ea7e..481f266 100644
--- a/main.py
+++ b/main.py
@@ -1,13 +1,12 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-# workflow
-# start options main.py --dry-run --outfile file
-import requests
-import os
-import sys
import argparse
+import os
import subprocess
+import sys
+
+import requests
from ruamel.yaml import YAML, scalarstring
@@ -24,8 +23,8 @@ class BlacklistImporter:
"""
determine if the download is required
"""
- etag_path = "".join([self.path, "/.etag"])
- blacklist_path = "".join([self.path, "/blacklist.txt"])
+ etag_path = "/".join([self.path, ".etag"])
+ blacklist_path = "/".join([self.path, "blacklist.txt"])
# check if etag header is present if not set local_etag to ""
if os.path.isfile(etag_path):
@@ -77,7 +76,7 @@ class BlacklistImporter:
# reload config if changes have been applied
if self.change:
- subprocess.call('/usr/sbin/ejabberdctl reload_config', shell=False)
+ subprocess.call(['/usr/sbin/ejabberdctl', 'reload_config'], shell=False)
def process(self):
"""