diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 3e4b0fff..3bf00b99 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -149,6 +149,37 @@ jobs:
# Create a slugified value of the branch
- uses: rlespinasse/github-slug-action@3.1.0
+ - name: Write certificate
+ run: echo "${CERTS_PRIVATE_KEY}" > secret.key && chmod 0600 secret.key
+ env:
+ CERTS_PRIVATE_KEY: ${{ secrets.CERTS_PRIVATE_KEY }}
+
+ - name: Download certificate
+ run: mkdir secrets && scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i secret.key ubuntu@cert.workadventu.re:./config/live/workadventu.re/* secrets/
+
+ - name: Create namespace
+ uses: steebchen/kubectl@v1.0.0
+ env:
+ KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_FILE_BASE64 }}
+ with:
+ args: create namespace workadventure-${{ github.event_name == 'pull_request' && env.GITHUB_HEAD_REF_SLUG || env.GITHUB_REF_SLUG }}
+ continue-on-error: true
+
+ - name: Delete old certificates in namespace
+ uses: steebchen/kubectl@v1.0.0
+ env:
+ KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_FILE_BASE64 }}
+ with:
+ args: -n workadventure-${{ github.event_name == 'pull_request' && env.GITHUB_HEAD_REF_SLUG || env.GITHUB_REF_SLUG }} delete secret certificate-tls
+ continue-on-error: true
+
+ - name: Install certificates in namespace
+ uses: steebchen/kubectl@v1.0.0
+ env:
+ KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_FILE_BASE64 }}
+ with:
+ args: -n workadventure-${{ github.event_name == 'pull_request' && env.GITHUB_HEAD_REF_SLUG || env.GITHUB_REF_SLUG }} create secret tls certificate-tls --key="secrets/privkey.pem" --cert="secrets/fullchain.pem"
+
- name: Deploy
uses: thecodingmachine/deeployer-action@master
env:
@@ -168,4 +199,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
- msg: Environment deployed at https://play.${{ env.GITHUB_HEAD_REF_SLUG }}.test.workadventu.re
+ msg: Environment deployed at https://play-${{ env.GITHUB_HEAD_REF_SLUG }}.test.workadventu.re
diff --git a/deeployer.libsonnet b/deeployer.libsonnet
index f9dd87bd..8d9c2bfd 100644
--- a/deeployer.libsonnet
+++ b/deeployer.libsonnet
@@ -11,8 +11,7 @@
"back1": {
"image": "thecodingmachine/workadventure-back:"+tag,
"host": {
- "url": "api1."+url,
- "https": "enable",
+ "url": "api1-"+url,
"containerPort": 8080
},
"ports": [8080, 50051],
@@ -30,8 +29,7 @@
"back2": {
"image": "thecodingmachine/workadventure-back:"+tag,
"host": {
- "url": "api2."+url,
- "https": "enable",
+ "url": "api2-"+url,
"containerPort": 8080
},
"ports": [8080, 50051],
@@ -50,8 +48,7 @@
"replicas": 2,
"image": "thecodingmachine/workadventure-pusher:"+tag,
"host": {
- "url": "pusher."+url,
- "https": "enable"
+ "url": "pusher-"+url,
},
"ports": [8080],
"env": {
@@ -68,27 +65,25 @@
"front": {
"image": "thecodingmachine/workadventure-front:"+tag,
"host": {
- "url": "play."+url,
- "https": "enable"
+ "url": "play-"+url,
},
"ports": [80],
"env": {
- "PUSHER_URL": "//pusher."+url,
- "UPLOADER_URL": "//uploader."+url,
+ "PUSHER_URL": "//pusher-"+url,
+ "UPLOADER_URL": "//uploader-"+url,
"ADMIN_URL": "//"+url,
"JITSI_URL": env.JITSI_URL,
"SECRET_JITSI_KEY": env.SECRET_JITSI_KEY,
"TURN_SERVER": "turn:coturn.workadventu.re:443,turns:coturn.workadventu.re:443",
"JITSI_PRIVATE_MODE": if env.SECRET_JITSI_KEY != '' then "true" else "false",
- "START_ROOM_URL": "/_/global/maps."+url+"/Floor0/floor0.json"
+ "START_ROOM_URL": "/_/global/maps-"+url+"/Floor0/floor0.json"
//"GA_TRACKING_ID": "UA-10196481-11"
}
},
"uploader": {
"image": "thecodingmachine/workadventure-uploader:"+tag,
"host": {
- "url": "uploader."+url,
- "https": "enable",
+ "url": "uploader-"+url,
"containerPort": 8080
},
"ports": [8080],
@@ -98,16 +93,12 @@
"maps": {
"image": "thecodingmachine/workadventure-maps:"+tag,
"host": {
- "url": "maps."+url,
- "https": "enable"
+ "url": "maps-"+url
},
"ports": [80]
},
},
"config": {
- "https": {
- "mail": "d.negrier@thecodingmachine.com"
- },
k8sextension(k8sConf)::
k8sConf + {
back1+: {
@@ -122,6 +113,14 @@
}
}
}
+ },
+ ingress+: {
+ spec+: {
+ tls+: [{
+ hosts: ["api1-"+url],
+ secretName: "certificate-tls"
+ }]
+ }
}
},
back2+: {
@@ -136,6 +135,14 @@
}
}
}
+ },
+ ingress+: {
+ spec+: {
+ tls+: [{
+ hosts: ["api2-"+url],
+ secretName: "certificate-tls"
+ }]
+ }
}
},
pusher+: {
@@ -150,8 +157,46 @@
}
}
}
- }
- }
+ },
+ ingress+: {
+ spec+: {
+ tls+: [{
+ hosts: ["pusher-"+url],
+ secretName: "certificate-tls"
+ }]
+ }
+ }
+ },
+ front+: {
+ ingress+: {
+ spec+: {
+ tls+: [{
+ hosts: ["play-"+url],
+ secretName: "certificate-tls"
+ }]
+ }
+ }
+ },
+ uploader+: {
+ ingress+: {
+ spec+: {
+ tls+: [{
+ hosts: ["uploader-"+url],
+ secretName: "certificate-tls"
+ }]
+ }
+ }
+ },
+ maps+: {
+ ingress+: {
+ spec+: {
+ tls+: [{
+ hosts: ["maps-"+url],
+ secretName: "certificate-tls"
+ }]
+ }
+ }
+ },
}
}
}
diff --git a/front/src/Components/VisitCard/VisitCard.svelte b/front/src/Components/VisitCard/VisitCard.svelte
index c2e53f0c..ebf22934 100644
--- a/front/src/Components/VisitCard/VisitCard.svelte
+++ b/front/src/Components/VisitCard/VisitCard.svelte
@@ -1,28 +1,64 @@
-
-
-
-
-
+
+ {#if hidden}
+
+ {/if}
+
+ {#if !hidden}
+
+
+
+ {/if}
+
+
+
diff --git a/front/src/Phaser/Login/SelectCharacterScene.ts b/front/src/Phaser/Login/SelectCharacterScene.ts
index 552cd709..0d01bd88 100644
--- a/front/src/Phaser/Login/SelectCharacterScene.ts
+++ b/front/src/Phaser/Login/SelectCharacterScene.ts
@@ -124,10 +124,15 @@ export class SelectCharacterScene extends AbstractCharacterScene {
selectCharacterSceneVisibleStore.set(false);
}
- createCurrentPlayer(): void {
+ createCurrentPlayer(): void {
for (let i = 0; i c.texture.key === playerResource.name)){
+ continue;
+ }
+
const [middleX, middleY] = this.getCharacterPosition();
const player = this.physics.add.sprite(middleX, middleY, playerResource.name, 0);
this.setUpPlayer(player, i);
@@ -258,6 +263,8 @@ export class SelectCharacterScene extends AbstractCharacterScene {
}
if(this.lazyloadingAttempt){
+ //re-render players list
+ this.createCurrentPlayer();
this.moveUser();
this.lazyloadingAttempt = false;
}