diff --git a/fickit-backend.yml b/fickit-backend.yml index 9036d2f3..10468743 100644 --- a/fickit-backend.yml +++ b/fickit-backend.yml @@ -72,7 +72,7 @@ onboot: - name: admin-ip-setup image: linuxkit/ip:bb250017b05de5e16ac436b1eb19a39c87b5a252 #command: ["/bin/sh", "-c", "ip link add link eth3 name adminiface type vlan id 99; ip a add 172.16.99.219/24 dev adminiface; ip link set eth3 up; ip link set adminiface up; ip r add default via 172.16.99.1; ip a add 172.17.0.2/24 dev vethin-admin; ip link set vethin-admin up; ping -W 10 -c 1 172.16.99.1;" ] - command: ["/bin/sh", "-c", "while read IP; do ip a add ${IP} dev eth3; done < /run/config/ip_config/backend-admin; ip r add default via $(cat /run/config/ip_config/backend-router); ip a add 172.17.0.2/24 dev vethin-admin; ip link set vethin-admin up; ping -W 10 -c 1 $(cat /run/config/ip_config/backend-router); ip a add 10.0.0.1/24 dev eth1; ip link set eth1 up;" ] + command: ["/bin/sh", "-c", "ip link set eth3 up; while read IP; do ip a add ${IP} dev eth3; done < /run/config/ip_config/backend-admin; ip r add default via $(cat /run/config/ip_config/backend-router); ip a add 172.17.0.2/24 dev vethin-admin; ip link set vethin-admin up; ping -W 10 -c 1 $(cat /run/config/ip_config/backend-router); ip a add 10.0.0.1/24 dev eth1; ip link set eth1 up;" ] net: new binds: - /run/config/ip_config/:/run/config/ip_config/:ro diff --git a/fickit-frontend.yml b/fickit-frontend.yml index 3dd28537..5cfe5332 100644 --- a/fickit-frontend.yml +++ b/fickit-frontend.yml @@ -277,14 +277,14 @@ services: image: quay.io/vouch/vouch-proxy:alpine-0.39 env: - VOUCH_ALLOWALLUSERS=true - - VOUCH_COOKIE_DOMAIN=fic.srs.epita.fr + - VOUCH_COOKIE_DOMAIN=live.fic.srs.epita.fr - VOUCH_DOCUMENT_ROOT=/challenge_access - VOUCH_LOGLEVEL=debug - OAUTH_PROVIDER=oidc - OAUTH_CLIENT_ID=epita-challenge - OAUTH_CLIENT_SECRET=N4n7AXzK9kpXt3TmSn8wAgtxqxhGORgcubLaE2g - - OAUTH_CALLBACK_URL=https://fic.srs.epita.fr/challenge_access/auth - - OAUTH_AUTH_URL=https://fic.srs.epita.fr/auth + - OAUTH_CALLBACK_URL=https://live.fic.srs.epita.fr/challenge_access/auth + - OAUTH_AUTH_URL=https://live.fic.srs.epita.fr/auth - OAUTH_TOKEN_URL=http://127.0.0.1:5556/token - OAUTH_USER_INFO_URL=http://127.0.0.1:5556/userinfo - OAUTH_SCOPES=openid,email @@ -407,9 +407,9 @@ files: mode: "0440" - path: etc/unbound/unbound.d/local-zone.conf contents: | - local-zone: "srs.epita.fr" typetransparent - local-data: "fic.srs.epita.fr A 172.23.42.1" - local-data-ptr: "172.23.42.1 fic.srs.epita.fr" + local-zone: "fic.srs.epita.fr" typetransparent + local-data: "live.fic.srs.epita.fr A 172.23.42.1" + local-data-ptr: "172.23.42.1 live.fic.srs.epita.fr" mode: "0440" - path: etc/iptables/rules.v6 contents: |