Changes in IOI's 2023 system

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Please complete the following information:**
+
+ - For pre-built, image release version: [VM build version]
+ - For manual build, commit: [none]
+   - I have used autoinstall: [yes/no]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/contestant-feature-request.md

@@ -0,0 +1,20 @@
+---
+name: Contestant feature request
+about: Suggest an idea or tool
+title: ''
+labels: contestant-requests
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

README.md

@@ -4,7 +4,7 @@
 
 Create a VM: 2 VCPU, 4 GB RAM, 25 GB disk.
 
-Install Ubuntu 20.04 server. Defaults work fine (but please uncheck the "Set up this disk as an LVM group" option). Create a user account called `ansible`.
+Install Ubuntu 22.04 server. Defaults work fine (but please uncheck the "Set up this disk as an LVM group" option). Create a user account called `ansible`.
 
 When Ubuntu install completes, clone or copy this repo into a local directory. E.g.:
 

autoinstall/.gitignore

@@ -0,0 +1,5 @@
+disk.img
+contestant-vm.tar.gz
+contestant-vm.vmdk
+ubuntu.iso
+clonezilla.iso

autoinstall/README.md

@@ -0,0 +1,27 @@
+# Installing Ubuntu through autoinstall/cloud-init with Qemu
+
+Run `start-autoinstall.sh` for setting up the disc. (This will call into setup.sh)
+
+After running setup.sh -- done automatically, call `sudo cleanup.sh` in `/home/ansible/contestant-vm` with ansible user, `rm -rf /home/ansible/contestant-vm` and call into `sudo shutdown now`.
+
+For `zerofree` step, you will have to boot into live-disk (`boot-live-disk.sh`), and initiate `zerofree /dev/sda2` from there.
+
+DO NOT boot the disc afterwards: the boot after `cleanup.sh` is special. (the cloud-init script must not be run to create a new SSH identity for each VM)
+
+## Creating a VM image
+
+`qemu-img convert -f qcow2 -O vmdk disk.img contestant-vm.vmdk`
+
+Copy the `contestant-vm.vmdk` file to a freshly created (correctly set up) VM from VMWare.
+
+## Creating a native image with Clonezilla
+
+I've started sshd on my system, so Clonezilla could log in and upload the device image (with a new user `guest`: `sudo useradd -mU guest` and `sudo passwd guest`).
+
+Boot Clonezilla (`start-clonezilla.sh`): for me, it worked with `Other modes of Clonezilla live` and `Clonezilla live (KMS & To RAM)`.
+
+`device-image` -> `ssh_server` (`dhcp` server and tell it to mount `guest@10.0.2.2:/home/guest`), the image will be uploaded there.
+
+---
+
+Select `beginner` and `savedisk`. Select default options from there.

autoinstall/boot-live-disk.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+test -f ubuntu.iso || curl https://www.releases.ubuntu.com/22.04/ubuntu-22.04.2-live-server-amd64.iso -o ubuntu.iso
+
+echo 'You will need to initialize shell (e.g. `init=/bin/bash` kernel parameter in GRUB)'
+echo 'From this shell, run `zerofree /dev/sda2`'
+qemu-system-x86_64 -display gtk -hda disk.img -cdrom ubuntu.iso -m 2048 -net nic -net user -cpu host -machine accel=kvm -boot order=d
+

autoinstall/meta-data

@@ -0,0 +1,2 @@
+instance-id: iid-local01
+local-hostname: cloudimg

autoinstall/start-autoinstall.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -x
+set -e
+
+if [ -z "$OVMF_PATH" ]
+then
+  OVMF_PATH=/usr/share/qemu/OVMF.fd
+fi
+
+# 25G -> https://bugs.launchpad.net/subiquity/+bug/1907128
+qemu-img create -f qcow2 disk.img 50G
+wget -c -O ubuntu.iso https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.2-live-server-amd64.iso
+
+# Open http server for port 8000
+python3 -m http.server &
+HTTP_SRV_PID=$!
+trap 'kill $HTTP_SRV_PID' EXIT
+
+# Make contestant-vm available
+tar czvf contestant-vm.tar.gz --exclude autoinstall --exclude .git --exclude .github -C ../.. contestant-vm
+
+qemu-system-x86_64 -display gtk -hda disk.img -cdrom ubuntu.iso -m 2048 -net nic -net user -cpu host -machine accel=kvm -smbios type=1,serial=ds='nocloud-net;s=http://10.0.2.2:8000/' -bios "$OVMF_PATH"

autoinstall/start-clonezilla.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -x
+set -e
+
+if [ -z "$OVMF_PATH" ]
+then
+  OVMF_PATH=/usr/share/qemu/OVMF.fd
+fi
+
+wget -c -O clonezilla.iso https://kumisystems.dl.sourceforge.net/project/clonezilla/clonezilla_live_stable/3.1.0-22/clonezilla-live-3.1.0-22-amd64.iso
+
+qemu-system-x86_64 -display gtk -hda disk.img -cdrom clonezilla.iso -m 2048 -net nic -net user -cpu host -machine accel=kvm -boot order=d -bios "$OVMF_PATH"

autoinstall/user-data

@@ -0,0 +1,53 @@
+#cloud-config
+autoinstall:
+  version: 1
+  #reporting:
+  #  hook:
+  #    type: webhook
+  #    endpoint: http://example.com/endpoint/path
+  locale: en_US
+  keyboard:
+    layout: us
+  network:
+    network:
+      version: 2
+      ethernets:
+        alleths:
+          match:
+            name: en*
+          dhcp4: yes
+  storage:
+    layout:
+      name: lvm
+  identity:
+    hostname: ioi-0809
+    username: ansible
+    # Note: the real password will be ANSIBLE_PASSWORD
+    # ansible
+    password: $6$NH0tTrHw/4v3.Jbi$6NCVzJ45i3N4HFF1vJpPobpdkGhgBq0t56KAGzjm4/wg1saD8N7akmBMaLbSH.UmpIdmZV8TUaqN2/pDaSSS0.
+  ssh:
+    install-server: yes
+    #authorized-keys:
+    #  - $key
+    allow-pw: no
+  packages:
+    - vim # for basic editing
+    - git # for cloning the repo
+    - curl
+  user-data:
+    # Will be merged into Cloud-init config
+    runcmd:
+      - 'curl 10.0.2.2:8000/contestant-vm.tar.gz -o /tmp/contestant-vm.tar.gz'
+      - 'mkdir -p /home/ansible'
+      - 'cd /home/ansible && tar -xf /tmp/contestant-vm.tar.gz && chown -R ansible:ansible contestant-vm'
+      - 'cd /home/ansible/contestant-vm && ./setup.sh'
+    users:
+      - default
+      - name: ioi
+        gecos: ioi
+        lock_passwd: false
+        # ioi
+        passwd: $6$ZMrIRti0JubrLV3t$mTkdv6Bmg0sGk3equaqqbwDFPL.t4ezClcVygHkxcKM/T7ovovNXncg1yLXDqWcXU/kXJY9sSfmHNb8P0Fu4R1
+  #error-commands:
+  #  - tar c /var/log/installer | nc 192.168.0.1 1000
+

bin/ioiconf.sh

@@ -35,23 +35,11 @@ do_config()
 		exit 1
 	fi
 
