Update variables.yml

README.md

@@ -9,4 +9,4 @@ The following subdirectories contain:
 * `website` the HTML code for www.domjudge.org
 * `icpc-wf` scripts used at the ICPC World Finals
 * `contest-api` a script to validate an implementation of the
-  [ICPC contest API](https://clics.ecs.baylor.edu/index.php/Contest_API)
+  [ICPC contest API](https://ccs-specs.icpc.io/contest_api)

contest-api/check-api.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Checks whether a Contest API conforms to the specification
-# https://clics.ecs.baylor.edu/index.php/Contest_API
+# https://ccs-specs.icpc.io/contest_api
 
 # Set path to json-validate binary if it's not in PATH:
 #VALIDATE_JSON=/path/to/validate-json
@@ -71,7 +71,7 @@ $(basename $0) - Validate a Contest API implementation with JSON schema.
 Usage: $(basename $0) [option]... URL
 
 This program validates a Contest API implementation against the
-specification: https://clics.ecs.baylor.edu/index.php/Contest_API
+specification: https://ccs-specs.icpc.io/contest_api
 
 The URL must point to the base of the API, for example:
 

cron_tag_release.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -eu
+
+. ~/.tagrelease
+
+main=master
+
+RELEASE_DIR="/srv/http/domjudge/releases"
+
+notify_channel () {
+    # Local debug
+    echo "$1"
+    # When cron is run often one should have time to
+    # fix the issue.
+    if [ ! -f /tmp/$2 ]; then
+        # Write to syslog on server
+        logger "$1"
+        DATA='{"text":"'"$1"'"}'
+        # Notify DOMjudge Slack channel (github-notifications)
+        # SLACK_URL should be exported in the .bashrc (it should be secret)
+        curl -X POST -H 'Content-type: application/json' --data "$DATA" "$SLACK_URL"
+        touch /tmp/$2
+    fi
+}
+
+process_tag () {
+    TAG="$1"
+    NUMB="[0-9]+"
+    DOT="\."
+    RELEASE="$NUMB$DOT$NUMB$DOT$NUMB"
+    OPTRC="((RC|rc)[0-9])?"
+    if [[ $TAG =~ ^$RELEASE$OPTRC$ ]]; then
+       # TODO: check if the file already exists
+       if [ -f "$RELEASE_DIR/domjudge-$TAG.tar.gz" ]; then
+           # Tag is already handled
+           return 0
+       fi
+       # To find the signer key of a earlier tag:
+       # gpg --search 780355B5EA6BFC8235A99C4B56F61A79401DAC04
+       # And if one trusts the internet to be correct
+       # gpg --recv-keys 780355B5EA6BFC8235A99C4B56F61A79401DAC04
+       if git verify-tag $TAG; then
+           # At this point the tarball should already be locally tested
+           ~/domjudge-scripts/make_release.sh "$TAG"
+           mv domjudge-$TAG.* $RELEASE_DIR/
+           notify_channel "Tarball finished ($TAG).\nURL: https://www.domjudge.org/releases/domjudge-$TAG.tar.gz" "$TAG"
+       else
+           notify_channel "Untrusted tag ($TAG)" "$TAG"
+       fi
+    fi
+}
+
+# Reset to main branch
+cd ~domjudge/git/domjudge
+git checkout $main
+
+while read -r tag; do
+    process_tag "$tag"
+done <<< "$(git tag)"
+

icpc-wf/ansible/admin.yml

@@ -9,7 +9,7 @@
     - name: restart nginx
       service: name=nginx state=restarted
     - name: restart PHP FPM
-      service: name=php7.2-fpm state=restarted
+      service: name=php7.4-fpm state=restarted
     - name: update-ca-certificates
       command: update-ca-certificates
     - name: restart rsyslog
@@ -49,7 +49,7 @@
         - mariadb-server
         - nginx
         - php-fpm
-        - python-mysqldb
+        - python3-mysqldb
         - php-intl
         - mycli
         - mmv
@@ -59,15 +59,15 @@
 
     - name: set PHP timezone for FPM
       lineinfile:
-        dest: /etc/php/7.2/fpm/php.ini
+        dest: /etc/php/7.4/fpm/php.ini
         state: present
         regexp: 'date\.timezone\s*='
         line: 'date.timezone = {{TIMEZONE}}'
 
     - name: enable php modules
       command: phpenmod {{item}}
       args:
-        creates: /etc/php/7.2/fpm/conf.d/20-{{item}}.ini
+        creates: /etc/php/7.4/fpm/conf.d/20-{{item}}.ini
       with_items:
         - zip
         - intl

icpc-wf/ansible/common_tasks_all.yml

@@ -6,11 +6,19 @@
 
     - include: common_tasks_packages_icpc-wf.yml
 
+    - name: Update and upgrade apt packages
+      become: true
+      apt:
+        upgrade: yes
+        update_cache: yes
+        cache_valid_time: 86400 #One day
+
     - name: install common required/useful packages
       tags: packages
       apt:
         state: present
         pkg:
+        - acl
         - ack-grep
         - git
         - htop
@@ -51,7 +59,7 @@
 
     - name: set PHP timezone for CLI
       lineinfile:
-        dest: /etc/php/7.2/cli/php.ini
+        dest: /etc/php/7.4/cli/php.ini
         state: present
         regexp: 'date\.timezone\s*='
         line: 'date.timezone = {{TIMEZONE}}'
@@ -94,17 +102,6 @@
         mode: 0600
       when: DJ_GIT_SSH_KEY is defined
 
-    - name: Create SSH config
-      template: src=files/ssh-config-domjudge.j2 dest=/home/domjudge/.ssh/config owner=domjudge group=domjudge mode=0600
-      when: DJ_GIT_HOST is defined
-
-    - name: add all hosts to hosts file
-      lineinfile:
-        dest: /etc/hosts
-        regexp: '{{ item }}$'
-        line: "{{ hostvars[item].ansible_host }}	{{ item }}"
-      loop: "{{ groups['all'] }}"
-
     - name: configure domjudge logging
       copy: src=files/rsyslog.domjudge.conf dest=/etc/rsyslog.d/domjudge.conf
       notify: restart rsyslog

icpc-wf/ansible/common_tasks_packages_icpc-wf.yml

@@ -1,31 +1,10 @@
 # Common packaging stuff during ICPC World Finals.
 ---
-    - name: fix apt sources list
-      tags: packages
-      replace:
-        dest: /etc/apt/sources.list
-        regexp: 'pc2cancer\.ecs\.csus\.edu'
-        replace: 'packages'
-
-    - name: remove pycharm repo
-      tags: packages
-      replace:
-        dest: /etc/apt/sources.list
-        regexp: '^([^#].*pycharm.*)$'
-        replace: '# \1'
-
-    - name: add packages to hosts file
-      tags: packages
-      lineinfile:
-        dest: /etc/hosts
-        regexp: '^10\.3\.3\.209'
-        line: "10.3.3.209	packages"
-
-    - name: remove some packages
-      tags: packages
-      apt:
-        pkg: ntp
-        state: absent
+#    - name: remove some packages
+#      tags: packages
+#      apt:
+#        pkg: ntp
+#        state: absent
 
     - meta: flush_handlers
       tags: packages

icpc-wf/ansible/common_tasks_prebuild.yml

@@ -87,27 +87,6 @@
         - COLLECTD_MYSQL_PASSWORD is defined
         - "'domjudge' == ansible_hostname or 'domjudge-laptop' in ansible_hostname or 'domjudge-backup' in ansible_hostname"
 
-    - name: copy DOMjudge logo binary
-      copy: src=files/domlogo dest=/home/domjudge/domlogo owner=domjudge group=domjudge mode=0755
-
-    - name: enable GDM autologin
-      lineinfile:
-        path: /etc/gdm3/custom.conf
-        regexp: 'AutomaticLoginEnable'
-        line: 'AutomaticLoginEnable=true'
-      notify: restart gdm
-
-    - name: Automatically login domjudge user
-      lineinfile:
-        path: /etc/gdm3/custom.conf
-        regexp: 'AutomaticLogin'
-        line: 'AutomaticLogin=domjudge'
-      notify: restart gdm
-
-    - name: make sure autostart directory exists
-      file: dest=/home/domjudge/.config/autostart state=directory owner=domjudge group=domjudge
-      tags: fix_autostart
-
     - name: install SSL server certificates
       copy:
         src: "{{ item }}"

icpc-wf/ansible/domserver-only-code.yml

@@ -11,7 +11,7 @@
     - name: restart nginx
       service: name=nginx state=restarted
     - name: restart PHP FPM
-      service: name=php7.2-fpm state=restarted
+      service: name=php7.4-fpm state=restarted
     - name: update-ca-certificates
       command: update-ca-certificates
     - name: restart collectd

icpc-wf/ansible/domserver.yml

@@ -11,7 +11,7 @@
     - name: restart nginx
       service: name=nginx state=restarted
     - name: restart PHP FPM
-      service: name=php7.2-fpm state=restarted
+      service: name=php7.4-fpm state=restarted
     - name: update-ca-certificates
       command: update-ca-certificates
     - name: restart collectd
@@ -35,25 +35,26 @@
         - mariadb-server
         - nginx
         - php-fpm
-        - python-mysqldb
+        - python3-mysqldb
         - php-intl
         - mycli
         - macchanger
+        - acl
 
     - name: copy in MySQL config
       copy: src=files/my.cnf dest=/root/.my.cnf
 
     - name: set PHP timezone for FPM
       lineinfile:
-        dest: /etc/php/7.2/fpm/php.ini
+        dest: /etc/php/7.4/fpm/php.ini
         state: present
         regexp: 'date\.timezone\s*='
         line: 'date.timezone = {{TIMEZONE}}'
 
     - name: enable php modules
       command: phpenmod {{item}}
       args:
-        creates: /etc/php/7.2/fpm/conf.d/20-{{item}}.ini
+        creates: /etc/php/7.4/fpm/conf.d/20-{{item}}.ini
       with_items:
         - zip
         - intl
@@ -69,32 +70,6 @@
       copy: src=files/mysql.domjudge.cnf dest=/etc/mysql/mariadb.conf.d/zz_domjudge.cnf
       notify: restart mysql
 
-    - name: add mysql config snippet for replication
-      template: src=files/mysql.replication.cnf.j2 dest=/etc/mysql/mariadb.conf.d/zzz_replication.cnf
-      notify: restart mysql
-      when: REPLICATION_PASSWORD is defined
-
-    - name: disable mysql listen on localhost only
-      replace:
-        path: /etc/mysql/mariadb.conf.d/50-server.cnf
-        regexp: '^bind-address\s*='
-        replace: '#bind-address ='
-      when: REPLICATION_PASSWORD is defined
-
-    - name: copy script to setup replication
-      template: src=files/setup-replication.sh.j2 dest=/usr/local/sbin/setup-replication.sh mode=0755
-      when: REPLICATION_PASSWORD is defined
-
-    - name: create mysql replication user
-      mysql_user:
-        name: replication
-        host: '%'
-        password: "{{REPLICATION_PASSWORD}}"
-        append_privs: true
-        priv: '*.*:REPLICATION SLAVE'
-        state: present
-      when: REPLICATION_PASSWORD is defined
-
     - name: make sure mysql is restarted
       meta: flush_handlers
 
@@ -119,25 +94,10 @@
       command: "{{DJ_DIR}}/bin/dj_setup_database -u root bare-install"
       when: "'failed' in db_status.stdout"
 
-    - name: fix background color
-      lineinfile:
-        regexp: '^(\s*background-color):\s+white\s*;'
-        line: '\1: {{BACKGROUND_COLOR}};'
-        backrefs: yes
-        dest: "{{DJ_DIR}}/webapp/web/style.css"
-      when: BACKGROUND_COLOR is defined
-
     - name: disable developer mode
       lineinfile:
         regexp: '^APP_ENV=dev'
         state: absent
         dest: "{{DJ_DIR}}/webapp/.env.local"
 
     - include: nginx-setup.yml
-
-    - name: add autostart shortcuts
-      copy: src=files/{{item}}.desktop dest=/home/domjudge/.config/autostart/ owner=domjudge group=domjudge mode=0755
-      with_items:
-        - htop
-        - taillog-domserver-nginx-error
-        - taillog-domserver-symfony-error

icpc-wf/ansible/files/setup-replication.sh.j2

@@ -24,7 +24,7 @@ echo "Recreating empty database..."
 mysql -e 'STOP SLAVE; DROP DATABASE domjudge;'
 {{DJ_DIR}}/sql/dj_setup_database create-db-users
 
-ssh "$MASTER" "service php7.2-fpm stop"
+ssh "$MASTER" "service php7.4-fpm stop"
 
 MASTER_STATUS=$(ssh "$MASTER" "mysql -e 'SHOW MASTER STATUS;'" | tail -n1)
 MASTER_BINLOG=$(echo "$MASTER_STATUS" | cut -f 1)
@@ -48,7 +48,7 @@ CHANGE MASTER TO MASTER_HOST='10.3.3.${MASTER_SERVER_ID}',
                  MASTER_LOG_POS=${MASTER_LOGPOS};
 START SLAVE;"
 
-ssh "$MASTER" "service php7.2-fpm start"
+ssh "$MASTER" "service php7.4-fpm start"
 
 if ! mysql -e 'SHOW SLAVE STATUS\G' | grep 'Slave_SQL_Running: Yes' ; then
     echo "Error: slave SQL replication not running."

icpc-wf/ansible/files/taillog-domserver-symfony-error.desktop

@@ -1,4 +1,4 @@
 [Desktop Entry]
 Name=taillog-domserver-symfony-error
 Type=Application
-Exec=gnome-terminal --window --geometry 74x17+1000+400 -e 'bash -c "tail -F /opt/domjudge/webapp/var/logs/prod.log"'
+Exec=gnome-terminal --window --geometry 74x17+1000+400 -e 'bash -c "tail -F /opt/domjudge/webapp/var/log/prod.log"'

icpc-wf/ansible/files/tune_cpu.service

@@ -5,3 +5,6 @@ Description=Tune CPU cores: disable turboboost, downclocking, etc.
 Type=oneshot
 ExecStart=/usr/local/sbin/disable-turboboost_ht
 RemainAfterExit=true
+
+[Install]
+WantedBy=multi-user.target