From 29320894633cf28c03f21d18e1475c69e6a8bb22 Mon Sep 17 00:00:00 2001
From: Pauline <4224001+paulineribeyre@users.noreply.github.com>
Date: Wed, 8 Feb 2023 11:49:51 -0600
Subject: [PATCH] fix

---
 Dockerfile      | 4 ++--
 bin/settings.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8ed8281..dc09e73 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,8 +47,8 @@ RUN poetry config virtualenvs.create false \
 # copy source code ONLY after installing dependencies
 COPY . /$appname
 COPY ./deployment/uwsgi/uwsgi.ini /etc/uwsgi/uwsgi.ini
-COPY ./bin/settings.py /var/www/sheepdog/settings.py
-COPY ./bin/confighelper.py /var/www/sheepdog/confighelper.py
+COPY ./bin/settings.py /var/www/$appname/settings.py
+COPY ./bin/confighelper.py /var/www/$appname/confighelper.py
 
 # install peregrine
 RUN poetry config virtualenvs.create false \
diff --git a/bin/settings.py b/bin/settings.py
index 3a6ae6d..0755b5f 100644
--- a/bin/settings.py
+++ b/bin/settings.py
@@ -81,9 +81,9 @@ def load_json(file_name):
     "redirect_uri": "https://%s/api/v0/oauth2/authorize" % conf_data["hostname"],
 }
 
-config["USER_API"] = environ.get("FENCE_URL") or "http://fence-service/"
-# use the public issuer URL to accquire JWT keys
-config["FORCE_ISSUER"] = False
+config["USER_API"] = config["OIDC_ISSUER"]  # for use by authutils
+# use the USER_API URL instead of the public issuer URL to accquire JWT keys
+config["FORCE_ISSUER"] = True
 app_init(app)
 application = app
 application.debug = environ.get("GEN3_DEBUG") == "True"