diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97b81c3394bc0d79f18298a1ff198adeb5714c68..431cb83e38c525ed766003c1f02e07c44a6e4c21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -212,11 +212,11 @@ deploy-prod: - release variables: NAMESPACE: "ippidb-prod" - PUBLIC_URL: "ippidb-internal.pasteur.cloud" - INGRESS_CLASS: "internal" + PUBLIC_URL: "ippidb.pasteur.fr" + INGRESS_CLASS: "external" environment: name: "k8sprod-02/ippidb-prod/${CI_COMMIT_REF_SLUG}" - url: "https://ippidb-internal.pasteur.cloud" + url: "https://ippidb.pasteur.fr" before_script: - export MARVINJS_APIKEY=$MARVINJS_APIKEY_release - export GACODE=$GACODE_release diff --git a/ippisite/ippidb/static/images/favicon.png b/ippisite/ippidb/static/images/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..694d54171e6a01fa8458e4fd93707d38bc169c10 Binary files /dev/null and b/ippisite/ippidb/static/images/favicon.png differ diff --git a/ippisite/ippidb/templates/base.html b/ippisite/ippidb/templates/base.html index 4c7fa5ec9d22988b9cd5d817eb8184fbf67fa1f1..7cf7d855a4855e1aceff75b6e95fcbc1c572745f 100644 --- a/ippisite/ippidb/templates/base.html +++ b/ippisite/ippidb/templates/base.html @@ -20,6 +20,7 @@ </script> {% endif %} + <link rel="icon" href="/static/images/favicon.png" type="image/x-icon"/> <link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="/static/css/fonts.css"> <link rel="stylesheet" href="/static/css/main.css"> diff --git a/ippisite/ippisite/settings.py b/ippisite/ippisite/settings.py index 2fda384de14b94d4ed3b74ef3260cf08906b9c5a..95c97a81df176bdc928c5b570bae266be6a21418 100644 --- a/ippisite/ippisite/settings.py +++ b/ippisite/ippisite/settings.py @@ -87,6 +87,7 @@ MIDDLEWARE = [ "django.middleware.clickjacking.XFrameOptionsMiddleware", "debug_toolbar.middleware.DebugToolbarMiddleware", "maintenance_mode.middleware.MaintenanceModeMiddleware", + "allauth.account.middleware.AccountMiddleware", ] ROOT_URLCONF = "ippisite.urls"