fix: add ckanext.dc_serve.tmp_dir

Author: paulmueller

CHANGELOG

@@ -1,3 +1,6 @@
+0.10.1
+ - fix: add ckanext.dc_serve.tmp_dir, a temporary data location for
+   condensing data before uploading to S3
 0.10.0
  - enh: update package located in /testing in dcor update
  - enh: also check S3 storage for orphaned objects in `dcor inspect`

dcor_control/cli/inspect.py

@@ -21,7 +21,8 @@ def inspect(assume_yes=False):
         paths.get_ckan_storage_path() / "resources",
         paths.get_dcor_users_depot_path(),
         paths.get_ckan_webassets_path(),
-        get_ckan_config_option("dcor_object_store.local_backup_location")
+        get_ckan_config_option("dcor_object_store.local_backup_location"),
+        get_ckan_config_option("ckanext.dc_serve.tmp_dir"),
             ]:
         if path is not None:
             inspect_mod.check_permission(

dcor_control/inspect/common.py

@@ -14,7 +14,7 @@ def ask(prompt):
 def check_permission(path, user=None, mode=None, recursive=False,
                      autocorrect=False):
     path = pathlib.Path(path)
-    if recursive:
+    if recursive and path.is_dir():
         for pp in path.rglob("*"):
             if pp.is_dir():
                 check_permission(path=pp,

dcor_control/resources/dcor_options.ini

@@ -65,6 +65,9 @@ ckan.webassets.path = /var/lib/ckan/webassets
 # use "localhost" instead of "127.0.0.1".
 solr_url = http://localhost:8983/solr/ckan
 
+# ckanext-dc_serve
+ckanext.dc_serve.tmp_dir = "/data/tmp/ckanext-dc_serve"
+
 # ckanext-dcor_depot
 ckanext.dcor_depot.depots_path = /data/depots
 

dcor_control/resources/server_options.json

@@ -21,6 +21,7 @@
          "ckan.auth.create_user_via_api": "true",
          "ckan.site_title": "DCOR-dev",
          "ckan.site_url": "https://dcor-dev.mpl.mpg.de",
+         "ckanext.dc_serve.tmp_dir": "/cache/ckanext-dc_serve",
          "dcor_object_store.endpoint_url": "https://objectstore.hpccloud.mpcdf.mpg.de",
          "dcor_object_store.bucket_name": "circle-dev-{organization_id}"
          },