diff --git a/README.md b/README.md index dd94fe3e..78818d04 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Add the following lines to Maven `pom.xml` to include the Web eID authentication eu.webeid.security authtoken-validation - 3.1.1 + ${webeid.version} diff --git a/example/scripts/deployment/fab.sh b/example/scripts/deployment/fab.sh index 85af5772..3082939c 100755 --- a/example/scripts/deployment/fab.sh +++ b/example/scripts/deployment/fab.sh @@ -5,11 +5,10 @@ set -eu cd "$( dirname "$0" )" SERVER_ADDRESS=web-eid.eu -SERVER_USER=baron +SERVER_USER=username SERVER_PORT=22 -export WEBEID_DIR='web-eid/web-eid-springboot-example' -export WEBEID_DIR='web-eid/test-web-eid-springboot-example' +export WEBEID_DIR='web-eid/test-server-web-eid-authtoken-validation-java/example' . venv/bin/activate -fab -e -H ${SERVER_USER}@${SERVER_ADDRESS}:${SERVER_PORT} "$@" +~/.local/bin/fab -e -H ${SERVER_USER}@${SERVER_ADDRESS}:${SERVER_PORT} "$@" diff --git a/example/scripts/deployment/fabfile.py b/example/scripts/deployment/fabfile.py index c4612a3e..3211f570 100644 --- a/example/scripts/deployment/fabfile.py +++ b/example/scripts/deployment/fabfile.py @@ -13,6 +13,6 @@ def deploy(c): with c.cd(os.getenv('WEBEID_DIR')): c.run('git pull') c.run('mvn clean package com.google.cloud.tools:jib-maven-plugin:dockerBuild') - c.run('docker-compose down') - c.run('docker-compose up -d') + c.run('docker compose down') + c.run('docker compose up -d') diff --git a/example/src/main/resources/templates/index.html b/example/src/main/resources/templates/index.html index 051ab855..579c3ea3 100644 --- a/example/src/main/resources/templates/index.html +++ b/example/src/main/resources/templates/index.html @@ -9,12 +9,12 @@ Web eID: electronic ID smart cards on the Web @@ -45,8 +45,8 @@

Table of contents

Usage

-

The recommended way of installing Web eID is by installing the latest Open-EID ID-software package. +

The recommended way of installing Web eID is by installing + the latest Open-EID ID-software package. In case you do not need or want to install the Open-EID package, install the latest Web eID packages in Firefox, Chrome, Edge or Safari according to the following instructions:

@@ -61,16 +61,15 @@

Usage

| bash
Note: as of the 2.5 version, Web eID supports Firefox installed via Snap. -
  • on macOS 12 or later, for Firefox and Chrome from here, +
  • on macOS 13 or later, for Firefox and Chrome from + here,
    • -
  • on macOS 12 or later, for Safari, install the extension from App Store, +
  • on macOS 13 or later, for Safari, install the extension from + App Store,
    • -
  • on Windows 10, Windows 11, Windows Server 2016, Windows Server 2019, Windows Server - 2022, - for Firefox, Chrome and Edge from here. +
  • on Windows 10, Windows 11, Windows Server 2019, Windows Server 2022, Windows Server + 2025 for Firefox, Chrome and Edge from + here.