Merge branch 'main' into jschoone/revive_hacking_session

SovereignCloudStack · Apr 25, 2024 · b93adf0 · b93adf0
2 parents e9e897a + 47ea953
commit b93adf0
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lightning_talks.yml b/lightning_talks.yml
@@ -3,9 +3,16 @@ timezone: Europe/Berlin
 
 events:
   - summary: "Short presentation of the technical preview of the SCS Status Page"
-    begin: 2024-04-18 15:45:00         # uses default timezone above
+      begin: 2024-04-18 15:45:00         # uses default timezone above
+      duration:
+        minutes: 15
+      description: |
+        A short overview of the now available (as a technical preview) SCS Status Page, the new frontend to our Status API Server.
+      location: "https://conf.scs.koeln:8443/SCS-Tech"
+  - summary: "Short presentation of the technical preview about how is a pentesting in SCS"
+    begin: 2024-04-25 15:45:00         # uses default timezone above
     duration:
       minutes: 15
     description: |
-      A short overview of the now available (as a technical preview) SCS Status Page, the new frontend to our Status API Server.
+      A short overview of how we made automatized pentesting in SCS actually.
     location: "https://conf.scs.koeln:8443/SCS-Tech"