Fix variable spacing issues, no change intended

vmcj · vmcj · commit a8687d80b63f · 2022-05-07T17:40:41.000+02:00
diff --git a/icpc-wf/ansible/admin.yml b/icpc-wf/ansible/admin.yml
@@ -58,7 +58,7 @@
       lineinfile:
         regexp: 'APP_ENV='
         line: 'APP_ENV=dev'
-        dest: "{{DJ_DIR}}/webapp/.env.local"
+        dest: "{{ DJ_DIR }}/webapp/.env.local"
 
     - name: add cds to hosts file
       lineinfile:
@@ -86,13 +86,13 @@
 
     - name: Update repo URL based on network
       set_fact:
-        DJ_GIT_REPO_SCRIPTS: "{{ DJ_GIT_REPO_SCRIPTS_RESTRICTED if WF_RESTRICTED_NETWORK else DJ_GIT_REPO_SCRIPTS}}"
+        DJ_GIT_REPO_SCRIPTS: "{{ DJ_GIT_REPO_SCRIPTS_RESTRICTED if WF_RESTRICTED_NETWORK else DJ_GIT_REPO_SCRIPTS }}"
 
     - name: create working copy of the domjudge-scripts repo
       become: true
       become_user: domjudge
       # We use a different directory here to have one single 'upstream' and not have issues with it
-      git: repo={{DJ_GIT_REPO_SCRIPTS}} dest=/home/domjudge/domjudge-scripts-checkout version=main accept_hostkey=yes update=no
+      git: repo={{ DJ_GIT_REPO_SCRIPTS }} dest=/home/domjudge/domjudge-scripts-checkout version=main accept_hostkey=yes update=no
 
     - name: create working copy of the wf2020 repo
       become: true
@@ -102,7 +102,7 @@
     - name: copy custom CSS file for admin machines
       copy:
         src: admin-machine.css
-        dest: "{{DJ_DIR}}/webapp/public/css/custom/admin-machine.css"
+        dest: "{{ DJ_DIR }}/webapp/public/css/custom/admin-machine.css"
         owner: domjudge
         group: domjudge
         mode: 0644
diff --git a/icpc-wf/ansible/domserver.yml b/icpc-wf/ansible/domserver.yml
@@ -61,25 +61,25 @@
       lineinfile:
         regexp: '^APP_ENV=dev'
         state: absent
-        dest: "{{DJ_DIR}}/webapp/.env.local"
+        dest: "{{ DJ_DIR }}/webapp/.env.local"
 
     - name: install contest images
       synchronize:
         src: files/domjudge-public/
-        dest: "{{DJ_DIR}}/webapp/public"
+        dest: "{{ DJ_DIR }}/webapp/public"
         owner: false
         use_ssh_args: true
       notify: clear application cache
 
     - name: Add documentation in DOMjudge team interface
       copy:
         src: files/docs.yaml
-        dest: "{{DJ_DIR}}/etc/"
+        dest: "{{ DJ_DIR }}/etc/"
       notify: clear application cache
 
     - name: add autostart shortcuts
       copy:
-        src: files/{{item}}.desktop
+        src: files/{{ item }}.desktop
         dest: /home/domjudge/.config/autostart/
         owner: domjudge
         group: domjudge
@@ -90,8 +90,8 @@
 
     - name: add autostart shortcuts from template
       template:
-        src: files/{{item}}.desktop.j2
-        dest: /home/domjudge/.config/autostart/{{item}}.desktop
+        src: files/{{ item }}.desktop.j2
+        dest: /home/domjudge/.config/autostart/{{ item }}.desktop
         owner: domjudge
         group: domjudge
         mode: 0755
diff --git a/icpc-wf/ansible/files/taillog-domserver-symfony-error.desktop.j2 b/icpc-wf/ansible/files/taillog-domserver-symfony-error.desktop.j2
@@ -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 {{DJ_DIR}}/webapp/var/log/prod.log"'
+Exec=gnome-terminal --window --geometry 74x17+1000+400 -e 'bash -c "tail -F {{ DJ_DIR }}/webapp/var/log/prod.log"'
diff --git a/icpc-wf/ansible/files/taillog.desktop.j2 b/icpc-wf/ansible/files/taillog.desktop.j2
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Name=taillog
 Type=Application
