updates

docker/Dockerfile

@@ -109,7 +109,9 @@ ENV PATH=/app/.venv/bin:/usr/local/bin/:/usr/bin:/bin \
     PYTHONDONTWRITEBYTECODE=1 \
     STATIC_URL="/static/" \
     PYTHONPATH=""\
+    PGSSLCERT="/tmp/postgresql.crt" \
     UWSGI_PROCESSES=4
+
 RUN <<EOF cat> /RELEASE
 {"version": "$VERSION",
  "commit": "$GIT_SHA",

docker/bin/docker-entrypoint.sh

@@ -16,6 +16,8 @@ case "$1" in
 	    fi
 	    uwsgi --http :8000 \
 	          --module country_workspace.config.wsgi \
+	          --uid user \
+	          --gid app \
 	          $MAPPING
 	    ;;
     worker)

src/country_workspace/admin/__init__.py

@@ -1,8 +1,7 @@
 from django.contrib.admin import site
-from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 
-from smart_admin.smart_auth.admin import ContentTypeAdmin, PermissionAdmin
+from smart_admin.smart_auth.admin import ContentTypeAdmin
 
 from .batch import BatchAdmin  # noqa
 from .household import HouseholdAdmin  # noqa
@@ -15,4 +14,3 @@
 from .user import UserAdmin  # noqa
 
 site.register(ContentType, admin_class=ContentTypeAdmin)
-site.register(Permission, admin_class=PermissionAdmin)

src/country_workspace/workspaces/sites.py

@@ -3,6 +3,7 @@
 from typing import Any
 
 from django.apps import apps
+from django.contrib import admin
 from django.core.exceptions import FieldDoesNotExist, PermissionDenied
 from django.db.models import QuerySet
 from django.http import Http404, HttpRequest, HttpResponse, HttpResponseRedirect
@@ -15,7 +16,6 @@
 from django.views.decorators.cache import never_cache
 
 from smart_admin.autocomplete import SmartAutocompleteJsonView
-from smart_admin.site import SmartAdminSite
 
 from .forms import SelectTenantForm, TenantAuthenticationForm
 from .utils import get_selected_tenant, is_tenant_valid, set_selected_tenant
@@ -113,8 +113,8 @@ def _view_wrapper(request: HttpRequest, *args, **kwargs):
     return wraps(view_func)(_view_wrapper)
 
 
-class TenantAdminSite(SmartAdminSite):
-    # class TenantAdminSite(admin.AdminSite):
+# class TenantAdminSite(SmartAdminSite):
+class TenantAdminSite(admin.AdminSite):
     enable_nav_sidebar = False
     index_template = "workspace/index.html"
     app_index_template = "workspace/app_index.html"