From 7210f9e65b0e76c677025354d94b84101f5bc01c Mon Sep 17 00:00:00 2001 From: waldek Date: Thu, 6 May 2021 21:17:11 +0200 Subject: [PATCH] restructures folder layout --- modules/resources/{ => assets}/family_tree.dia | 0 modules/resources/{ => assets}/family_tree.png | Bin modules/resources/{ => assets}/network_abs1.dia | 0 modules/resources/{ => assets}/network_abs2dia | 0 modules/resources/{ => assets}/network_basic.dia | 0 modules/resources/{ => assets}/network_basic.png | Bin modules/resources/{ => assets}/network_big.dia | 0 modules/resources/{ => assets}/network_big.png | Bin .../{ => assets}/network_home_with_pihole.dia | 0 .../{ => assets}/network_home_with_pihole.png | Bin .../{ => assets}/network_home_without_pihole.dia | 0 .../{ => assets}/network_home_without_pihole.png | Bin modules/resources/{ => assets}/network_large.dia | 0 modules/resources/{ => assets}/network_large.png | Bin modules/resources/{ => assets}/network_solo.dia | 0 modules/resources/{ => assets}/network_solo.png | Bin .../{ => assets}/network_solo_detail1.dia | 0 .../{ => assets}/network_solo_detail1.png | Bin .../{ => assets}/network_solo_detail2.dia | 0 .../{ => assets}/network_solo_detail2.png | Bin .../{ => assets}/network_solo_detail3.dia | 0 modules/resources/exercise_networking.md | 14 +++++++------- modules/resources/exercise_pihole.md | 4 ++-- modules/resources/exercise_sftp_family.md | 2 +- modules/resources/exercise_sftp_postproduction.md | 2 +- 25 files changed, 11 insertions(+), 11 deletions(-) rename modules/resources/{ => assets}/family_tree.dia (100%) rename modules/resources/{ => assets}/family_tree.png (100%) rename modules/resources/{ => assets}/network_abs1.dia (100%) rename modules/resources/{ => assets}/network_abs2dia (100%) rename modules/resources/{ => assets}/network_basic.dia (100%) rename modules/resources/{ => assets}/network_basic.png (100%) rename modules/resources/{ => assets}/network_big.dia (100%) rename modules/resources/{ => assets}/network_big.png (100%) rename modules/resources/{ => assets}/network_home_with_pihole.dia (100%) rename modules/resources/{ => assets}/network_home_with_pihole.png (100%) rename modules/resources/{ => assets}/network_home_without_pihole.dia (100%) rename modules/resources/{ => assets}/network_home_without_pihole.png (100%) rename modules/resources/{ => assets}/network_large.dia (100%) rename modules/resources/{ => assets}/network_large.png (100%) rename modules/resources/{ => assets}/network_solo.dia (100%) rename modules/resources/{ => assets}/network_solo.png (100%) rename modules/resources/{ => assets}/network_solo_detail1.dia (100%) rename modules/resources/{ => assets}/network_solo_detail1.png (100%) rename modules/resources/{ => assets}/network_solo_detail2.dia (100%) rename modules/resources/{ => assets}/network_solo_detail2.png (100%) rename modules/resources/{ => assets}/network_solo_detail3.dia (100%) diff --git a/modules/resources/family_tree.dia b/modules/resources/assets/family_tree.dia similarity index 100% rename from modules/resources/family_tree.dia rename to modules/resources/assets/family_tree.dia diff --git a/modules/resources/family_tree.png b/modules/resources/assets/family_tree.png similarity index 100% rename from modules/resources/family_tree.png rename to modules/resources/assets/family_tree.png diff --git a/modules/resources/network_abs1.dia b/modules/resources/assets/network_abs1.dia similarity index 100% rename from modules/resources/network_abs1.dia rename to modules/resources/assets/network_abs1.dia diff --git a/modules/resources/network_abs2dia b/modules/resources/assets/network_abs2dia similarity index 100% rename from modules/resources/network_abs2dia rename to modules/resources/assets/network_abs2dia diff --git a/modules/resources/network_basic.dia b/modules/resources/assets/network_basic.dia similarity index 100% rename from modules/resources/network_basic.dia rename to modules/resources/assets/network_basic.dia diff --git a/modules/resources/network_basic.png b/modules/resources/assets/network_basic.png similarity index 100% rename from modules/resources/network_basic.png rename to modules/resources/assets/network_basic.png diff --git a/modules/resources/network_big.dia b/modules/resources/assets/network_big.dia similarity index 100% rename from modules/resources/network_big.dia rename to modules/resources/assets/network_big.dia diff --git a/modules/resources/network_big.png b/modules/resources/assets/network_big.png similarity index 100% rename from modules/resources/network_big.png rename to modules/resources/assets/network_big.png diff --git a/modules/resources/network_home_with_pihole.dia b/modules/resources/assets/network_home_with_pihole.dia similarity index 100% rename from modules/resources/network_home_with_pihole.dia rename to modules/resources/assets/network_home_with_pihole.dia diff --git a/modules/resources/network_home_with_pihole.png b/modules/resources/assets/network_home_with_pihole.png similarity index 100% rename from modules/resources/network_home_with_pihole.png rename to modules/resources/assets/network_home_with_pihole.png diff --git a/modules/resources/network_home_without_pihole.dia b/modules/resources/assets/network_home_without_pihole.dia similarity index 100% rename from modules/resources/network_home_without_pihole.dia rename to modules/resources/assets/network_home_without_pihole.dia diff --git a/modules/resources/network_home_without_pihole.png b/modules/resources/assets/network_home_without_pihole.png similarity index 100% rename from modules/resources/network_home_without_pihole.png rename to modules/resources/assets/network_home_without_pihole.png diff --git a/modules/resources/network_large.dia b/modules/resources/assets/network_large.dia similarity index 100% rename from modules/resources/network_large.dia rename to modules/resources/assets/network_large.dia diff --git a/modules/resources/network_large.png b/modules/resources/assets/network_large.png similarity index 100% rename from modules/resources/network_large.png rename to modules/resources/assets/network_large.png diff --git a/modules/resources/network_solo.dia b/modules/resources/assets/network_solo.dia similarity index 100% rename from modules/resources/network_solo.dia rename to modules/resources/assets/network_solo.dia diff --git a/modules/resources/network_solo.png b/modules/resources/assets/network_solo.png similarity index 100% rename from modules/resources/network_solo.png rename to modules/resources/assets/network_solo.png diff --git a/modules/resources/network_solo_detail1.dia b/modules/resources/assets/network_solo_detail1.dia similarity index 100% rename from modules/resources/network_solo_detail1.dia rename to modules/resources/assets/network_solo_detail1.dia diff --git a/modules/resources/network_solo_detail1.png b/modules/resources/assets/network_solo_detail1.png similarity index 100% rename from modules/resources/network_solo_detail1.png rename to modules/resources/assets/network_solo_detail1.png diff --git a/modules/resources/network_solo_detail2.dia b/modules/resources/assets/network_solo_detail2.dia similarity index 100% rename from modules/resources/network_solo_detail2.dia rename to modules/resources/assets/network_solo_detail2.dia diff --git a/modules/resources/network_solo_detail2.png b/modules/resources/assets/network_solo_detail2.png similarity index 100% rename from modules/resources/network_solo_detail2.png rename to modules/resources/assets/network_solo_detail2.png diff --git a/modules/resources/network_solo_detail3.dia b/modules/resources/assets/network_solo_detail3.dia similarity index 100% rename from modules/resources/network_solo_detail3.dia rename to modules/resources/assets/network_solo_detail3.dia diff --git a/modules/resources/exercise_networking.md b/modules/resources/exercise_networking.md index 8f1cbdb..3eb8d60 100644 --- a/modules/resources/exercise_networking.md +++ b/modules/resources/exercise_networking.md @@ -23,7 +23,7 @@ iface eth0 inet static gateway 10.0.0.1 ``` -![overview](./network_basic.png) +![overview](./assets/network_basic.png) If you set both machines with addresses in the same range, you should be able to ping each other. Have a go at this until you can make it work. @@ -55,7 +55,7 @@ Do we need more equipment? An overview of what we would like to accomplish can be seen below. -![overview](./network_large.png) +![overview](./assets/network_large.png) In VirtualBox we can add more than one network adapter. On the router machine I would like you to add a second network interface and set it to *bridged mode*. @@ -230,7 +230,7 @@ server=127.0.0.1 If we want to use our DNS server to [push routes](https://en.wikipedia.org/wiki/Routing) to our clients we need to add it to the configuration as well. The syntax is as follows, `121,x.x.x.x/yy,z.z.z.z` where `x.x.x.x` is the IP range, `yy` the netmask and `z.z.z.z` is the via which IP address. You can add as many as you want but there is a practical [limit](https://unix.stackexchange.com/questions/457572/use-dnsmasq-to-pushing-routes-to-my-clients-on-a-small-local-network). -Are wondering what the `121` [means](http://help.sonicwall.com/help/sw/eng/6800/26/2/3/content/Network_DHCP_Server.042.12.htm)? +Are you wondering what the `121` [means](http://help.sonicwall.com/help/sw/eng/6800/26/2/3/content/Network_DHCP_Server.042.12.htm)? ```bash dhcp-option=121,10.0.4.0/24,192.168.0.117 @@ -244,14 +244,14 @@ Once this is operational you can add routes to the mini networks of the other st You have to add routes for each student so maybe a script can come in handy. As I'm running the DHCP and DNS of our LAN I can push these routes to your routers but first you should create them yourself! -![big network](./network_big.png) +![big network](./assets/network_big.png) ## Solo labo Try to go as far as you can with following the network layout below. You'll have to create quite a few virtual machines machines so grouping them and having a consistent naming scheme is advised. -![solo labo layout](./network_solo.png) +![solo labo layout](./assets/network_solo.png) I would break it down as such: @@ -269,7 +269,7 @@ The setup is mirrored on the right side so rinse and repeat. #### The NAT router -![NAT router](./network_solo_detail1.png) +![NAT router](./assets/network_solo_detail1.png) First focus on the machine that will become your NAT router. This part of the exercise is very similar to the static router we made before. @@ -283,7 +283,7 @@ The internal network can be a shared one as the networks are separated and we'll #### The first router -![first router](./network_solo_detail2.png) +![first router](./assets/network_solo_detail2.png) Next up is the first router on the left hand side. This is also a Debian VM but with four network cards attached! diff --git a/modules/resources/exercise_pihole.md b/modules/resources/exercise_pihole.md index b804067..039a615 100644 --- a/modules/resources/exercise_pihole.md +++ b/modules/resources/exercise_pihole.md @@ -17,7 +17,7 @@ Your current situation at home looks probably *very* similar to the image below. You have some sort of router/modem/switch/wireless access point combination box sitting somewhere in your house. To this device you have your PC's, printer, phone's connected either with a cable or over WiFi. -![without pihole](./network_home_without_pihole.png) +![without pihole](./assets/network_home_without_pihole.png) I advise you to take some notes on your network settings *before* starting to mess around with the pihole. Your DNS resolution is probably done by your router and the `DHCP` server for both your wired LAN and wireless WLAN is probably also done by that same box. @@ -46,7 +46,7 @@ Contrary to the setup in class you don't need an extra LAN adaptor, just pluggin You won't be replacing the NAT part of your home network today, just the DNS and DHCP part. Once plugged in your network layout will look similar to the image below. -![with raspberry pi](./network_home_with_pihole.png) +![with raspberry pi](./assets/network_home_with_pihole.png) I recommend you start from a fresh Raspberry PI OS installation, either with or without desktop environment. The raspberry pi should receive an IP address from your *bbox* and you should be able to `ping` devices in your LAN and out onto the internet. diff --git a/modules/resources/exercise_sftp_family.md b/modules/resources/exercise_sftp_family.md index 5aa2e04..dad190a 100644 --- a/modules/resources/exercise_sftp_family.md +++ b/modules/resources/exercise_sftp_family.md @@ -4,7 +4,7 @@ Your larger family has decided you're in charge of hosting a NAS for everybody o In my case my dad has one brother and two sisters an my mum has just two brothers. A *family* tree would look like this. -![family tree](./family_tree.png) +![family tree](./assets/family_tree.png) Some rules I can think of: diff --git a/modules/resources/exercise_sftp_postproduction.md b/modules/resources/exercise_sftp_postproduction.md index 040c59c..e21f5aa 100644 --- a/modules/resources/exercise_sftp_postproduction.md +++ b/modules/resources/exercise_sftp_postproduction.md @@ -56,7 +56,7 @@ I would make a table to visualise the problem. |alex | | | | For ease of use I would make this table in a spreadsheet program such as Libreoffice Calc or Excel. -I created a zip file with all the files that you can download [here](./files.zip). +I created a zip file with all the files that you can download [here](./assets/files.zip). Once you have a good overview of all the users and groups you need to create, try to create the following scripts to make your life easier.