Compare commits

...

5 Commits

Author SHA1 Message Date
c7a38e5b40 this 2026-02-03 16:02:01 +01:00
f6ed70f5a4 t4est 2026-02-03 15:59:37 +01:00
c80866c4bd Fix path formatting in .gitignore for workspace.json 2026-02-03 15:57:24 +01:00
38bae1047c Merge remote-tracking branch 'origin/main' 2026-02-03 15:56:23 +01:00
5218d0046f vault backup: 2026-02-03 15:54:52 2026-02-03 15:54:52 +01:00
4 changed files with 76 additions and 50 deletions

3
.gitignore vendored
View File

@@ -1 +1,2 @@
.obsidian/workspace.json .obsidian/workspace.json
*/workspace.json

View File

@@ -1,9 +1,9 @@
{ {
"commitMessage": "vault backup: {{date}}", "commitMessage": "vault backup: {{date}}",
"commitDateFormat": "YYYY-MM-DD HH:mm:ss", "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
"autoSaveInterval": 0, "autoSaveInterval": 90,
"autoPushInterval": 0, "autoPushInterval": 1,
"autoPullInterval": 0, "autoPullInterval": 45,
"autoPullOnBoot": false, "autoPullOnBoot": false,
"disablePush": false, "disablePush": false,
"pullBeforePush": true, "pullBeforePush": true,
@@ -14,7 +14,7 @@
"updateSubmodules": false, "updateSubmodules": false,
"syncMethod": "merge", "syncMethod": "merge",
"customMessageOnAutoBackup": false, "customMessageOnAutoBackup": false,
"autoBackupAfterFileChange": false, "autoBackupAfterFileChange": true,
"treeStructure": false, "treeStructure": false,
"refreshSourceControl": true, "refreshSourceControl": true,
"basePath": "", "basePath": "",
@@ -50,7 +50,9 @@
}, },
"textColorCss": "var(--text-muted)", "textColorCss": "var(--text-muted)",
"ignoreWhitespace": false, "ignoreWhitespace": false,
"gutterSpacingFallbackLength": 5 "gutterSpacingFallbackLength": 5,
"lastShownAuthorDisplay": "initials",
"lastShownDateTimeFormatOptions": "date"
}, },
"autoCommitMessage": "vault backup: {{date}}" "autoCommitMessage": "vault backup: {{date}}"
} }

View File

