diff --git a/perma_web/lockss/__init__.py b/perma_web/lockss/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/perma_web/lockss/migrations/0001_initial.py b/perma_web/lockss/migrations/0001_initial.py deleted file mode 100644 index d2ed256b7..000000000 --- a/perma_web/lockss/migrations/0001_initial.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- - - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Mirror', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(max_length=255)), - ('ip', models.CharField(help_text=b'E.g. 12.34.56.78', max_length=15)), - ('hostname', models.CharField(help_text=b'E.g. mirror.example.com', max_length=255)), - ('peer_port', models.IntegerField(default=9729, help_text=b'Port where this mirror listens for other LOCKSS nodes.')), - ('content_url', models.URLField(help_text=b'E.g. https://mirror.example.edu:8080/', max_length=255)), - ('enabled', models.BooleanField(default=True)), - ], - options={ - 'ordering': ['name'], - }, - bases=(models.Model,), - ), - ] diff --git a/perma_web/lockss/migrations/0002_auto_20180625_2258.py b/perma_web/lockss/migrations/0002_auto_20180625_2258.py deleted file mode 100644 index c585f05c5..000000000 --- a/perma_web/lockss/migrations/0002_auto_20180625_2258.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.13 on 2018-06-25 22:58 - - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lockss', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='mirror', - name='content_url', - field=models.URLField(help_text='E.g. https://mirror.example.edu:8080/', max_length=255), - ), - migrations.AlterField( - model_name='mirror', - name='hostname', - field=models.CharField(help_text='E.g. mirror.example.com', max_length=255), - ), - migrations.AlterField( - model_name='mirror', - name='ip', - field=models.CharField(help_text='E.g. 12.34.56.78', max_length=15), - ), - migrations.AlterField( - model_name='mirror', - name='peer_port', - field=models.IntegerField(default=9729, help_text='Port where this mirror listens for other LOCKSS nodes.'), - ), - ] diff --git a/perma_web/lockss/migrations/0003_delete_mirror.py b/perma_web/lockss/migrations/0003_delete_mirror.py deleted file mode 100644 index 08966c7c7..000000000 --- a/perma_web/lockss/migrations/0003_delete_mirror.py +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by Django 4.2.8 on 2023-12-10 00:14 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('lockss', '0002_auto_20180625_2258'), - ] - - operations = [ - migrations.DeleteModel( - name='Mirror', - ), - ] diff --git a/perma_web/lockss/migrations/__init__.py b/perma_web/lockss/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/perma_web/perma/models.py b/perma_web/perma/models.py index 7da3dfa74..ce1aa8ef4 100755 --- 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 index 8ed340ff1..6065fd2bf 100644 --- 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 index 9a749bf4b..5313fdcff 100644 --- 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. """