Merge branch 'master' of ssh://ssh.hesge.ch:10572/orestis.malaspin/homepage

.gitlab-ci.yml

@@ -32,7 +32,7 @@ before_script:
 build_and_deploy:
   script:
     - make
-    - rsync -avzz css malaspinas@129.194.185.180:/www/
-    - rsync -avzz figs malaspinas@129.194.185.180:/www/
-    - rsync -avzz index.html malaspinas@129.194.185.180:/www/
-    - blc http://129.194.185.180/ -ro --exclude *.pdf --filter-level 3
+    - rsync -avzz css ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/
+    - rsync -avzz figs ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/
+    - rsync -avzz index.html ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/
+    - blc https://malaspinas.academy -ro --exclude *.pdf --filter-level 3

index.md

@@ -24,7 +24,7 @@ corrige: false
 
 <div align="left">
 <video width="640" poster="figs/intro.svg" height="360" controls="true" autoplay="false">
-   <source src="http://129.194.185.180/videos/malaspinas.mp4" type="video/mp4">
+   <source src="videos/malaspinas.mp4" type="video/mp4">
 </video>
 <iframe poster="figs/intro.svg" title="omhepia's player frame" i18n-title="channel#ShareDialog:playerEmbedFrame|Embed player Frame copied from share dialog" allowfullscreen="true" src="https://mixer.com/embed/player/omhepia?disableLowLatency=1" width="640" height="360"> 
 </iframe>
@@ -116,6 +116,10 @@ La chaîne *mixer.com* de mes cours se trouve sur <https://www.mixer.com/omhepia
 
 ## TP3: Structures de données concurrentes [PDF](tp_concurrence/synchro.pdf), [HTML](tp_concurrence/synchro.html)
 
+## TP4: File et workflow [PDF](tp_concurrence/file_workflow.pdf), [HTML](tp_concurrence/file_workflow.html)
+
+## TP5: Variables de condition [PDF](tp_concurrence/variables_condition.pdf), [HTML](tp_concurrence/variables_condition.html)
+
 :::
 ::::::::::::::