diff --git a/README.md b/README.md index ce385ad..67633b6 100644 --- a/README.md +++ b/README.md @@ -72,14 +72,14 @@ export bitwarden_organization_id="" ``` cd existing_repo -git remote add origin https://gitlab.tryton.geeraert.eu/pierre/django_kube.git +git remote add origin https://gitea.geeraert.eu/pi-ux-ce/Django_kube.git git branch -M main git push -uf origin main ``` ## Integrate with your tools -- [ ] [Set up project integrations](https://gitlab.tryton.geeraert.eu/pierre/django_kube/-/settings/integrations) +- [ ] [Set up project integrations](https://gitlab.geeraert.eu/pierre/django_kube/-/settings/integrations) ## Collaborate with your team diff --git a/django_code/apps/bitwarden/utils.py b/django_code/apps/bitwarden/utils.py index ec89fb8..9e713c8 100644 --- a/django_code/apps/bitwarden/utils.py +++ b/django_code/apps/bitwarden/utils.py @@ -12,9 +12,9 @@ class bitwardenUtils(): client = BitwardenClient( client_settings_from_dict( { - "apiUrl": os.getenv("API_URL", "https://bitwarden.tryton.geeraert.eu/api"), + "apiUrl": os.getenv("API_URL", "https://bitwarden.geeraert.eu/api"), "deviceType": DeviceType.SDK, - "identityUrl": os.getenv("IDENTITY_URL", "https://bitwarden.tryton.geeraert.eu/identity"), + "identityUrl": os.getenv("IDENTITY_URL", "https://bitwarden.geeraert.eu/identity"), "userAgent": "Python", } ) diff --git a/django_code/apps/kubernetes_connection/apps.py b/django_code/apps/kubernetes_connection/apps.py index e288fb0..07d59e8 100644 --- a/django_code/apps/kubernetes_connection/apps.py +++ b/django_code/apps/kubernetes_connection/apps.py @@ -62,7 +62,7 @@ def nodes(request): 'spec': { 'containers': [{ - 'image': 'gitea.tryton.geeraert.eu/pi-ux-ce/bitwarden_cli:1.0.1', + 'image': 'gitea.geeraert.eu/pi-ux-ce/bitwarden_cli:1.0.1', # 'pod-running-timeout': '5m0s', 'name': 'testpython', 'env': [ @@ -96,7 +96,7 @@ def backup_job(request): 'spec': { 'containers': [{ - 'image': 'gitea.tryton.geeraert.eu/pi-ux-ce/bitwarden_cli:1.0.1', + 'image': 'gitea.geeraert.eu/pi-ux-ce/bitwarden_cli:1.0.1', 'name': 'testpython', 'command': ['/bin/sh -c /config/export_bitwarden.sh'], 'env': [ @@ -124,8 +124,8 @@ def backup_job_yaml(request,sync_target): v1 = client.BatchV1Api() yaml_location = { - "synology" : "https://gitea.tryton.geeraert.eu/pi-ux-ce/Backup_kube/raw/branch/main/Infrequent_access/synology_pod.yaml", - "openmediavault":"https://gitea.tryton.geeraert.eu/pi-ux-ce/Backup_kube/raw/branch/main/Infrequent_access/openmediavault_pod.yaml" + "synology" : "https://gitea.geeraert.eu/pi-ux-ce/Backup_kube/raw/branch/main/Infrequent_access/synology_pod.yaml", + "openmediavault":"https://gitea.geeraert.eu/pi-ux-ce/Backup_kube/raw/branch/main/Infrequent_access/openmediavault_pod.yaml" } print(yaml_location[sync_target]) url_to_select=yaml_location[sync_target] diff --git a/infra/production/dockerfile b/infra/production/dockerfile index 260f8d7..9c4bdf6 100644 --- a/infra/production/dockerfile +++ b/infra/production/dockerfile @@ -1,7 +1,7 @@ FROM python:3.12 ENV PYTHONUNBUFFERED 1 -#ENV ALLOWED_HOSTS 'django.tryton.geeraert.eu' +#ENV ALLOWED_HOSTS 'django.geeraert.eu' #ENV DEBUG 'True' ARG ALLOWED_HOSTS diff --git a/infra/testing/dockerfile b/infra/testing/dockerfile index 6746664..9745d89 100644 --- a/infra/testing/dockerfile +++ b/infra/testing/dockerfile @@ -4,7 +4,7 @@ FROM python:3.12 MAINTAINER pi-ux-ce ENV PYTHONUNBUFFERED 1 -ENV ALLOWED_HOSTS 'django-testing.tryton.geeraert.eu' +ENV ALLOWED_HOSTS 'django-testing.geeraert.eu' ENV DEBUG 'True' WORKDIR /code/ @@ -20,7 +20,7 @@ RUN apt-get update && \ # image silently keeps stale code. ARG CACHE_BUST=1 RUN echo "cache bust: ${CACHE_BUST}" && \ - git clone --depth 1 -b testing https://gitea.tryton.geeraert.eu/pi-ux-ce/Django_kube.git . + git clone --depth 1 -b testing https://gitea.geeraert.eu/pi-ux-ce/Django_kube.git . RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade pip RUN pip list --cache-dir=/opt/hostedtoolcache/pip --outdated