Updates for Ubuntu 20.04 and newer DOMjudge git code.

Author: nickygerritsen

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

@@ -51,7 +51,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}}'

icpc-wf/ansible/common_tasks_packages_icpc-wf.yml

@@ -4,7 +4,7 @@
       tags: packages
       replace:
         dest: /etc/apt/sources.list
-        regexp: 'pc2cancer\.ecs\.csus\.edu'
+        regexp: 'pc2\.ecs\.csus\.edu'
         replace: 'packages'
 
     - name: remove pycharm repo

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,7 +35,7 @@
         - mariadb-server
         - nginx
         - php-fpm
-        - python-mysqldb
+        - python3-mysqldb
         - php-intl
         - mycli
         - macchanger
@@ -45,15 +45,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/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/judgehost-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/judgehost.yml

@@ -38,7 +38,7 @@
     - name: disable clearing Symfony cache when building
       lineinfile:
         dest: "{{DJ_DIR}}/Makefile"
-        regexp: "^(.*-C webapp clear-cache)$"
+        regexp: "^(.*composer auto-scripts)$"
         line: '#\1'
         backrefs: yes
 
@@ -47,7 +47,7 @@
     - name: re-enable clearing Symfony cache when building
       lineinfile:
         dest: "{{DJ_DIR}}/Makefile"
-        regexp: "^#(.*-C webapp clear-cache)$"
+        regexp: "^#(.*composer auto-scripts)$"
         line: '\1'
         backrefs: yes
 
@@ -106,12 +106,20 @@
       notify: restart systemctl
 
     - name: copy create-cgroups systemd unit file
-      copy: src={{DJ_DIR}}/misc-tools/create-cgroups.service dest=/etc/systemd/system/ remote_src=yes
+      copy: src={{DJ_DIR}}/lib/judge/create-cgroups.service dest=/etc/systemd/system/ remote_src=yes
       tags: updateservice
       notify: restart systemctl
 
+    - name: Change path of create_cgroups file
+      lineinfile:
+        dest: /etc/systemd/system/create-cgroups.service
+        state: present
+        regexp: 'ExecStart'
+        line: 'ExecStart={{DJ_DIR}}/judge/create_cgroups'
+      notify: restart systemctl
+
     - name: copy judgedaemon systemd unit file
-      copy: src={{DJ_DIR}}/judge/domjudge-judgehost.service dest=/etc/systemd/system/ remote_src=yes
+      copy: src={{DJ_DIR}}/lib/judge/domjudge-judgehost.service dest=/etc/systemd/system/ remote_src=yes
       tags: updateservice
       notify: restart systemctl
 

icpc-wf/ansible/nginx-setup.yml

@@ -12,7 +12,7 @@
       notify: update-ca-certificates
 
     - name: copy in domjudge FPM conf
-      copy: src={{DJ_DIR}}/etc/domjudge-fpm.conf remote_src=yes dest=/etc/php/7.2/fpm/pool.d/domjudge.conf
+      copy: src={{DJ_DIR}}/etc/domjudge-fpm.conf remote_src=yes dest=/etc/php/7.4/fpm/pool.d/domjudge.conf
       notify: restart PHP FPM
 
     - name: copy in domjudge nginx conf
@@ -101,7 +101,7 @@
 
     - name: Set PHP settings
       lineinfile:
-        dest: /etc/php/7.2/fpm/pool.d/domjudge.conf
+        dest: /etc/php/7.4/fpm/pool.d/domjudge.conf
         regexp: "{{item.regexp}}"
         line: "{{item.key}} = {{item.value}}"
       with_items: