Index: cloudsync/utils/globals.py =================================================================== diff -u -r99d35f3d5898d50372e1745b96b393db40cd8394 -r898cc02a49599b59d062b8f939d5587bdf0b8bd6 --- cloudsync/utils/globals.py (.../globals.py) (revision 99d35f3d5898d50372e1745b96b393db40cd8394) +++ cloudsync/utils/globals.py (.../globals.py) (revision 898cc02a49599b59d062b8f939d5587bdf0b8bd6) @@ -51,29 +51,24 @@ # CONFIG CONFIG_PATH = os.path.join(PATH_HOME, "cloudsync/config/config.json") -# DECOMMISSION_CS_PATH = "/var/configurations/CloudSync/" -DECOMMISSION_CS_PATH = "data/cloudsync/" +DECOMMISSION_CS_PATH = "/var/configurations/CloudSync/" DECOMMISSION_FOLDERS = ['config', 'jwt', 'credentials'] -# OPERATION_CONFIG_PATH = "/var/configurations/CloudSync/config/" -OPERATION_CONFIG_PATH = "data/cloudsync/config/" +OPERATION_CONFIG_PATH = "/var/configurations/CloudSync/config/" OPERATION_CONFIG_FILE_PATH = os.path.join(OPERATION_CONFIG_PATH, "config.json") # LOGS -# CS_LOG_PATH = "/media/sd-card/cloudsync/log" -CS_LOG_PATH = "data/log/" +CS_LOG_PATH = "/media/sd-card/cloudsync/log" CS_LOG_FILE = os.path.join(CS_LOG_PATH, "cloudsync.log") # DEVICE TOKEN -# TOKEN_CACHING_PATH = "/var/configurations/CloudSync/jwt/" -TOKEN_CACHING_PATH = "data/cloudsync/jwt/" +TOKEN_CACHING_PATH = "/var/configurations/CloudSync/jwt/" DEVICE_KEBORMED_ACCESS_TOKEN_PATH = os.path.join(TOKEN_CACHING_PATH, "access_token.json") DEVICE_TOKEN_VALIDATION = "/api/device/validate" # CREDENTIALS -# CREDENTIALS_PATH = "/var/configurations/CloudSync/credentials/" -CREDENTIALS_PATH = "data/cloudsync/credentials/" +CREDENTIALS_PATH = "/var/configurations/CloudSync/credentials/" CERTIFICATE_X509_FILE_NAME = "client_certificate.pem" PRIVATE_KEY_FILE_NAME = "client_private_key.pem" @@ -84,17 +79,8 @@ CREDENTIALS_PUBLIC_KEY = os.path.join(CREDENTIALS_PATH, PUBLIC_KEY_FILE_NAME) # UI2CS VALUES -# On-device paths (for reference): -# UI2CS_FILE_CHANNELS_PATH = "/media/sd-card/cloudsync" -# UI2CS_FILE_LOG_PATH = "/media/sd-card/cloudsync/log" -# Paths for running off device (local / Docker mock stack) -UI2CS_FILE_CHANNELS_PATH = os.path.join(PATH_HOME, "data/busses") -# Log retention paths. On-device, logs are on the SD card alongside bus files. -# SD_CARD_PATH env var lets the mock stack point these at a small tmpfs so -# shutil.disk_usage() returns a realistic SD-card-sized total, enabling -# log retention to trigger actual file deletion. -_sd_card = os.environ.get("SD_CARD_PATH", UI2CS_FILE_CHANNELS_PATH) -UI2CS_FILE_LOG_PATH = os.path.join(_sd_card, "log") +UI2CS_FILE_CHANNELS_PATH = "/media/sd-card/cloudsync" +UI2CS_FILE_LOG_PATH = "/media/sd-card/cloudsync/log" # TREATMENT REPORT SECTIONS