-Exec=gnome-terminal --window --full-screen -e 'bash -c "tail -f {{DJ_DIR}}/output/log/*-0.log"'
+Exec=gnome-terminal --window --full-screen -e 'bash -c "tail -f {{ DJ_DIR }}/output/log/*-0.log"'
diff --git a/icpc-wf/ansible/handlers.yml b/icpc-wf/ansible/handlers.yml
@@ -1,6 +1,6 @@
 # Common definition of handlers
 ---
 - name: clear application cache
-  command: "{{DJ_DIR}}/webapp/bin/console cache:clear"
+  command: "{{ DJ_DIR }}/webapp/bin/console cache:clear"
   become: true
   become_user: domjudge
diff --git a/icpc-wf/ansible/judgehost.yml b/icpc-wf/ansible/judgehost.yml
@@ -46,14 +46,14 @@
       service_facts:
     - name: Disable all cores
       service:
-        name="domjudge-judgedaemon@{{item}}"
+        name="domjudge-judgedaemon@{{ item }}"
         state=stopped
       with_sequence: start=0 end={{ ansible_processor_vcpus }} format=domjudge-judgedaemon@%1x
       when: '"domjudge-judgedaemon@0.service" in services'
   tasks:
     - name: add autostart shortcuts
       template:
-        src: files/{{item}}.desktop
+        src: files/{{ item }}.desktop
         dest: /home/domjudge/.config/autostart/
         owner: domjudge
         group: domjudge
@@ -63,8 +63,8 @@
 
     - name: add autostart shortcuts from template
       template:
-        src: files/{{item}}.desktop.j2
-        dest: /home/domjudge/.config/autostart/{{item}}.desktop
+        src: files/{{ item }}.desktop.j2
+        dest: /home/domjudge/.config/autostart/{{ item }}.desktop
         owner: domjudge
         group: domjudge
         mode: 0755
diff --git a/icpc-wf/ansible/roles/base_packages/tasks/install-local-package.yml b/icpc-wf/ansible/roles/base_packages/tasks/install-local-package.yml
@@ -9,9 +9,9 @@
     mode: 0700
 
 - name: copy DEB package to remote
-  copy: src={{item}} dest="/tmp/dj_ansible/{{item|basename}}"
+  copy: src={{ item }} dest="/tmp/dj_ansible/{{ item|basename }}"
   register: deb_copied
 
-- name: install DEB package {{item|basename}}
-  apt: deb="/tmp/dj_ansible/{{item|basename}}"
+- name: install DEB package {{ item|basename }}
+  apt: deb="/tmp/dj_ansible/{{ item|basename }}"
   when: deb_copied.changed
diff --git a/icpc-wf/ansible/roles/base_packages/tasks/main.yml b/icpc-wf/ansible/roles/base_packages/tasks/main.yml
@@ -122,4 +122,4 @@
 - name: install local DEB packages
   include: install-local-package.yml
   with_fileglob:
-    - install-{{host_type}}/*.deb
+    - install-{{ host_type }}/*.deb
diff --git a/icpc-wf/ansible/roles/clusterssh/tasks/main.yml b/icpc-wf/ansible/roles/clusterssh/tasks/main.yml
@@ -22,7 +22,7 @@
   lineinfile:
     dest: /home/domjudge/.clusterssh/clusters
     regexp: '^{{ item }}s'
-    line: "{{item}}s {{ groups[item] | join(' ') }}"
+    line: "{{ item }}s {{ groups[item] | join(' ') }}"
     create: true
   loop:
     - domserver
diff --git a/icpc-wf/ansible/roles/domjudge_build/handlers/main.yml b/icpc-wf/ansible/roles/domjudge_build/handlers/main.yml
@@ -2,7 +2,7 @@
 # Define here handlers associated to this role.
 
 - name: fix permissions on domjudge inplace-install
-  shell: make -C {{DJ_DIR}} inplace-postinstall-permissions
+  shell: make -C {{ DJ_DIR }} inplace-postinstall-permissions
 
 - name: restart rsyslog
   service: name=rsyslog enabled=true state=restarted
diff --git a/icpc-wf/ansible/roles/domjudge_build/tasks/main.yml b/icpc-wf/ansible/roles/domjudge_build/tasks/main.yml
@@ -4,37 +4,37 @@
 - name: add the restapi secret file
   template:
     src: restapi.secret.j2
-    dest: "{{DJ_DIR}}/etc/restapi.secret"
+    dest: "{{ DJ_DIR }}/etc/restapi.secret"
     owner: domjudge
     group: domjudge
     mode: 0600
 
 - name: run inplace-conf
   become: true
   become_user: domjudge
-  command: make inplace-conf CONFIGURE_FLAGS='--disable-doc-build --with-baseurl={{DOMSERVER}}/'
+  command: make inplace-conf CONFIGURE_FLAGS='--disable-doc-build --with-baseurl={{ DOMSERVER }}/'
   register: dj_configured
   args:
-    chdir: "{{DJ_DIR}}"
-    creates: "{{DJ_DIR}}/paths.mk"
+    chdir: "{{ DJ_DIR }}"
+    creates: "{{ DJ_DIR }}/paths.mk"
 
 - name: check if domjudge is built
-  stat: path="{{DJ_DIR}}/judge/judgedaemon"
+  stat: path="{{ DJ_DIR }}/judge/judgedaemon"
   register: judgedaemon_binary
 
 - name: build domjudge
   become: true
   become_user: domjudge
   command: make inplace-install
   args:
-    chdir: "{{DJ_DIR}}"
+    chdir: "{{ DJ_DIR }}"
   notify: fix permissions on domjudge inplace-install
   when: (git_working_copy is defined and git_working_copy.changed) or dj_configured.changed or not judgedaemon_binary.stat.exists
 
 - name: copy domjudge-sudoers file
   copy:
     remote_src: true
-    src: "{{DJ_DIR}}/etc/sudoers-domjudge"
+    src: "{{ DJ_DIR }}/etc/sudoers-domjudge"
     dest: /etc/sudoers.d/domjudge
     mode: 0440
     owner: root
diff --git a/icpc-wf/ansible/roles/domjudge_checkout/tasks/main.yml b/icpc-wf/ansible/roles/domjudge_checkout/tasks/main.yml
@@ -3,19 +3,19 @@
 
 - name: create working copy directory
   file:
-    path: "{{DJ_DIR}}"
+    path: "{{ DJ_DIR }}"
     state: directory
     owner: domjudge
     group: domjudge
 
 - name: Update repo URL based on network
   set_fact:
-    DJ_GIT_REPO: "{{ DJ_GIT_REPO_RESTRICTED if WF_RESTRICTED_NETWORK else DJ_GIT_REPO}}"
+    DJ_GIT_REPO: "{{ DJ_GIT_REPO_RESTRICTED if WF_RESTRICTED_NETWORK else DJ_GIT_REPO }}"
 
 - name: Create working copy of the domjudge repo
   become: true
   become_user: domjudge
-  git: repo={{DJ_GIT_REPO}} dest={{DJ_DIR}} version={{DJ_BRANCH}} accept_hostkey=yes update=yes
+  git: repo={{ DJ_GIT_REPO }} dest={{ DJ_DIR }} version={{ DJ_BRANCH }} accept_hostkey=yes update=yes
   register: git_working_copy
 
 - name: Check composer dependencies present
@@ -26,14 +26,14 @@
 - name: Copy in composer dependencies (if they exist locally)
   synchronize:
     src: files/lib/vendor/
-    dest: "{{DJ_DIR}}/lib/vendor/"
+    dest: "{{ DJ_DIR }}/lib/vendor/"
     owner: false
     use_ssh_args: true
   when: libvendor.stat.exists
 
 - name: fix ownership of lib/vendor
   file:
-    path: "{{DJ_DIR}}/lib/vendor"
+    path: "{{ DJ_DIR }}/lib/vendor"
     recurse: true
     owner: domjudge
     group: domjudge
diff --git a/icpc-wf/ansible/roles/domjudge_user/tasks/main.yml b/icpc-wf/ansible/roles/domjudge_user/tasks/main.yml
@@ -6,7 +6,7 @@
     name: domjudge
     shell: /bin/bash
     groups: sudo
-    password: "{{DJ_SHELL_USER_PW | default(omit)}}"
+    password: "{{ DJ_SHELL_USER_PW | default(omit) }}"
 
 - name: Allow 'sudo' group to have passwordless sudo
   lineinfile:
@@ -19,8 +19,8 @@
   ini_file:
     dest: /home/domjudge/.gitconfig
     section: user
-    option: "{{item.name}}"
-    value: "{{item.value}}"
+    option: "{{ item.name }}"
+    value: "{{ item.value }}"
     owner: domjudge
     group: domjudge
   loop:
diff --git a/icpc-wf/ansible/roles/domlogo/tasks/main.yml b/icpc-wf/ansible/roles/domlogo/tasks/main.yml
@@ -10,7 +10,7 @@
 - name: install domlogo
   copy:
     src: domlogo.py
-    dest: "{{DJ_DIR}}"
+    dest: "{{ DJ_DIR }}"
     owner: domjudge
     group: domjudge
     mode: 0755
@@ -25,7 +25,7 @@
 - name: install domlogo images
   synchronize:
     src: images
-    dest: "{{DJ_DIR}}"
+    dest: "{{ DJ_DIR }}"
     owner: false
     use_ssh_args: true
 
diff --git a/icpc-wf/ansible/roles/domlogo/templates/domjudgelogo.desktop.j2 b/icpc-wf/ansible/roles/domlogo/templates/domjudgelogo.desktop.j2
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Name=domjudgelogo
 Type=Application
-Exec=bash -c "sleep 10 && cd {{DJ_DIR}} && python3 ./domlogo.py 1>/home/domjudge/logo.out 2>/home/domjudge/logo.err"
+Exec=bash -c "sleep 10 && cd {{ DJ_DIR }} && python3 ./domlogo.py 1>/home/domjudge/logo.out 2>/home/domjudge/logo.err"
diff --git a/icpc-wf/ansible/roles/domserver/tasks/main.yml b/icpc-wf/ansible/roles/domserver/tasks/main.yml
@@ -4,24 +4,24 @@
 - name: install dbpasswords.secret file
   template:
     src: dbpasswords.secret.j2
-    dest: "{{DJ_DIR}}/etc/dbpasswords.secret"
+    dest: "{{ DJ_DIR }}/etc/dbpasswords.secret"
   notify: fix permissions on domjudge inplace-install
 
 - name: install initial_admin_password.secret file
   template:
     src: initial_admin_password.secret.j2
-    dest: "{{DJ_DIR}}/etc/initial_admin_password.secret"
+    dest: "{{ DJ_DIR }}/etc/initial_admin_password.secret"
   notify: fix permissions on domjudge inplace-install
 
 # When using replication, the DB will be dropped and recreated on the slave later.
 - name: check if the database is configured
-  command: "{{DJ_DIR}}/bin/dj_setup_database -u root status"
+  command: "{{ DJ_DIR }}/bin/dj_setup_database -u root status"
   register: db_status
   ignore_errors: true
   changed_when: false
 
 - name: make sure the database is configured
-  command: "{{DJ_DIR}}/bin/dj_setup_database -u root bare-install"
+  command: "{{ DJ_DIR }}/bin/dj_setup_database -u root bare-install"
   when: "'failed' in db_status.stdout"
 
 - name: install required packages
@@ -37,12 +37,12 @@
     dest: /etc/php/7.4/fpm/php.ini
     state: present
     regexp: 'date\.timezone\s*='
-    line: 'date.timezone = {{TIMEZONE}}'
+    line: 'date.timezone = {{ TIMEZONE }}'
 
 - name: enable PHP modules
-  command: phpenmod {{item}}
+  command: phpenmod {{ item }}
   args:
-    creates: /etc/php/7.4/fpm/conf.d/20-{{item}}.ini
+    creates: /etc/php/7.4/fpm/conf.d/20-{{ item }}.ini
   loop:
     - zip
     - intl
@@ -75,21 +75,21 @@
 - name: symlink domjudge FPM conf
   file:
     path: /etc/php/7.4/fpm/pool.d/domjudge.conf
-    src: "{{DJ_DIR}}/etc/domjudge-fpm.conf"
+    src: "{{ DJ_DIR }}/etc/domjudge-fpm.conf"
     state: link
     force: true
   notify: restart PHP FPM
 
 - name: set PHP settings
   lineinfile:
     dest: /etc/php/7.4/fpm/pool.d/domjudge.conf
-    regexp: "{{item.regexp}}"
-    line: "{{item.key}} = {{item.value}}"
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.key }} = {{ item.value }}"
   loop:
-    - { key: 'pm.max_children', regexp: '^pm\.max_children', value: '{{PHP_FPM_MAX_CHILDREN}}' }
-    - { key: 'pm.max_requests', regexp: '^pm\.max_requests', value: '{{PHP_FPM_MAX_REQUESTS}}' }
-    - { key: 'php_admin_value[memory_limit]', regexp: '^php_admin_value\[memory_limit\]', value: '{{PHP_MEMORY_LIMIT}}' }
-    - { key: 'php_admin_value[upload_max_filesize]', regexp: '^php_admin_value\[upload_max_filesize\]', value: '{{PHP_UPLOAD_MAX_FILESIZE}}' }
-    - { key: 'php_admin_value[post_max_size]', regexp: '^php_admin_value\[post_max_size\]', value: '{{PHP_POST_MAX_SIZE}}' }
-    - { key: 'php_admin_value[max_file_uploads]', regexp: '^php_admin_value\[max_file_uploads\]', value: '{{PHP_MAX_FILE_UPLOADS}}' }
+    - { key: 'pm.max_children', regexp: '^pm\.max_children', value: '{{ PHP_FPM_MAX_CHILDREN }}' }
+    - { key: 'pm.max_requests', regexp: '^pm\.max_requests', value: '{{ PHP_FPM_MAX_REQUESTS }}' }
+    - { key: 'php_admin_value[memory_limit]', regexp: '^php_admin_value\[memory_limit\]', value: '{{ PHP_MEMORY_LIMIT }}' }
+    - { key: 'php_admin_value[upload_max_filesize]', regexp: '^php_admin_value\[upload_max_filesize\]', value: '{{ PHP_UPLOAD_MAX_FILESIZE }}' }
+    - { key: 'php_admin_value[post_max_size]', regexp: '^php_admin_value\[post_max_size\]', value: '{{ PHP_POST_MAX_SIZE }}' }
+    - { key: 'php_admin_value[max_file_uploads]', regexp: '^php_admin_value\[max_file_uploads\]', value: '{{ PHP_MAX_FILE_UPLOADS }}' }
   notify: restart PHP FPM
diff --git a/icpc-wf/ansible/roles/domserver/templates/nginx-domjudge-inner.j2 b/icpc-wf/ansible/roles/domserver/templates/nginx-domjudge-inner.j2
@@ -7,7 +7,7 @@ server_name _default_;
 client_max_body_size {{PHP_UPLOAD_MAX_FILESIZE}};
 
 # Variables used in the nginx configuration
-set $domjudgeRoot {{DJ_DIR}}/webapp/public;
+set $domjudgeRoot {{ DJ_DIR }}/webapp/public;
 set $prefix '';
 
 location / {
diff --git a/icpc-wf/ansible/roles/hosts/tasks/main.yml b/icpc-wf/ansible/roles/hosts/tasks/main.yml
@@ -16,4 +16,4 @@
   lineinfile:
     dest: /etc/hosts
     regexp: 'domserver'
-    line: "{{DOMSERVER_IP}}	domjudge domserver"
+    line: "{{ DOMSERVER_IP }}	domjudge domserver"
diff --git a/icpc-wf/ansible/roles/judgedaemon/tasks/main.yml b/icpc-wf/ansible/roles/judgedaemon/tasks/main.yml
diff --git a/icpc-wf/ansible/roles/mysql_replication/tasks/main.yml b/icpc-wf/ansible/roles/mysql_replication/tasks/main.yml
diff --git a/icpc-wf/ansible/roles/phpstorm/tasks/main.yml b/icpc-wf/ansible/roles/phpstorm/tasks/main.yml
diff --git a/icpc-wf/ansible/roles/system_fixes/tasks/main.yml b/icpc-wf/ansible/roles/system_fixes/tasks/main.yml
