Merge branch 'testing' to master
This commit is contained in:
commit
2df68fa83c
|
@ -20,6 +20,12 @@ services:
|
||||||
- TA_PASSWORD=verysecret # your initial TA credentials
|
- TA_PASSWORD=verysecret # your initial TA credentials
|
||||||
- ELASTIC_PASSWORD=verysecret # set password for Elasticsearch
|
- ELASTIC_PASSWORD=verysecret # set password for Elasticsearch
|
||||||
- TZ=America/New_York # set your time zone
|
- TZ=America/New_York # set your time zone
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
|
||||||
|
interval: 2m
|
||||||
|
timeout: 10s
|
||||||
|
retries: 3
|
||||||
|
start_period: 30s
|
||||||
depends_on:
|
depends_on:
|
||||||
- archivist-es
|
- archivist-es
|
||||||
- archivist-redis
|
- archivist-redis
|
||||||
|
|
|
@ -223,7 +223,7 @@ class Command(BaseCommand):
|
||||||
raise CommandError(message)
|
raise CommandError(message)
|
||||||
|
|
||||||
def _mig_move_users_to_es(self): # noqa: C901
|
def _mig_move_users_to_es(self): # noqa: C901
|
||||||
"""migration: update from 0.4.1 to 0.5.0 move user config to ES"""
|
"""migration: update from 0.4.1 to 0.4.2 move user config to ES"""
|
||||||
self.stdout.write("[MIGRATION] move user configuration to ES")
|
self.stdout.write("[MIGRATION] move user configuration to ES")
|
||||||
redis = RedisArchivist()
|
redis = RedisArchivist()
|
||||||
|
|
||||||
|
|
|
@ -269,4 +269,4 @@ CORS_ALLOW_HEADERS = list(default_headers) + [
|
||||||
|
|
||||||
# TA application settings
|
# TA application settings
|
||||||
TA_UPSTREAM = "https://github.com/tubearchivist/tubearchivist"
|
TA_UPSTREAM = "https://github.com/tubearchivist/tubearchivist"
|
||||||
TA_VERSION = "v0.4.2-unstable"
|
TA_VERSION = "v0.4.2"
|
||||||
|
|
|
@ -152,7 +152,6 @@ class ElasitIndexWrap:
|
||||||
index_name, expected_map, expected_set = self._config_split(index)
|
index_name, expected_map, expected_set = self._config_split(index)
|
||||||
handler = ElasticIndex(index_name, expected_map, expected_set)
|
handler = ElasticIndex(index_name, expected_map, expected_set)
|
||||||
if not handler.exists:
|
if not handler.exists:
|
||||||
self._check_backup()
|
|
||||||
handler.create_blank()
|
handler.create_blank()
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
apprise==1.5.0
|
apprise==1.5.0
|
||||||
celery==5.3.4
|
celery==5.3.4
|
||||||
Django==4.2.5
|
Django==4.2.6
|
||||||
django-auth-ldap==4.5.0
|
django-auth-ldap==4.6.0
|
||||||
django-cors-headers==4.2.0
|
django-cors-headers==4.2.0
|
||||||
djangorestframework==3.14.0
|
djangorestframework==3.14.0
|
||||||
Pillow==10.0.1
|
Pillow==10.0.1
|
||||||
redis==5.0.0
|
redis==5.0.1
|
||||||
requests==2.31.0
|
requests==2.31.0
|
||||||
ryd-client==0.0.6
|
ryd-client==0.0.6
|
||||||
uWSGI==2.0.22
|
uWSGI==2.0.22
|
||||||
whitenoise==6.5.0
|
whitenoise==6.5.0
|
||||||
yt-dlp @ git+https://github.com/yt-dlp/yt-dlp@cc8d8441524ec3442d7c0d3f8f33f15b66aa06f3
|
yt-dlp==2023.10.7
|
||||||
|
|
Loading…
Reference in New Issue