remove last remnants of Paths, now only 1 directory per path AND created a new db-container subdir that takes the latest postgres image and adds a crontab / uses cron to run a bkup_users.sh script that dumps the person, refimg and linkage table so that if we ever blow the DB away, we dont lose the users

This commit is contained in:
2022-09-17 22:40:50 +10:00
parent 19bd4285e1
commit 71ec54807a
7 changed files with 36 additions and 40 deletions

View File

@@ -146,9 +146,9 @@ def SettingsRBPath():
return
# path setting is an absolute path, just use it, otherwise prepend base_path first
if settings.recycle_bin_path[0] == '/':
path = settings.recycle_bin_path
path=settings.recycle_bin_path
else:
path = settings.base_path+settings.recycle_bin_path
path=settings.base_path+settings.recycle_bin_path
return path
##############################################################################
@@ -161,12 +161,11 @@ def SettingsSPath():
if settings == None:
print("Cannot create file data with no settings / storage path is missing")
return
for p in settings.storage_path.split("#"):
if p[0] == '/':
paths.append(p)
else:
paths.append(settings.base_path+p)
return paths
if settings.storage_path[0] == '/':
path=settings.storage_path
else:
path=settings.base_path+settings.storage_path
return path
##############################################################################
# SettingsIPath(): return modified array of paths (take each path in
@@ -178,12 +177,11 @@ def SettingsIPath():
if settings == None:
print ("Cannot create file data with no settings / import path is missing")
return
for p in settings.import_path.split("#"):
if p[0] == '/':
paths.append(p)
else:
paths.append(settings.base_path+p)
return paths
if settings.import_path[0] == '/':
path=settings.import_path
else:
path=settings.base_path+settings.import_path
return path
##############################################################################
# SettingsMPath(): return path to actual metadata path from settings