Merge remote-tracking branch 'origin/master' into lash/verify-cache

2021-11-04 04:23:47 +01:00
parent 7ce68021bd 8855ccd3d2
commit 29423449b7
57 changed files with 6254 additions and 289 deletions
--- a/apps/cic-cache/scripts/migrate.py
+++ b/apps/cic-cache/scripts/migrate.py
@@ -22,6 +22,7 @@ logg = logging.getLogger()
 rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 dbdir = os.path.join(rootdir, 'cic_cache', 'db')
 migrationsdir = os.path.join(dbdir, 'migrations')
+configdir = os.path.join(rootdir, 'cic_cache', 'data', 'config')

 #config_dir = os.path.join('/usr/local/etc/cic-cache')