Merge pull request #3452 from rebeccacremona/lockss-2

Remove the rest of the LOCKSS app.
harvard-lil · Dec 11, 2023 · 979769c · 979769c
2 parents de30b45 + 6c2963e
commit 979769c
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 95 deletions.
diff --git a/perma_web/lockss/__init__.py b/perma_web/lockss/__init__.py
diff --git a/perma_web/lockss/migrations/0001_initial.py b/perma_web/lockss/migrations/0001_initial.py
diff --git a/perma_web/lockss/migrations/0002_auto_20180625_2258.py b/perma_web/lockss/migrations/0002_auto_20180625_2258.py
diff --git a/perma_web/lockss/migrations/0003_delete_mirror.py b/perma_web/lockss/migrations/0003_delete_mirror.py
diff --git a/perma_web/lockss/migrations/__init__.py b/perma_web/lockss/migrations/__init__.py
diff --git a/perma_web/perma/models.py b/perma_web/perma/models.py
@@ -1426,13 +1426,6 @@ def permanent(self):
             user_deleted=False,
         )
 
-    def visible_to_lockss(self):
-        """
-            Expose the bundled WARC after the required wait period,
-            if capture succeeded, unless deleted or made private by the user or by admins.
-        """
-        return self.filter(cached_can_play_back=True).exclude(private_reason__in=['user', 'takedown'])
-
     def visible_to_memento(self):
         return self.discoverable().filter(cached_can_play_back=True)
 

diff --git a/perma_web/perma/settings/deployments/settings_common.py b/perma_web/perma/settings/deployments/settings_common.py
@@ -151,7 +151,6 @@
     # our apps
     'perma',
     'reporting',
-    'lockss',
 
     # third party apps
     'ratelimit',
@@ -578,16 +577,11 @@
 TEST_RUNNER = 'django.test.runner.DiscoverRunner'  # In Django 1.7, including this silences a warning about tests
 TESTING = False
 
-### LOCKSS ###
+### MIRRORS ###
 
 from datetime import timedelta
 ARCHIVE_DELAY = timedelta(hours=24)
 
-LOCKSS_CONTENT_IPS = ""  # IPs of Perma servers allowed to play back LOCKSS content -- e.g. "10.1.146.0/24;140.247.209.64"
-LOCKSS_CRAWL_INTERVAL = "12h"
-LOCKSS_QUORUM = 3
-LOCKSS_DEBUG_IPS = False
-
 #
 # Email
 #

diff --git a/perma_web/perma/tests/test_cloudflare_cache.py b/perma_web/perma/tests/test_cloudflare_cache.py
@@ -10,7 +10,7 @@
 message = """
 Cloudflare has updated its list of IP addresses since we last grabbed a
 copy. We rely on an up-to-date list of IP addresses for rate limiting,
-LOCKSS security, and other purposes. Please run `invoke dev.update-cloudflare-cache`
+and other purposes. Please run `invoke dev.update-cloudflare-cache`
 and commit the updated files.
 """