From 762e644d4638af3153eac486a64d399919b29562 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Sat, 1 Dec 2018 17:46:56 -0600 Subject: [PATCH] moved files --- .gitignore | 9 ++-- Legacy/cisco_asa.py | 2 +- Legacy/ombi.py | 2 +- Legacy/radarr.py | 2 +- Varken/iniparser.py | 4 +- varken.example.ini | 81 ----------------------------------- Varken/varken.py => varken.py | 0 7 files changed, 9 insertions(+), 91 deletions(-) delete mode 100644 varken.example.ini rename Varken/varken.py => varken.py (100%) diff --git a/.gitignore b/.gitignore index 50ca5a6..a7e3e02 100644 --- a/.gitignore +++ b/.gitignore @@ -5,12 +5,11 @@ .Trashes ehthumbs.db Thumbs.db -Varken/configuration.py -Varken/config.ini __pycache__ GeoLite2-City.mmdb GeoLite2-City.tar.gz +data/varken.ini +data/GeoLite2-City.mmdb +data/GeoLite2-City.tar.gz .idea/ -.idea/* -varken.ini -data/ +Legacy/configuration.py diff --git a/Legacy/cisco_asa.py b/Legacy/cisco_asa.py index bb44c93..33ebe44 100644 --- a/Legacy/cisco_asa.py +++ b/Legacy/cisco_asa.py @@ -3,7 +3,7 @@ import requests from datetime import datetime, timezone from influxdb import InfluxDBClient -from Varken import configuration +from Legacy import configuration current_time = datetime.now(timezone.utc).astimezone().isoformat() diff --git a/Legacy/ombi.py b/Legacy/ombi.py index 898b8c8..bcea45f 100644 --- a/Legacy/ombi.py +++ b/Legacy/ombi.py @@ -5,7 +5,7 @@ from datetime import datetime, timezone from influxdb import InfluxDBClient import argparse from argparse import RawTextHelpFormatter -from Varken import configuration +from Legacy import configuration headers = {'Apikey': configuration.ombi_api_key} diff --git a/Legacy/radarr.py b/Legacy/radarr.py index 25ddff9..eea3499 100644 --- a/Legacy/radarr.py +++ b/Legacy/radarr.py @@ -5,7 +5,7 @@ from datetime import datetime, timezone from influxdb import InfluxDBClient import argparse from argparse import RawTextHelpFormatter -from Varken import configuration +from Legacy import configuration def now_iso(): diff --git a/Varken/iniparser.py b/Varken/iniparser.py index 449d052..ec7f82b 100644 --- a/Varken/iniparser.py +++ b/Varken/iniparser.py @@ -1,6 +1,6 @@ import sys import configparser -from os.path import abspath, dirname, join +from os.path import abspath, join from Varken.helpers import Server, TautulliServer, SonarrServer, InfluxServer @@ -28,7 +28,7 @@ class INIParser(object): self.parse_opts() def read_file(self): - file_path = abspath(join(dirname(__file__), '..', 'varken.ini')) + file_path = abspath(join('..', 'data', 'varken.ini')) with open(file_path) as config_ini: self.config.read_file(config_ini) diff --git a/varken.example.ini b/varken.example.ini deleted file mode 100644 index aaa3bb6..0000000 --- a/varken.example.ini +++ /dev/null @@ -1,81 +0,0 @@ -# Notes: -# - Sonarr + Radarr scripts support multiple servers. You can remove the second -# server by putting a # in front of the lines and section name, and removing -# that number from your server_ids list -# - fallback_ip, This is used when there is no IP listed in tautulli. -# This can happen when you are streaming locally. This is usually your public IP. - -[global] -sonarr_server_ids = 1,2 -radarr_server_ids = 1,2 -tautulli_server_ids = 1 -ombi = true -asa = false - -[influxdb] -url = influxdb.domain.tld -port = 8086 -username = root -password = root - -[tautulli-1] -url = tautulli.domain.tld -fallback_ip = 0.0.0.0 -apikey = xxxxxxxxxxxxxxxx -ssl = false -verify_ssl = true -get_activity = true -get_activity_run_seconds = 30 -get_sessions = true -get_sessions_run_seconds = 30 - -[sonarr-1] -url = sonarr1.domain.tld -apikey = xxxxxxxxxxxxxxxx -ssl = false -verify_ssl = true -missing_days = 7 -missing_days_run_seconds = 300 -future_days = 1 -future_days_run_seconds = 300 -queue = true -queue_run_seconds = 300 - -[sonarr-2] -url = sonarr2.domain.tld -apikey = yyyyyyyyyyyyyyyy -ssl = false -verify_ssl = true -missing_days = 7 -missing_days_run_seconds = 300 -future_days = 1 -future_days_run_seconds = 300 -queue = true -queue_run_seconds = 300 - -[radarr-1] -url = radarr1.domain.tld -apikey = xxxxxxxxxxxxxxxx -ssl = false -verify_ssl = true - -[radarr-2] -url = radarr2.domain.tld -apikey = yyyyyyyyyyyyyyyy -ssl = false -verify_ssl = true - -[ombi] -url = ombi.domain.tld -apikey = xxxxxxxxxxxxxxxx -ssl = false -verify_ssl = true - - -[asa] -url = firewall.domain.tld -username = cisco -password = cisco -influx_db = asa -ssl = false -verify_ssl = true \ No newline at end of file diff --git a/Varken/varken.py b/varken.py similarity index 100% rename from Varken/varken.py rename to varken.py