updates

Author: squidgetx

ark/models.py

@@ -131,7 +131,7 @@ def clean(self):
 
     @classmethod
     def create(cls, naan: Naan, shoulder: Shoulder):
-        noid = generate_noid(8)
+        noid = generate_noid(env("ARKLET_NOID_LENGTH"))
         ark_prefix = f"{naan.naan}{shoulder.shoulder}"
         base_ark_string = f"{ark_prefix}{noid}"
         check_digit = noid_check_digit(base_ark_string)

ark/views.py

@@ -7,7 +7,6 @@
 from django.http import (
     Http404,
     HttpRequest,
-    HttpResponse,
     HttpResponseBadRequest,
     HttpResponseForbidden,
     HttpResponseNotAllowed,
@@ -322,4 +321,9 @@ def batch_mint_arks(request):
     return JsonResponse({
         'num_received': len(records),
         'arks_created': [ark_to_json(c, metadata=False) for c in created]
+    })
+
+def status(request):
+    return JsonResponse({
+        'status': 'ok!',
     })

arklet/settings.py

@@ -30,7 +30,8 @@
     ARKLET_SENTRY_TRANSACTIONS_PER_TRACE=(int, 1),
     ARKLET_STATIC_ROOT=(str, "static"),
     ARKLET_MEDIA_ROOT=(str, "media"),
-    RESOLVER=(bool, False)
+    RESOLVER=(bool, False),
+    ARKLET_NOID_LENGTH=(int, 8)
 )
 
 # .env files are optional. django-environ will log an INFO message if no file is found

arklet/urls.py

@@ -30,6 +30,7 @@
 
 resolverpatterns = [
     re_path(r"^(resolve/)?(?P<ark>ark:/?.*$)", views.resolve_ark, name="resolve_ark"),
+    path("", views.status, name="status"),
 ]
 
 combinedpatterns = minterpatterns + resolverpatterns

docker-compose.prod.yml

@@ -5,7 +5,7 @@ services:
     container_name: arklet_db
     image: postgres:14-alpine
     env_file:
-      - ./docker/env.postgres.local
+      - ./docker/env.local
     volumes:
       - postgres:/var/lib/postgresql/data
     restart: always
@@ -25,8 +25,9 @@ services:
       - ./ark_import:/app/ark_import
       - ./arklet:/app/arklet
     env_file:
-      - ./docker/env.postgres.local
-      - ./docker/env.minter.local
+      - ./docker/env.local
+    environment:
+      ARKLET_PORT: "8001"
     ports:
       - "8001:8001"
 
@@ -43,8 +44,10 @@ services:
       - ./ark_import:/app/ark_import
       - ./arklet:/app/arklet
     env_file:
-      - ./docker/env.postgres.local
-      - ./docker/env.resolver.local
+      - ./docker/env.local
+    environment:
+      ARKLET_PORT: "8000"
+      RESOLVER: "true"
     ports:
       - "8000:8000"
 

docker-compose.yml

@@ -1,6 +1,7 @@
 ARKLET_DJANGO_SECRET_KEY=local-test-secret ##ggignore
 ARKLET_DEBUG=True
 ARKLET_HOST=127.0.0.1
+ARKLET_NOID_LENGTH=8
 
 # Would be nice to undup these eventually
 POSTGRES_DB=arklet
@@ -16,4 +17,4 @@ POSTGRES_HOST=postgres
 ARKLET_POSTGRES_HOST=postgres 
 
 POSTGRESQL_PORT=5432
-ARKLET_POSTGRES_PORT=5432
+ARKLET_POSTGRES_PORT=5432

docker/env.local

@@ -2,6 +2,7 @@ ARKLET_DJANGO_SECRET_KEY=
 
 ARKLET_DEBUG=False
 ARKLET_HOST=ark.frick.org
+ARKLET_NOID_LENGTH=8
 
 # Would be nice to undup these eventually
 POSTGRES_DB=arklet
@@ -17,4 +18,4 @@ POSTGRES_HOST=
 ARKLET_POSTGRES_HOST=
 
 POSTGRESQL_PORT=25060
-ARKLET_POSTGRES_PORT=25060
+ARKLET_POSTGRES_PORT=25060