Wfluxor findings

provision-contest/ansible/admin.yml

@@ -142,3 +142,11 @@
         recurse: true
         owner: domjudge
         group: domjudge
+
+    - name: Grant www-data permissions to user homedir (needed for web browser)
+      acl:
+        path: "/home/domjudge"
+        entity: www-data
+        etype: user
+        permissions: rwx
+        state: present

provision-contest/ansible/domserver.yml

@@ -83,7 +83,7 @@
         use_ssh_args: true
       notify: Clear application cache
 
-    - name: Grant www-data permisions to image folders
+    - name: Grant www-data permissions to image folders
       acl:
         path: "{{ DJ_DIR }}/webapp/public/images/{{ item }}"
         entity: www-data

provision-contest/ansible/group_vars/all/all.yml.example

@@ -55,7 +55,7 @@ HOSTS:
     domjudge-laptop: 10.3.3.200
     pc2:             10.3.3.241
 
-TIMEZONE: "Asia/Dhaka"
+TIMEZONE: "Europe/Amsterdam"
 
 PHP_FPM_MAX_CHILDREN: 400
 PHP_FPM_MAX_REQUESTS: 500

provision-contest/ansible/roles/cds/files/cds.service

@@ -4,6 +4,7 @@ Description=CDS
 User=domjudge
 Restart=always
 ExecStart=/home/domjudge/cds/wlp/bin/server run cds
+Environment=JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 TimeoutStopSec=20s
 [Install]
 WantedBy=multi-user.target

provision-contest/ansible/roles/clusterssh/tasks/main.yml

@@ -7,40 +7,10 @@
     pkg:
       - clusterssh
 
-- name: Create clusterssh 'all' config group
+- name: Create clusterssh clusters file
   become: true
   become_user: domjudge
-  lineinfile:
+  template:
+    src: clusters.j2
     dest: /home/domjudge/.clusterssh/clusters
-    regexp: '^all'
-    line: "all {{ groups['all'] | join(' ') }}"
-    create: true
-    mode: 0644
-
-- name: Create clusterssh config groups
-  become: true
-  become_user: domjudge
-  lineinfile:
-    dest: /home/domjudge/.clusterssh/clusters
-    regexp: '^{{ item }}s'
-    line: "{{ item }}s {{ groups[item] | join(' ') }}"
-    create: true
-    mode: 0644
-  loop:
-    - domserver
-    - emergency
-    - judgehost
-    - admin
-    - cds
-    - grafana
-    - scoreboard
-    - mgmt
-
-- name: Create clusterssh config groups
-  become: true
-  become_user: domjudge
-  lineinfile:
-    dest: /home/domjudge/.clusterssh/clusters
-    regexp: '^all-domservers'
-    line: "all-domservers {{ (groups['domserver'] + groups['emergency']) | join(' ') }}"
     mode: 0644

provision-contest/ansible/roles/clusterssh/templates/clusters.j2

@@ -0,0 +1,5 @@
+{% for group in groups %}
+{% if groups[group] %}
+{{ group | replace('emergency', 'emergencie') }}{% if group != 'all' %}s{% endif %} {{ groups[group] | join(' ') }}
+{% endif %}
+{% endfor %}

provision-contest/ansible/roles/hosts/templates/hosts.j2

@@ -8,7 +8,9 @@ ff00::0 ip6-mcastprefix
 ff02::1 ip6-allnodes
 ff02::2 ip6-allrouters
 
+{% if DOMSERVER_IP is defined %}
 {{ DOMSERVER_IP }}             domjudge domserver
+{% endif %}
 {% for item in groups['all'] %}
 {% if hostvars[item].ansible_host is defined %}
 {{ hostvars[item].ansible_host }}              {{ item }}

provision-contest/ansible/roles/keepalived/templates/keepalived.conf.j2

@@ -1,6 +1,6 @@
 vrrp_instance lb_ipv4 {
 	state MASTER
-	interface {{ ansible_facts['default_ipv4']['interface'] }}
+	interface {{ KEEPALIVED_INTERFACE|default(ansible_facts['default_ipv4']['interface']) }}
 	use_vmac
 	virtual_router_id 32
 	priority {{KEEPALIVED_PRIORITY}}

provision-contest/ansible/roles/mysql_replication/tasks/main.yml

@@ -13,6 +13,14 @@
     regexp: '^bind-address\s*='
     replace: '#bind-address ='
 
+- name: Set the replication interface variable
+  set_fact:
+    replication_interface: "{{ REPLICATION_INTERFACE|default(ansible_default_ipv4.interface) }}"
+
+- name: Set the variable for the IP address of the replication interface
+  set_fact:
+    replication_interface_ip_address: "{{ vars['ansible_' + replication_interface]['ipv4']['address'] }}"
+
 - name: Add mysql config snippet for replication
   template:
     src: mysql.replication.cnf.j2

provision-contest/ansible/roles/mysql_replication/templates/mysql.replication.cnf.j2

@@ -8,4 +8,4 @@ log-bin = /var/log/mysql/mysql-bin.log
 binlog_do_db = domjudge
 
 # Host specific replication configuration
-server_id = {{ ansible_default_ipv4.address | ipaddr('int') }}
+server_id = {{ replication_interface_ip_address | ipaddr('int') }}

provision-contest/ansible/roles/mysql_replication/templates/setup-replication.sh.j2

@@ -181,7 +181,7 @@ service mysql start
 
 echo "Starting replication locally..."
 mysql -e "
-CHANGE MASTER TO MASTER_HOST='{{ SERVER_IP_PREFIX }}.${PRIMARY_SERVER_ID}',
+CHANGE MASTER TO MASTER_HOST='${PRIMARY}',
                  MASTER_USER='replication',
                  MASTER_PASSWORD='{{ REPLICATION_PASSWORD }}',
                  MASTER_LOG_FILE='${PRIMARY_BINLOG}',
@@ -217,7 +217,7 @@ OUR_LOGPOS=$(get_field 'Position' "$OUR_STATUS")
 if [ "$SETUP_MASTER_MASTER" -eq 1 ]; then
     echo "Starting replication on $PRIMARY..."
     ssh "$PRIMARY" "mysql -e '
-    CHANGE MASTER TO MASTER_HOST=\"{{ SERVER_IP_PREFIX }}.${OUR_SERVER_ID}\",
+    CHANGE MASTER TO MASTER_HOST=\"{{ replication_interface_ip_address }}\",
                     MASTER_USER=\"replication\",
                     MASTER_PASSWORD=\"{{ REPLICATION_PASSWORD }}\",
                     MASTER_LOG_FILE=\"${OUR_BINLOG}\",