From b67ad9ed0c6c189bfec3fae746810d1d4392ff93 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 14:47:49 +0200 Subject: [PATCH 01/20] Bump Zabbix, change channel: 20.04 -> 22.04 --- setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.sh b/setup.sh index 96092c3..83b579d 100755 --- a/setup.sh +++ b/setup.sh @@ -28,8 +28,8 @@ vmware-toolbox-cmd timesync enable hwclock -w # Install zabbix repo -wget -O /tmp/zabbix-release_5.0-1+focal_all.deb https://repo.zabbix.com/zabbix/5.0/ubuntu/pool/main/z/zabbix-release/zabbix-release_5.0-1+focal_all.deb -dpkg -i /tmp/zabbix-release_5.0-1+focal_all.deb +wget -O /tmp/zabbix-release_5.0-2+ubuntu22.04_all.deb https://repo.zabbix.com/zabbix/5.0/ubuntu/pool/main/z/zabbix-release/zabbix-release_5.0-2+ubuntu22.04_all.deb +dpkg -i /tmp/zabbix-release_5.0-2+ubuntu22.04_all.deb # Update packages From f90204b01249e98a3e76bca4db351d7d6b0660e2 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 14:48:24 +0200 Subject: [PATCH 02/20] Remove codeblocks as an IDE --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 83b579d..bdfef6d 100755 --- a/setup.sh +++ b/setup.sh @@ -52,7 +52,7 @@ apt -y install build-essential autoconf autotools-dev # Install packages needed by contestants -apt -y install openjdk-11-jdk-headless codeblocks emacs \ +apt -y install openjdk-11-jdk-headless emacs \ geany gedit joe kate kdevelop nano vim vim-gtk3 \ ddd valgrind visualvm ruby python3-pip konsole From 4dd3ce307c67b85145407c6e03ce3c51002c081f Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 15:55:25 +0200 Subject: [PATCH 03/20] Remove eclipse --- setup.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/setup.sh b/setup.sh index bdfef6d..07cb6c7 100755 --- a/setup.sh +++ b/setup.sh @@ -62,19 +62,6 @@ snap install --classic atom snap install --classic code snap install --classic sublime-text -# Install Eclipse -aria2c -x4 -d /tmp -o eclipse.tar.gz "http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/2021-09/R/eclipse-java-2021-09-R-linux-gtk-x86_64.tar.gz" -tar zxf /tmp/eclipse.tar.gz -C /opt -rm /tmp/eclipse.tar.gz -wget -O /usr/share/pixmaps/eclipse.png "https://icon-icons.com/downloadimage.php?id=94656&root=1381/PNG/64/&file=eclipse_94656.png" -cat - < /usr/share/applications/eclipse.desktop -[Desktop Entry] -Name=Eclipse -Exec=/opt/eclipse/eclipse -Type=Application -Icon=eclipse -EOM - # Install python3 libraries pip3 install matplotlib From 5755764dae6bd5d2322e3d52c7260abd628542a5 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 15:59:07 +0200 Subject: [PATCH 04/20] Bump VSCode extension versions --- setup.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.sh b/setup.sh index 07cb6c7..c1a86bf 100755 --- a/setup.sh +++ b/setup.sh @@ -82,9 +82,10 @@ mkdir -p /opt/ioi/store/screenshots mkdir -p /opt/ioi/store/submissions mkdir -p /opt/ioi/config/ssh -aria2c -x 4 -d /tmp -o cpptools-linux.vsix "https://github.com/microsoft/vscode-cpptools/releases/download/v1.10.7/cpptools-linux.vsix" -aria2c -x 4 -d /tmp -o cpp-compile-run.vsix "https://github.com/danielpinto8zz6/c-cpp-compile-run/releases/download/v1.0.15/c-cpp-compile-run-1.0.15.vsix" -wget -O /tmp/vscodevim.vsix "https://github.com/VSCodeVim/Vim/releases/download/v1.23.0/vim-1.23.0.vsix" +# Latest as of 2023-05-20 +aria2c -x 4 -d /tmp -o cpptools-linux.vsix "https://github.com/microsoft/vscode-cpptools/releases/download/v1.15.4/cpptools-linux.vsix" +aria2c -x 4 -d /tmp -o cpp-compile-run.vsix "https://github.com/danielpinto8zz6/c-cpp-compile-run/releases/download/v1.0.45/c-cpp-compile-run-1.0.45.vsix" +wget -O /tmp/vscodevim.vsix "https://github.com/VSCodeVim/Vim/releases/download/v1.25.2/vim-1.25.2.vsix" rm -rf /tmp/vscode mkdir /tmp/vscode mkdir /tmp/vscode-extensions From 62048f8e8c8ccf6b48bcccd68d2f2f47341fbcb0 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 16:00:38 +0200 Subject: [PATCH 05/20] Bump timezone in setup.sh --- setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.sh b/setup.sh index c1a86bf..00c0e7f 100755 --- a/setup.sh +++ b/setup.sh @@ -23,7 +23,7 @@ fi # Fix up date/time -timedatectl set-timezone Asia/Jakarta +timedatectl set-timezone Europe/Budapest vmware-toolbox-cmd timesync enable hwclock -w @@ -96,7 +96,7 @@ cp /tmp/vscodevim.vsix /opt/ioi/misc rm -rf /tmp/vscode-extensions # Add default timezone -echo "Asia/Jakarta" > /opt/ioi/config/timezone +echo "Europe/Budapest" > /opt/ioi/config/timezone # Default to enable screensaver lock touch /opt/ioi/config/screenlock From 5fd4b39ff57394b1654604577d2386a79c457583 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 16:15:03 +0200 Subject: [PATCH 06/20] Fix missing folder --- sbin/mkioiuser.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/mkioiuser.sh b/sbin/mkioiuser.sh index c818167..32b99fe 100755 --- a/sbin/mkioiuser.sh +++ b/sbin/mkioiuser.sh @@ -31,6 +31,7 @@ echo 'TZ=$(cat /opt/ioi/config/timezone)' >> ~ioi/.profile echo 'export TZ' >> ~ioi/.profile # Mark Gnome's initial setup as complete +sudo -Hu ioi bash -c 'mkdir -p ~/.config' sudo -Hu ioi bash -c 'echo yes > ~/.config/gnome-initial-setup-done' sudo -Hu ioi bash -c 'mkdir -p ~ioi/.local/share/gnome-shell/extensions' From 9572c793fe69363d7b2fed3d905a836646881d1d Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 16:57:28 +0200 Subject: [PATCH 07/20] Fix missing directory --- setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.sh b/setup.sh index 00c0e7f..816ee8b 100755 --- a/setup.sh +++ b/setup.sh @@ -125,6 +125,7 @@ EOM # Don't list ansible user at login screen +mkdir -p /var/lib/AccountsService/users cat - < /var/lib/AccountsService/users/ansible [User] Language= From fa6be28330cf9686d9d5052861830d33f36a22ce Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 17:41:12 +0200 Subject: [PATCH 08/20] Remove openjdk --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 816ee8b..e5dc25e 100755 --- a/setup.sh +++ b/setup.sh @@ -52,7 +52,7 @@ apt -y install build-essential autoconf autotools-dev # Install packages needed by contestants -apt -y install openjdk-11-jdk-headless emacs \ +apt -y install emacs \ geany gedit joe kate kdevelop nano vim vim-gtk3 \ ddd valgrind visualvm ruby python3-pip konsole From e08a805f1c7144c981b5b0e88d04e35c1edb5999 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 17:41:54 +0200 Subject: [PATCH 09/20] Bump packages-to-remove versions --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index e5dc25e..17d5062 100755 --- a/setup.sh +++ b/setup.sh @@ -198,7 +198,7 @@ apt -y install `dpkg-query -Wf '${Package}\n' | grep linux-modules-` # Remove unneeded packages apt -y remove gnome-power-manager brltty extra-cmake-modules -apt -y remove llvm-9-dev zlib1g-dev libobjc-9-dev libx11-dev dpkg-dev manpages-dev +apt -y remove llvm-13-dev zlib1g-dev libobjc-11-dev libx11-dev dpkg-dev manpages-dev apt -y remove linux-firmware memtest86+ apt -y remove network-manager-openvpn network-manager-openvpn-gnome openvpn apt -y remove gnome-getting-started-docs-it gnome-getting-started-docs-ru \ From 5f59c96e142e560434f2dbc057d1f07fa363ff58 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 17:46:08 +0200 Subject: [PATCH 10/20] 22.04: Remove nonexistent packages --- setup.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.sh b/setup.sh index 17d5062..09f621c 100755 --- a/setup.sh +++ b/setup.sh @@ -201,8 +201,6 @@ apt -y remove gnome-power-manager brltty extra-cmake-modules apt -y remove llvm-13-dev zlib1g-dev libobjc-11-dev libx11-dev dpkg-dev manpages-dev apt -y remove linux-firmware memtest86+ apt -y remove network-manager-openvpn network-manager-openvpn-gnome openvpn -apt -y remove gnome-getting-started-docs-it gnome-getting-started-docs-ru \ - gnome-getting-started-docs-es gnome-getting-started-docs-fr gnome-getting-started-docs-de apt -y remove build-essential autoconf autotools-dev apt -y remove `dpkg-query -Wf '${Package}\n' | grep linux-header` From 0d63acad298d6c8ff9932fd92fcd446de21f3c50 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 18:50:43 +0200 Subject: [PATCH 11/20] Update: Bye heroku. Google Webfonts Helper is now available at gwfh.mranftl.com. --- setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.sh b/setup.sh index 09f621c..8cd3bf7 100755 --- a/setup.sh +++ b/setup.sh @@ -217,8 +217,8 @@ depmod -a cp -a html /opt/ioi/html mkdir -p /opt/ioi/html/fonts -wget -O /tmp/fira-sans.zip "https://google-webfonts-helper.herokuapp.com/api/fonts/fira-sans?download=zip&subsets=latin&variants=regular" -wget -O /tmp/share.zip "https://google-webfonts-helper.herokuapp.com/api/fonts/share?download=zip&subsets=latin&variants=regular" +wget -O /tmp/fira-sans.zip "https://gwfh.mranftl.com/api/fonts/fira-sans?download=zip&subsets=latin&variants=regular" +wget -O /tmp/share.zip "https://gwfh.mranftl.com/api/fonts/share?download=zip&subsets=latin&variants=regular" unzip -o /tmp/fira-sans.zip -d /opt/ioi/html/fonts unzip -o /tmp/share.zip -d /opt/ioi/html/fonts rm /tmp/fira-sans.zip From a9cdf4d60b234181849e20248bf8ce64fb7c7710 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 18:56:38 +0200 Subject: [PATCH 12/20] Install atd --- setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.sh b/setup.sh index 8cd3bf7..a240d08 100755 --- a/setup.sh +++ b/setup.sh @@ -276,6 +276,9 @@ systemctl disable multipathd # Disable cloud-init touch /etc/cloud/cloud-init.disabled +# At was not installed by default somewhy +apt install at + # Don't stsart atd service systemctl disable atd From aafbe427d6b449b1c0ebccd8e3ab4c42d3056593 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sat, 20 May 2023 19:05:59 +0200 Subject: [PATCH 13/20] Fix: dash does not support (( math expr )) --- sbin/startatd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/startatd.sh b/sbin/startatd.sh index 62590d8..d4bd8a2 100755 --- a/sbin/startatd.sh +++ b/sbin/startatd.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash COUNT=0 TIMEOUT=60 From e4fc3861454004ccea9e42773b1b1637545c6311 Mon Sep 17 00:00:00 2001 From: radl97 Date: Sun, 21 May 2023 15:25:49 +0200 Subject: [PATCH 14/20] Revert "Remove eclipse" This reverts commit 4dd3ce307c67b85145407c6e03ce3c51002c081f. --- setup.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/setup.sh b/setup.sh index a240d08..1a4e37c 100755 --- a/setup.sh +++ b/setup.sh @@ -62,6 +62,19 @@ snap install --classic atom snap install --classic code snap install --classic sublime-text +# Install Eclipse +aria2c -x4 -d /tmp -o eclipse.tar.gz "http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/2021-09/R/eclipse-java-2021-09-R-linux-gtk-x86_64.tar.gz" +tar zxf /tmp/eclipse.tar.gz -C /opt +rm /tmp/eclipse.tar.gz +wget -O /usr/share/pixmaps/eclipse.png "https://icon-icons.com/downloadimage.php?id=94656&root=1381/PNG/64/&file=eclipse_94656.png" +cat - < /usr/share/applications/eclipse.desktop +[Desktop Entry] +Name=Eclipse +Exec=/opt/eclipse/eclipse +Type=Application +Icon=eclipse +EOM + # Install python3 libraries pip3 install matplotlib From b20cd95efe7c41a790281e0b82305d39b1f5a080 Mon Sep 17 00:00:00 2001 From: radl97 Date: Mon, 22 May 2023 14:25:37 +0200 Subject: [PATCH 15/20] Remove logkeys management scripts --- setup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.sh b/setup.sh index 1a4e37c..ac74782 100755 --- a/setup.sh +++ b/setup.sh @@ -199,6 +199,8 @@ cd build ../configure make make install +# These SUID management scripts are not needed +rm /usr/local/bin/llk /usr/local/bin/llkk cp ../keymaps/en_US_ubuntu_1204.map /opt/ioi/misc/ popd rm -rf $WORKDIR From 33932e922661ad7a38f34a323b8883cc3127839b Mon Sep 17 00:00:00 2001 From: radl97 Date: Mon, 22 May 2023 14:26:50 +0200 Subject: [PATCH 16/20] Bump Eclipse, use C++ version instead of Java --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index ac74782..fe4b92c 100755 --- a/setup.sh +++ b/setup.sh @@ -63,7 +63,7 @@ snap install --classic code snap install --classic sublime-text # Install Eclipse -aria2c -x4 -d /tmp -o eclipse.tar.gz "http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/2021-09/R/eclipse-java-2021-09-R-linux-gtk-x86_64.tar.gz" +aria2c -x4 -d /tmp -o eclipse.tar.gz "https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/2023-06/M2/eclipse-cpp-2023-06-M2-linux-gtk-x86_64.tar.gz" tar zxf /tmp/eclipse.tar.gz -C /opt rm /tmp/eclipse.tar.gz wget -O /usr/share/pixmaps/eclipse.png "https://icon-icons.com/downloadimage.php?id=94656&root=1381/PNG/64/&file=eclipse_94656.png" From d4fc68ed955166d15f158b8c3d6c3cea99797fbf Mon Sep 17 00:00:00 2001 From: radl97 Date: Thu, 1 Jun 2023 12:55:01 +0200 Subject: [PATCH 17/20] Bump timezone and date in texts --- bin/ioiconf.sh | 4 ++-- bin/ioiexec.sh | 2 +- bin/ioisetup | 2 +- cleanup.sh | 1 + html/index.html | 8 ++++---- html/vm.html | 14 +++++++------- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/bin/ioiconf.sh b/bin/ioiconf.sh index c0e99e3..b1e42a4 100755 --- a/bin/ioiconf.sh +++ b/bin/ioiconf.sh @@ -160,8 +160,8 @@ EOM if [ -f "/usr/share/zoneinfo/$2" ]; then cat - < /opt/ioi/config/timezone diff --git a/bin/ioiexec.sh b/bin/ioiexec.sh index 659b99e..11956ae 100755 --- a/bin/ioiexec.sh +++ b/bin/ioiexec.sh @@ -46,7 +46,7 @@ case $1 in chfn -f "IOI Contestant" ioi echo "Due to some issues, we have disabled VPN connection to CMS." echo "" - echo "For now, open https://cms-public.ioi2022.id on Firefox," + echo "For now, open https://cms-public.nonexistent on Firefox," echo "and log in using the following credentials:" echo "" echo "- Username: $(cat /opt/ioi/run/username.txt)" diff --git a/bin/ioisetup b/bin/ioisetup index ef2be40..15d19c5 100755 --- a/bin/ioisetup +++ b/bin/ioisetup @@ -70,7 +70,7 @@ do_setup() if [ ${retval} -eq 2 ]; then read -d '' -r MSG<<-EOM - Failed to communicate with the IOI 2022 configuration server.\n + Failed to communicate with the IOI 2023 configuration server.\n Please try again. If this persists, please contact the HTC. EOM zenity "$ZENTITLE" $ZENARG \ diff --git a/cleanup.sh b/cleanup.sh index 0ef3656..df9c35e 100755 --- a/cleanup.sh +++ b/cleanup.sh @@ -59,5 +59,6 @@ PARTKEY=$(/opt/ioi/sbin/genkey.sh) echo $PARTKEY echo REMEMBER TO REMOVE SETUP DIRECTORY +echo REMEMBER TO FINALIZE VM IMAGE # vim: ts=4 diff --git a/html/index.html b/html/index.html index 9d63a01..271834a 100644 --- a/html/index.html +++ b/html/index.html @@ -2,7 +2,7 @@ -IOI2022 +IOI2023 -

IOI2022

+

IOI2023

- IOI 2022 + IOI 2023
- CMS WEBSITE + CMS WEBSITE
C/C++ Reference
diff --git a/html/vm.html b/html/vm.html index b0a6113..5ae27c6 100644 --- a/html/vm.html +++ b/html/vm.html @@ -2,7 +2,7 @@ -IOI2022 +IOI2023