-	IP=$(cat $WORKDIR/vpn/ip.conf)
-	MASK=$(cat $WORKDIR/vpn/mask.conf)
-	DNS=$(cat $WORKDIR/vpn/dns.conf)
-
-	if ! check_ip "$IP" || ! check_ip "$MASK"; then
-		echo Bad IP numbers
-		rm -r $WORKDIR
-		exit 1
-	fi
-
-	echo "$IP" > /etc/tinc/vpn/ip.conf
-	echo "$MASK" > /etc/tinc/vpn/mask.conf
-	echo "$DNS" > /etc/tinc/vpn/dns.conf
 	rm /etc/tinc/vpn/hosts/* 2> /dev/null
 	cp $WORKDIR/vpn/hosts/* /etc/tinc/vpn/hosts/
 	cp $WORKDIR/vpn/rsa_key.* /etc/tinc/vpn/
-	cp $WORKDIR/vpn/tinc.conf /etc/tinc/vpn
+	cp $WORKDIR/vpn/tinc.conf /etc/tinc/vpn/
+	cp $WORKDIR/vpn/tinc-up /etc/tinc/vpn/
 	cp $WORKDIR/vpn/ioibackup* /opt/ioi/config/ssh/
 
 	rm -r $WORKDIR
@@ -160,8 +148,8 @@ EOM
 		if [ -f "/usr/share/zoneinfo/$2" ]; then
 			cat - <<EOM
 Your timezone will be set to $2 at your next login.
-*** Please take note that all dates and times communicated by the IOI 2022 ***
-*** organisers will be in Asia/Jakarta timezone (GMT+07), unless it is     ***
+*** Please take note that all dates and times communicated by the IOI 2023 ***
+*** organisers will be in Europe/Budapest timezone (GMT+2), unless it is     ***
 *** otherwise specified.                                                   ***
 EOM
 			echo "$2" > /opt/ioi/config/timezone
@@ -187,20 +175,20 @@ EOM
 Invalid argument to setautobackup. Specify "on" to enable automatic backup
 of home directory, or "off" to disable automatic backup. You can always run
 "ioibackup" manually to backup at any time. Backups will only include
-non-hidden files less than 1MB in size.
+non-hidden files less than 100KB in size.
 EOM
 		fi
 		;;
 	setscreenlock)
 		if [ "$2" = "on" ]; then
 			touch /opt/ioi/config/screenlock
-			sudo -Hu ioi xvfb-run gsettings set org.gnome.desktop.screensaver lock-enabled true
+			sudo -Hu ioi dbus-run-session gsettings set org.gnome.desktop.screensaver lock-enabled true
 			echo Screensaver lock enabled
 		elif [ "$2" = "off" ]; then
 			if [ -f /opt/ioi/config/screenlock ]; then
 				rm /opt/ioi/config/screenlock
 			fi
-			sudo -Hu ioi xvfb-run gsettings set org.gnome.desktop.screensaver lock-enabled false
+			sudo -Hu ioi dbus-run-session gsettings set org.gnome.desktop.screensaver lock-enabled false
 			echo Screensaver lock disabled
 		else
 			cat - <<EOM

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)"

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 \

cleanup.sh

@@ -3,6 +3,7 @@
 set -e
 
 apt clean
+rm -rf /var/lib/snapd/cache/*
 
 rm -rf /var/lib/apt/lists/*
 
@@ -59,5 +60,6 @@ PARTKEY=$(/opt/ioi/sbin/genkey.sh)
 echo $PARTKEY
 
 echo REMEMBER TO REMOVE SETUP DIRECTORY
+echo REMEMBER TO FINALIZE VM IMAGE
 
 # vim: ts=4

config.local.sh.sample

@@ -1,4 +1,4 @@
 # Name the version. Otherwise we'll default to testMMDD.
-VERSION=""
+export VERSION=""
 # Set a password, also used in GRUB. Otherwise we'll default to ansible.
-ANSIBLE_PASSWD=""
+export ANSIBLE_PASSWD=""

config.sh

@@ -0,0 +1,5 @@
+export POP_SERVER="pop.cmsioi2023.hu"
+export BACKUP_SERVER="backup.cmsioi2023.hu"
+export CMS_PUBLIC_DOMAIN="cmsioi2023.hu"
+export DNS_DOMAIN="ioi2023.loc"
+export SUBNET="172.16.0.0/16"

config.sh.sample

@@ -1,5 +1,5 @@
-POP_SERVER="pop.toki.id"
-BACKUP_SERVER="backup.toki.id"
-CMS_PUBLIC_DOMAIN="cms.toki.id"
-DNS_DOMAIN="toki.id"
-SUBNET="10.0.0.0/16"
+export POP_SERVER="pop.toki.id"
+export BACKUP_SERVER="backup.toki.id"
+export CMS_PUBLIC_DOMAIN="cms.toki.id"
+export DNS_DOMAIN="toki.id"
+export SUBNET="10.0.0.0/16"

html/index.html

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>IOI2022</title>
+<title>IOI2023</title>
 <style type="text/css">
 /* share-regular - latin */
 @font-face {
@@ -50,17 +50,17 @@
 </style>
 </head>
 <body>
-<h1 style="display: none;">IOI2022</h1>
+<h1 style="display: none;">IOI2023</h1>
 <div style="text-align: center;">
-  <img src="ioi-website-logo.png" alt="IOI 2022" style="max-height: 150px;" />
+  <img src="ioi-website-logo.png" alt="IOI 2023" style="max-height: 150px;" />
 </div>
 <div class="ll" style="margin: 1em 0;">
-  <a class="button" href="https://cms.ioi2022.id/">CMS WEBSITE</a>
+  <a class="button" href="http://cmsioi2023.hu/">CMS WEBSITE</a>
 </div>
 <div class="container">
-<div class="ll"><a href="file:///opt/cppref/reference/en/index.html">C/C++ Reference</a></div>
-<div class="ll"><a href="file:///usr/share/doc/stl-manual/html/index.html">STL Manual</a></div>
-<div class="ll"><a href="file:///opt/ioi/html/vm.html">Contestant VM Manual</a></div>
+<div class="ll"><a href="../cppreference/reference/en/index.html">C/C++ Reference</a></div>
+<div class="ll"><a href="manual.html">Contestant Machine Manual</a></div>
+<div class="ll"><a href="../python3.10/html/index.html">Python documentation</a></div>
 </div>
 </body>
 </html>