Skip to content

Commit

Permalink
changed back climate local path settings to server path #47
Browse files Browse the repository at this point in the history
  • Loading branch information
FlatErikk committed Jul 19, 2024
1 parent 2f914da commit ece0941
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions framework/climate/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from subprocess import (PIPE, Popen,)

import requests
from django.conf import settings
# from django.conf import settings
from django.http import (HttpResponse, JsonResponse, StreamingHttpResponse,)
from elasticsearch_dsl import Index
from elasticsearch_dsl.connections import connections
Expand All @@ -31,8 +31,8 @@
from .serializer import ClimateLayerSerializer


GENERAL_API_URL = "http://127.0.0.1:8000/"
# GENERAL_API_URL = "https://leutra.geogr.uni-jena.de/backend_geoportal/"
# GENERAL_API_URL = "http://127.0.0.1:8000/"
GENERAL_API_URL = "https://leutra.geogr.uni-jena.de/backend_geoportal/"
FORBIDDEN_CHARACTERS = ["/", "\\", ".", "-", ":", "@", "&", "^", ">", "<", "~", "$"]
HASH_LENGTH = 32
TEMP_FILESIZE_LIMIT = 75 # MB
Expand All @@ -53,17 +53,17 @@
folder_list['cache'] = {}

# LOCAL paths
TEMP_ROOT = settings.STATICFILES_DIRS[0]
TEMP_RAW = os.path.join(TEMP_ROOT, "tippecctmp/raw")
TEMP_CACHE = os.path.join(TEMP_ROOT, "tippecctmp/cache")
TEMP_URL = os.path.join(TEMP_ROOT, "tippecctmp/url")
URLTXTFILES_DIR = TEMP_URL
# TEMP_ROOT = settings.STATICFILES_DIRS[0]
# TEMP_RAW = os.path.join(TEMP_ROOT, "tippecctmp/raw")
# TEMP_CACHE = os.path.join(TEMP_ROOT, "tippecctmp/cache")
# TEMP_URL = os.path.join(TEMP_ROOT, "tippecctmp/url")
# URLTXTFILES_DIR = TEMP_URL

# SERVER paths
# TEMP_ROOT = "/data/tmp"
# TEMP_RAW = "/data"
# TEMP_CACHE = "/data/tmp/cache"
# URLTXTFILES_DIR = "/data/tmp/url"
TEMP_ROOT = "/data/tmp"
TEMP_RAW = "/data"
TEMP_CACHE = "/data/tmp/cache"
URLTXTFILES_DIR = "/data/tmp/url"

for TEMP_FOLDER_TYPE in TEMP_FOLDER_TYPES:
folder_list['raw'][TEMP_FOLDER_TYPE] = os.path.join(TEMP_RAW, TEMP_FOLDER_TYPE)
Expand Down

0 comments on commit ece0941

Please sign in to comment.