diff --git a/.github/workflows/call-buildimage.yml b/.github/workflows/call-buildimage.yml
index 0107235..fe580a9 100644
--- a/.github/workflows/call-buildimage.yml
+++ b/.github/workflows/call-buildimage.yml
@@ -14,7 +14,7 @@ jobs:
build-publish-image:
uses: felleslosninger/github-workflows/.github/workflows/ci-build-publish-image.yml@main
with:
- image-name: eu-eidas-proxy
+ image-name: eidas-proxy
application-type: docker
add-git-package-token: true
secrets: inherit
@@ -23,10 +23,10 @@ jobs:
uses: felleslosninger/github-workflows/.github/workflows/ci-call-update-image.yml@main
needs: [build-publish-image]
with:
- application-name: eu-eidas-proxy
+ application-name: eidas-proxy
deployment-environment: systest
image-digest: ${{ needs.build-publish-image.outputs.image-digest }}
- image-name: eu-eidas-proxy
+ image-name: eidas-proxy
image-version: ${{ needs.build-publish-image.outputs.image-version }}
kubernetes-repo: idporten-cd
product-name: eidas
diff --git a/.github/workflows/call-maventests.yml b/.github/workflows/call-maventests.yml
index 416d2cd..2ea161a 100644
--- a/.github/workflows/call-maventests.yml
+++ b/.github/workflows/call-maventests.yml
@@ -9,7 +9,7 @@ jobs:
build:
runs-on: ubuntu-latest
env:
- IMAGE_NAME: my-local-registery/eu-eidas-proxy
+ IMAGE_NAME: my-local-registery/eidas-proxy
DOCKLE_HOST: "unix:///var/run/docker.sock"
steps:
- name: Set image tag
diff --git a/README.md b/README.md
index 01a090a..5abf8a4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# eidas-generic-proxy
+# eidas-proxy
Norwegian generic eIDAS-proxy build from eIDAS source.
See these documents in https://ec.europa.eu/digital-building-blocks/sites/display/DIGITAL/eIDAS-Node+version+2.7.1:
@@ -7,13 +7,12 @@ See these documents in https://ec.europa.eu/digital-building-blocks/sites/displa
* eIDAS-Node Installation and Configuration Guide v2.7.1.pdf
-### Run eidas-generic-proxy as docker-compose on your machine for local testing
+### Run eidas-proxy as docker-compose on your machine for local testing
Add the following to your /etc/hosts file:
```
# eIDAS local dev
-127.0.0.1 eu-eidas-proxy
-127.0.0.1 eidas-generic-proxy
+127.0.0.1 eidas-proxy
```
Start docker containers:
@@ -21,5 +20,5 @@ Start docker containers:
docker-compose up --build
```
-### Run eidas-generic-proxy in test/production environment
-Systest: eu-eidas-proxy.idporten.dev , but will be moved to proxy.eidasnode.dev soon.
\ No newline at end of file
+### Run eidas-proxy in test/production environment
+Systest: eidas-proxy.idporten.dev , but will be moved to proxy.eidasnode.dev soon.
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3ad515f..63a254b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,7 +17,7 @@ services:
- eidas
command: redis-server --maxmemory-policy allkeys-lru
- eu-eidas-proxy:
+ eidas-proxy:
build:
context: .
dockerfile: docker/dev.Dockerfile
@@ -33,7 +33,7 @@ services:
ports:
- "8082:8082"
healthcheck:
- test: wget --no-verbose --tries=1 http://eu-eidas-proxy:8082/ServiceMetadata || exit 1
+ test: wget --no-verbose --tries=1 http://eidas-proxy:8082/ServiceMetadata || exit 1
interval: 5s
start_period: 8s
timeout: 5s
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4741156..036c524 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,10 +26,10 @@ RUN mkdir -p eidas-proxy-config/
COPY docker/proxy/config/ eidas-proxy-config
# Replace base URLs in eidas.xml and metadata (whitelist). TODO: move to environment specific k8 config
-RUN sed -i 's/EU-PROXY-URL/https:\/\/eu-eidas-proxy.idporten.dev/g' eidas-proxy-config/eidas.xml
RUN sed -i 's/EIDAS-PROXY-URL/https:\/\/eidas-proxy.idporten.dev/g' eidas-proxy-config/eidas.xml
+RUN sed -i 's/IDPORTEN-PROXY-URL/https:\/\/idporten-proxy.idporten.dev/g' eidas-proxy-config/eidas.xml
RUN sed -i 's/DEMOLAND-CA-URL/https:\/\/eidas-demo-ca.idporten.dev/g' eidas-proxy-config/metadata/MetadataFetcher_Service.properties
-RUN sed -i 's/NO-EU-EIDAS-CONNECTOR-URL/https:\/\/eu-eidas-connector.idporten.dev/g' eidas-proxy-config/metadata/MetadataFetcher_Service.properties
+RUN sed -i 's/NO-EU-EIDAS-CONNECTOR-URL/https:\/\/eidas-connector.idporten.dev/g' eidas-proxy-config/metadata/MetadataFetcher_Service.properties
FROM tomcat:9.0-jre11-temurin-jammy
diff --git a/docker/dev.Dockerfile b/docker/dev.Dockerfile
index 0ee2a9d..ced34ca 100644
--- a/docker/dev.Dockerfile
+++ b/docker/dev.Dockerfile
@@ -26,10 +26,10 @@ RUN mkdir -p eidas-proxy-config/
COPY docker/proxy/config/ eidas-proxy-config
# Replace base URLs in eidas.xml and metadata (whitelist).
-RUN sed -i 's/EU-PROXY-URL/http:\/\/eu-eidas-proxy:8082/g' eidas-proxy-config/eidas.xml
-RUN sed -i 's/EIDAS-PROXY-URL/http:\/\/eidas-proxy:8077/g' eidas-proxy-config/eidas.xml
+RUN sed -i 's/EIDAS-PROXY-URL/http:\/\/eidas-proxy:8082/g' eidas-proxy-config/eidas.xml
+RUN sed -i 's/IDPORTEN-PROXY-URL/http:\/\/idporten-proxy:8077/g' eidas-proxy-config/eidas.xml
RUN sed -i 's/DEMOLAND-CA-URL/http:\/\/eidas-demo-ca:8080/g' eidas-proxy-config/metadata/MetadataFetcher_Service.properties
-RUN sed -i 's/NO-EU-EIDAS-CONNECTOR-URL/http:\/\/eu-eidas-connector:8083/g' eidas-proxy-config/metadata/MetadataFetcher_Service.properties
+RUN sed -i 's/NO-EU-EIDAS-CONNECTOR-URL/http:\/\/eidas-connector:8083/g' eidas-proxy-config/metadata/MetadataFetcher_Service.properties
# Only for local development
RUN sed -i 's/metadata.restrict.http">true/metadata.restrict.http">false/g' eidas-proxy-config/eidas.xml
diff --git a/docker/proxy/README.md b/docker/proxy/README.md
index 6b5cec6..8c75a72 100644
--- a/docker/proxy/README.md
+++ b/docker/proxy/README.md
@@ -1,11 +1,11 @@
-# EU-eIDAS-proxy Configuration
+# eIDAS-proxy Configuration
-Folder `config` contains the configuration files for the EU-eIDAS-proxy.
+Folder `config` contains the configuration files for the eIDAS-proxy.
## URLs
Placeholders to change:
-* `EU-PROXY-URL` - URL of this application (eu-eidas-proxy) used in eidas.xml
-* `EIDAS-PROXY-URL` - URL to eidas-proxy (SpecificProxyService) used in eidas.xml
+* `EIDAS-PROXY-URL` - URL of this application (eidas-proxy) used in eidas.xml
+* `IDPORTEN-PROXY-URL` - URL to idporten-proxy (SpecificProxyService) used in eidas.xml
* `DEMOLAND-CA-URL` - URL of the CA of the DEMOLAND country whitelisted in metadata/ folder. Also add foreign countries EidasNodeConnector to this list.
* `NO-EU-EIDAS-CONNECTOR-URL` - URL of Norway NO country whitelisted in metadata/ folder. Also add foreign countries EidasNodeConnector to this list.
diff --git a/docker/proxy/config/eidas.xml b/docker/proxy/config/eidas.xml
index 6eb83ab..b41f98d 100644
--- a/docker/proxy/config/eidas.xml
+++ b/docker/proxy/config/eidas.xml
@@ -24,7 +24,7 @@
NO
- EU-PROXY-URL/ServiceMetadata
+ EIDAS-PROXY-URL/ServiceMetadata
servicedesk@digdir.no
@@ -43,12 +43,12 @@
https://www.digdir.no/
- EU-PROXY-URL/ColleagueRequest
- EU-PROXY-URL/ColleagueRequest
+ EIDAS-PROXY-URL/ColleagueRequest
+ EIDAS-PROXY-URL/ColleagueRequest
- EU-PROXY-URL/cspReportHandler
+ EIDAS-PROXY-URL/cspReportHandler
NO
@@ -56,7 +56,7 @@
true
- EIDAS-PROXY-URL/ProxyServiceRequest
+ IDPORTEN-PROXY-URL/ProxyServiceRequest
https://dummy.no