ARGO-5555 poem.auto.conf with separate tenant sections and options merged with core poem.conf

Makefile

@@ -16,7 +16,7 @@ wheel-devel: clean
   fi; \
 	echo "Version $$BUILD_VER"; \
 	poetry install --no-root --with devel; \
-  poetry run python3 -m build -w
+  poetry run python3.12 -m build -w
 	mv -f dist/*.whl .
 
 

docker/collectstatic.sh

@@ -2,5 +2,5 @@
 
 . /opt/poem/bin/activate
 rm -rf $VIRTUAL_ENV/usr/share/poem/static/reactbundle/* ; \
-python $VIRTUAL_ENV/lib/python3.9/site-packages/Poem/manage.py collectstatic --noinput ; \
+python $VIRTUAL_ENV/lib/python3.12/site-packages/Poem/manage.py collectstatic --noinput ; \
 rm -rf $VIRTUAL_ENV/usr/share/poem/static/admin

etc/poem.auto.conf.template

@@ -0,0 +1,9 @@
+[GENERAL_TENANTNAME]
+# Extra tenant GENERAL options may be defined here.
+
+[SUPERUSER_TENANTNAME]
+# Extra tenant SUPERUSER options may be defined here.
+
+[SECURITY]
+# AllowedHosts values are appended to SECURITY.AllowedHosts from poem.conf.
+AllowedHosts =

poem/Poem/api/internal_views/app.py

@@ -1,4 +1,4 @@
-import configparser
+from configparser import NoOptionError, NoSectionError
 
 from Poem.api import serializers
 from Poem.api.internal_views.users import get_all_groups, get_groups_for_user
@@ -110,8 +110,7 @@ def get(self, request, istenant):
 
 
 def get_use_service_titles(tenant):
-    config = configparser.ConfigParser()
-    config.read(filenames=settings.CONFIG_FILE)
+    config = settings.GET_POEM_CONFIG(settings.CONFIG_FILE)
 
     try:
         if config.get(
@@ -122,7 +121,7 @@ def get_use_service_titles(tenant):
         else:
             return False
 
-    except configparser.NoOptionError:
+    except (NoOptionError, NoSectionError):
         return False