@@ -4,25 +4,39 @@
"type": "split", "type": "split",
"children": [ "children": [
{ {
"id": "77e7fdc4b60086bf", "id": "965d43683d278f31",
"type": "tabs", "type": "tabs",
"children": [ "children": [
{ {
"id": "6ade3d1c698221ee", "id": "a1b43276ca9ba4a4",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Semester 7/INKOM/Klausurvorbereitung.md", "file": "Semester 7/INKOM/Vorlesung 12.md",
"mode": "source", "mode": "source",
"source": false "source": false
}, },
"icon": "lucide-file", "icon": "lucide-file",
"title": "Klausurvorbereitung" "title": "Vorlesung 12"
}
},
{
"id": "9ef60fc87229ac1f",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "conflict-files-obsidian-git"
} }
} }
], ],
"currentTab": 2 "currentTab": 1
} }
], ],
"direction": "vertical" "direction": "vertical"
@@ -192,62 +206,53 @@
"workspaces:Manage workspace layouts": false "workspaces:Manage workspace layouts": false
} }
}, },
"active": "6ade3d1c698221ee", "active": "9ef60fc87229ac1f",
"lastOpenFiles": [ "lastOpenFiles": [
"Semester 7/INKOM/figures/Pasted image 20260128171756.png", "Semester 7/INKOM/Vorlesung 12.md",
"Semester 7/INKOM/Klausurvorbereitung.md", "conflict-files-obsidian-git.md",
"Semester 7/Robocup/REDIG/Übungsblatt 7.md",
"Semester 7/Robocup/REDIG/Vorlesung 9.md",
"Semester 7/Robocup/REDIG/Vorlesung 8.md",
"Semester 7/Robocup/REDIG/Vorlesung 5.md",
"Semester 7/Robocup/REDIG/Vorlesung 3.md",
"Semester 7/Robocup/REDIG/Vorlesung 2.md",
"Semester 7/Robocup/REDIG/Vorlesung 10.md",
"Semester 7/Robocup/REDIG/Vorlesung 1.md",
"Semester 7/Robocup/REDIG/Untitled.md",
"Semester 7/Robocup/REDIG/Nackenbruch.drawio.png",
"Semester 7/Robocup/REDIG/Architektur.png",
"Semester 7/Robocup/REDIG",
"Semester 7/INKOM/figures/Pasted image 20260128171830.png", "Semester 7/INKOM/figures/Pasted image 20260128171830.png",
"Semester 7/Bildverarbeitung/Vorlesung 1.md", "Semester 7/INKOM/figures/Pasted image 20260128171756.png",
"Semester 7/INKOM/figures/Pasted image 20260127171242.png", "Semester 7/INKOM/figures/Pasted image 20260127171242.png",
"Semester 7/INKOM/figures/Pasted image 20260127170559.png", "Semester 7/INKOM/figures/Pasted image 20260127170559.png",
"Semester 8/Bewerbungen/Trenz.md", "Semester 7/INKOM/Klausurvorbereitung.md",
"Semester 8/Bewerbungen/CompaxDigital.md", "Semester 7/REDIG/Vorlesung 9.md",
"Semester 8/Bewerbungen/Salt and Pepper.md", "Semester 7/REDIG/Vorlesung 10.md",
"Semester 8/Bewerbungen/Untitled", "Semester 6/List of Shame.md",
"Semester 8/Bewerbungen/Airbus.md", "Semester 7/INKOM/Vorlesung 11.md",
"Semester 8/Bewerbungen/Dekra poopoo.md", "Semester 7/Medienheorie/Vorlesung 10.md",
"Semester 8/Bewerbungen/Ferchau.md", "Semester 7/INKOM/Vorlesung 3.md",
"Semester 8/Bewerbungen", "Semester 7/INKOM/Vorlesung 2.md",
"Semester 7/Bildverarbeitung/Wissenschaftliche Arbeiten (nach Dek. Trittin).md", "Semester 7/INKOM/Vorlesung 1.md",
"Semester 7/INKOM/Labor 04.md",
"Semester 7/INKOM/Vorlesung 8.md", "Semester 7/INKOM/Vorlesung 8.md",
"Semester 7/INKOM/Vorlesung 9.md", "Semester 7/INKOM/Vorlesung 9.md",
"Semester 7/INKOM/Vorlesung 10.md", "Semester 7/INKOM/Vorlesung 10.md",
"Semester 7/INKOM/Vorlesung 11.md", "Semester 7/REDIG/Untitled.md",
"Untitled.base", "Semester 7/REDIG/Architektur.png",
"Semester 7/INKOM/Untitled 3.base",
"Semester 7/INKOM/Untitled 2.base",
"Semester 7/Robocup/REDIG/Vorlesung 10.md",
"Semester 7/Medienheorie/Vorlesung 10.md",
"Untitled 1.base",
"Semester 8/Bachelorthesis/Zu klärende Fragen.md",
"Semester 6/List of Shame.md",
"Semester 7/Robocup/REDIG/Vorlesung 9.md",
"Semester 7/Robocup/REDIG/Untitled.md",
"Semester 7/Robocup/REDIG/Architektur.png",
"Semester 7/INKOM/Untitled.base",
"Semester 7/INKOM/Untitled 1.base",
"Semester 7/INKOM/Labor 04.md",
"Semester 7/Medienheorie/Hausaufgabe Speichermedien.md",
"Semester 7/Medienheorie/Vorlesung 9.md", "Semester 7/Medienheorie/Vorlesung 9.md",
"Semester 6/Veranstaltungsplan.md",
"Semester 7/INKOM/Untitled 1.base", "Semester 7/INKOM/Untitled 1.base",
"Semester 7/INKOM/Untitled.base", "Semester 7/INKOM/Untitled.base",
"Semester 7/Medienheorie/Hausaufgabe Speichermedien.md",
"Semester 7/Robocup/Pain.pptx", "Semester 7/Robocup/Pain.pptx",
"Semester 7/INKOM/präsi_2FA/2FA.pptx", "Semester 7/INKOM/präsi_2FA/2FA.pptx",
"Semester 8/Bachelorthesis/Zu klärende Fragen.md",
"Semester 8/Bachelorthesis", "Semester 8/Bachelorthesis",
"Semester 8", "Semester 8",
"Semester 7/Medienheorie/Pasted image 20251214161803.png", "Semester 7/Medienheorie/Pasted image 20251214161803.png",
"Semester 7/INKOM/präsi_2FA/Untitled.base", "Semester 7/INKOM/präsi_2FA/Untitled.base",
"Semester 7/INKOM/präsi_2FA/Untitled 8.base", "Semester 7/INKOM/präsi_2FA/Untitled 8.base",
"Semester 7/INKOM/präsi_2FA/Recherche.md", "Semester 7/INKOM/präsi_2FA/Untitled 7.base",
"Semester 7/INKOM/präsi_2FA/Quellen.md",
"Semester 7/INKOM/präsi_2FA/Vorgehensweise.md",
"Semester 7/INKOM/figures/Pasted image 20251107093559.png", "Semester 7/INKOM/figures/Pasted image 20251107093559.png",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708193937.png", "Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708193937.png"
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708193917.png",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708185932.png",
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708185618.png"
] ]
} }

View File

@@ -0,0 +1,18 @@
# Klausurvorbereitung
## Netzwerkadresse bestimmen
172\. 16.100.34/30
Netzmaske: 255.255.255.252
Netzadresse: 172.16.100.32
Broadcast: 172.16.100.35
anderes Beispiel:
192.168.0.0
255.255.240.0
logisch betrachtet /20 CIDR Netz
anderes Beispiel:
10.0.50.0
255.255.255.252 -> /30 Netz
Netzadresse: 10.0.50.0 (?)