diff --git a/platform/cleanup/hard_reset.sh b/platform/cleanup/hard_reset.sh index 8585f13f..65721f0f 100755 --- a/platform/cleanup/hard_reset.sh +++ b/platform/cleanup/hard_reset.sh @@ -24,7 +24,7 @@ ovs-vsctl emer-reset # Delete virtual interfaces except for known system interfaces. for n in $(ip -o link show | awk -F': ' '{print $2}'); do - if [[ ! $n =~ ^(en|lo|eth|docker0|virbr0) ]]; then + if [[ ! $n =~ ^(en|lo|eth|docker0|virbr0|bond0) ]]; then ip link delete $(echo $n | cut -d'@' -f 1) fi done diff --git a/platform/config/aslevel_links.txt b/platform/config/aslevel_links.txt index 23d7aae3..edaea65e 100644 --- a/platform/config/aslevel_links.txt +++ b/platform/config/aslevel_links.txt @@ -285,4 +285,4 @@ 112 CAIR Peer 141 None Peer 1mbit 2.5ms 50ms 1,3,5,7,9,11,13,102,104,106,108,110,114 113 ADDI Peer 114 ADDI Peer 1mbit 2.5ms 50ms 179.113.114.0/24 113 ACCR Peer 146 None Peer 1mbit 2.5ms 50ms 82,84,86,88,90,92,94 -114 ACCR Peer 141 None Peer 1mbit 2.5ms 50ms 1,3,5,7,9,11,13 \ No newline at end of file +114 ACCR Peer 141 None Peer 1mbit 2.5ms 50ms 1,3,5,7,9,11,13 diff --git a/platform/config/aslevel_links_students.txt b/platform/config/aslevel_links_students.txt index aaa37a8b..ea128449 100644 --- a/platform/config/aslevel_links_students.txt +++ b/platform/config/aslevel_links_students.txt @@ -573,4 +573,4 @@ 113 ACCR Peer 146 None Peer 180.146.0.113/24 146 None Peer 113 ACCR Peer 180.146.0.146/24 114 ACCR Peer 141 None Peer 180.141.0.114/24 -141 None Peer 114 ACCR Peer 180.141.0.141/24 \ No newline at end of file +141 None Peer 114 ACCR Peer 180.141.0.141/24 diff --git a/platform/config/l2_switches.txt b/platform/config/l2_switches.txt index c3dc1197..a8f053e2 100644 --- a/platform/config/l2_switches.txt +++ b/platform/config/l2_switches.txt @@ -1,3 +1,3 @@ L2N S1 ACCR 11:11:11:11:11:11 1 L2S S2 CAPE 22:22:22:22:22:22 2 -L2S S3 N/A 33:33:33:33:33:33 3 \ No newline at end of file +L2S S3 N/A 33:33:33:33:33:33 3 diff --git a/platform/config/l3_routers.txt b/platform/config/l3_routers.txt index eb4cbaa4..4f3d1d83 100644 --- a/platform/config/l3_routers.txt +++ b/platform/config/l3_routers.txt @@ -1,8 +1,8 @@ -CAIR N/A routinator:miniinterneteth/d_routinator vtysh +CAIR N/A host:miniinterneteth/d_host vtysh KHAR MATRIX_TARGET host:miniinterneteth/d_host vtysh ADDI N/A host:miniinterneteth/d_host vtysh NAIR MEASUREMENT host:miniinterneteth/d_host vtysh CAPE N/A L2-L2S:miniinterneteth/d_host linux LUAN MATRIX host:miniinterneteth/d_host vtysh KINS DNS host:miniinterneteth/d_host vtysh -ACCR N/A L2-L2N:miniinterneteth/d_host linux \ No newline at end of file +ACCR N/A L2-L2N:miniinterneteth/d_host linux diff --git a/platform/config/l3_routers_krill.txt b/platform/config/l3_routers_krill.txt index d14de85e..82fb1b3f 100644 --- a/platform/config/l3_routers_krill.txt +++ b/platform/config/l3_routers_krill.txt @@ -1,4 +1,4 @@ CAIR MATRIX_TARGET routinator:miniinterneteth/d_routinator vtysh ALL CAIR DNS krill:miniinterneteth/d_krill vtysh ALL CAIR MATRIX N/A vtysh ALL -CAIR MEASUREMENT N/A vtysh ALL \ No newline at end of file +CAIR MEASUREMENT N/A vtysh ALL diff --git a/platform/config/l3_routers_tier1_and_stub.txt b/platform/config/l3_routers_tier1_and_stub.txt index bf99e9d5..38bd6e4a 100644 --- a/platform/config/l3_routers_tier1_and_stub.txt +++ b/platform/config/l3_routers_tier1_and_stub.txt @@ -1,4 +1,4 @@ -CAIR MATRIX_TARGET routinator:miniinterneteth/d_routinator vtysh ALL +CAIR MATRIX_TARGET host:miniinterneteth/d_host vtysh ALL CAIR DNS N/A vtysh ALL CAIR MATRIX N/A vtysh ALL CAIR MEASUREMENT N/A vtysh ALL diff --git a/platform/config/variables.sh b/platform/config/variables.sh index 33491323..cc4dffcc 100644 --- a/platform/config/variables.sh +++ b/platform/config/variables.sh @@ -11,7 +11,7 @@ DOCKERHUB_PREFIX="miniinterneteth/" # This URL will be suggested as the default location for students # to download their configs. It should be publicly accessible via ssh at port # 2000 + X, where X is each AS number. -SSH_URL="duvel.ethz.ch" +SSH_URL="internet.netd.cs.tu-dresden.de" # ============================================================================= # WEBSERVER @@ -21,8 +21,8 @@ SSH_URL="duvel.ethz.ch" # You need to specify the hostname of the server and an email for # LetsEncrypt to be enabled. # UPDATE THOSE VARIABLES. WEBSERVER_HOSTNAME -> hostname of the server and EMAIL -> empty string (for http) -WEBSERVER_HOSTNAME="duvel.ethz.ch" -WEBSERVER_ACME_MAIL="nsg@ethz.ch" +WEBSERVER_HOSTNAME="internet.netd.cs.tu-dresden.de" +WEBSERVER_ACME_MAIL="rechnernetze@tu-dresden.de" # Hostname and ports for the webserver and krill on the host. # (must be publicly available) # you can change http and https ports, but letsencrypt won't work, so its not recommended. @@ -31,7 +31,7 @@ WEBSERVER_PORT_HTTPS="443" # Use the one you want, make sure to make it reachable from outside. WEBSERVER_PORT_KRILL="3000" # Put your timezone here. -WEBSERVER_TZ="Europe/Zurich" +WEBSERVER_TZ="Europe/Berlin" # ============================================================================= # Connections @@ -60,6 +60,7 @@ MATRIX_CONCURRENT_PINGS=500 MATRIX_PING_FLAGS="-c 3 -i 0.01" # Three pings, 10ms interval. # Whether to pause the matrix container after starting it. # Can reduce load when the mini internet is not used immediately. +# Unpause container at any time with `docker container unpause MATRIX` MATRIX_PAUSE_AFTER_START=false # ============================================================================= @@ -67,22 +68,23 @@ MATRIX_PAUSE_AFTER_START=false # ============================================================================= # Whether to enable the history collector. -HISTORY_ENABLED=true +HISTORY_ENABLED=false # Whether to pause the matrix container after starting it. # Can reduce disk usage when the mini internet is not used immediately. +# Unpause container at any time with `docker container unpause HISTORY` HISTORY_PAUSE_AFTER_START=false # How often to fetch update configs and matrix state. -HISTORY_UPDATE_FREQUENCY=$(( 60*60 )) # every hours (in seconds) +HISTORY_UPDATE_FREQUENCY=$(( 60*60 )) # every hour (in seconds) # Timeout for ./save_configs.sh HISTORY_TIMEOUT="300s" # Username and email that will show up on the commit. -HISTORY_GIT_USER="Mini-Internet History" -HISTORY_GIT_EMAIL="nsg@ethz.ch" +HISTORY_GIT_USER="" +HISTORY_GIT_EMAIL="" # URL of the git repository to push the snapshots to; should be accessible. # For example, create a gitlab access token and use it in the URL. # The token needs to have write access to the repository. # HISTORY_GIT_URL="https://gitlab-ci-token:@gitlab.ethz.ch/nsg/lectures/lec_commnet/projects/2024/routing_project/test_history.git" -HISTORY_GIT_URL="https://gitlab-ci-token:-YVnkmi-qC5HxbqHn3_L@gitlab.ethz.ch/nsg/lectures/lec_commnet/projects/2024/routing_project/config-and-matrix-history.git" +HISTORY_GIT_URL="" HISTORY_GIT_BRANCH="main" # switch.db and rpki.cache are binaries that cannot be stored easily in git. # If this option is "true" (recommend), we re-write the git history at every diff --git a/platform/docker_images/history/update_history.sh b/platform/docker_images/history/update_history.sh index edfd01c4..0876cdc7 100755 --- a/platform/docker_images/history/update_history.sh +++ b/platform/docker_images/history/update_history.sh @@ -59,6 +59,18 @@ update_history() { local git_branch=$7 local forget_binaries=$8 +<<<<<<< HEAD +======= + # If a git url is provided, test if it exists, otherwise print error. + git ls-remote "$git_url" > /dev/null 2>&1 + if [ "$?" -ne 0 ]; then + echo "Error! Unable to access '$git_url'" + # Reset to ignore it in the rest of the script. Makes things easier. + git_url="" + fi + + +>>>>>>> zurich/master # Get git directory ready and cd into it. if [ -d $output_dir/.git ]; then echo "Directory $output_dir is already a git repository." @@ -76,9 +88,15 @@ update_history() { git push --set-upstream origin $git_branch fi fi +<<<<<<< HEAD # Ensure we are up-to-date. git pull --rebase -X theirs git push +======= + # Ensure we are up-to-date. Ignore errors (no repo). + git pull --rebase -X theirs 2>/dev/null + git push 2>/dev/null +>>>>>>> zurich/master elif [ -n "$git_url" ]; then if git clone -b $git_branch $git_url $output_dir ; then # Remote branch exists, we are ready. @@ -99,8 +117,14 @@ update_history() { git branch -m $git_branch fi # If the update was interrupted, there may be some changes left. +<<<<<<< HEAD # Clean up the working directory. git reset --hard HEAD +======= + # Clean up the working directory. Ignore errors (empty repo). + git reset --hard HEAD 2>/dev/null + +>>>>>>> zurich/master # Git repository is ready! diff --git a/platform/docker_images/webserver/server/routing_project_server/static/favicon.ico b/platform/docker_images/webserver/server/routing_project_server/static/favicon.ico index 55e443bc..94c53167 100644 Binary files a/platform/docker_images/webserver/server/routing_project_server/static/favicon.ico and b/platform/docker_images/webserver/server/routing_project_server/static/favicon.ico differ diff --git a/platform/docker_images/webserver/server/routing_project_server/static/logo.png b/platform/docker_images/webserver/server/routing_project_server/static/logo.png new file mode 100644 index 00000000..7465bde3 Binary files /dev/null and b/platform/docker_images/webserver/server/routing_project_server/static/logo.png differ diff --git a/platform/docker_images/webserver/server/routing_project_server/static/logo.svg b/platform/docker_images/webserver/server/routing_project_server/static/logo.svg deleted file mode 100644 index 1b69bac0..00000000 --- a/platform/docker_images/webserver/server/routing_project_server/static/logo.svg +++ /dev/null @@ -1,1211 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platform/docker_images/webserver/server/routing_project_server/templates/base.html b/platform/docker_images/webserver/server/routing_project_server/templates/base.html index fe998c02..c7f80ba0 100644 --- a/platform/docker_images/webserver/server/routing_project_server/templates/base.html +++ b/platform/docker_images/webserver/server/routing_project_server/templates/base.html @@ -2,7 +2,6 @@ 'connectivity_matrix': 'matrix', 'looking_glass': 'looking glass', 'as_connections': 'connections', -'krill': 'krill', } -%} @@ -23,11 +22,11 @@ -
+