ref: remove "dcor_object_store.local_backup_location"

DCOR-dev · May 14, 2024 · 1ab4d89 · 1ab4d89
1 parent a0b6f2a
commit 1ab4d89
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+0.10.7
+ - ref: remove "dcor_object_store.local_backup_location"
+   (we now have backups of S3 data)
 0.10.6
  - update compatible versions
 0.10.5

diff --git a/dcor_control/cli/inspect.py b/dcor_control/cli/inspect.py
@@ -21,7 +21,6 @@ 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("ckanext.dc_serve.tmp_dir"),
             ]:
         if path is not None:

diff --git a/dcor_control/resources/dcor_options.ini b/dcor_control/resources/dcor_options.ini
@@ -36,11 +36,6 @@ dcor_object_store.ssl_verify = true
 # The bucket name is by default defined by the circle ID. Resources
 # are stored in the "RES/OUR/CEID-SCHEME" in that bucket.
 dcor_object_store.bucket_name = circle-{organization_id}
-# This is a temporarily existing configuration option used in
-# dcor_depot for keeping backups of everything that is on S3 locally
-# while waiting for an S3 backup strategy to become implemented.
-# dcor_object_store.local_backup_location = /data/s3_resource_backup-dcor
-
 
 # search
 ckan.search.default_include_private = true

diff --git a/dcor_control/resources/server_options.json b/dcor_control/resources/server_options.json
@@ -69,7 +69,6 @@
          "dcor_object_store.secret_access_key": "dIArZGZdNPD0NlN5GW7miYQxrtFAEl45LvDVR8cE",
          "dcor_object_store.endpoint_url": "http://127.0.0.1:9000",
          "dcor_object_store.ssl_verify": "false",
-         "dcor_object_store.local_backup_location": "/data/s3_resource_backup-vagrant"
          },
      "include": ["general"]
      },
@@ -101,7 +100,6 @@
          "smtp.password": "",
          "email_to": "<TEMPLATE:EMAIL>",
          "error_email_from": "error-<TEMPLATE:HOSTNAME>@mpl.mpg.de",
-         "dcor_object_store.local_backup_location": "/data/s3_resource_backup-<TEMPLATE:HOSTNAME>"
          }
       }
      }