Various yaml fixes

Author: vmcj

icpc-wf/ansible/admin.yml

@@ -5,7 +5,7 @@
   hosts: admin
   vars:
     host_type: admin
-  become: yes
+  become: true
   roles:
     - role: base_packages
       tags: base_packages
@@ -49,10 +49,10 @@
       apt:
         state: present
         pkg:
-        - gitk
-        - git-gui
-        - makepasswd
-        - mmv
+          - gitk
+          - git-gui
+          - makepasswd
+          - mmv
 
     - name: enable developer mode
       lineinfile:
@@ -89,13 +89,13 @@
         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: yes
+      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
 
     - name: create working copy of the wf2020 repo
-      become: yes
+      become: true
       become_user: domjudge
       git: repo=git@cds:wf2020 dest=/home/domjudge/wf2020 version=master accept_hostkey=yes update=no
 

icpc-wf/ansible/cds.yml

@@ -5,7 +5,7 @@
   hosts: cds
   vars:
     host_type: cds
-  become: yes
+  become: true
   roles:
     - role: base_packages
       tags: base_packages

icpc-wf/ansible/domserver.yml

@@ -5,7 +5,7 @@
   hosts: domserver
   vars:
     host_type: domserver
-  become: yes
+  become: true
   roles:
     - role: base_packages
       tags: base_packages
@@ -53,9 +53,9 @@
       apt:
         state: present
         pkg:
-        - python3-mysqldb
-        - macchanger
-        - molly-guard
+          - python3-mysqldb
+          - macchanger
+          - molly-guard
 
     - name: disable developer mode
       lineinfile:
@@ -67,7 +67,7 @@
       synchronize:
         src: files/domjudge-public/
         dest: "{{DJ_DIR}}/webapp/public"
-        owner: no
+        owner: false
         use_ssh_args: true
       notify: clear application cache
 

icpc-wf/ansible/grafana.yml

@@ -3,7 +3,7 @@
 - hosts: grafana
   vars:
     host_type: grafana
-  become: yes
+  become: true
   roles:
     - role: base_packages
       tags: base_packages

icpc-wf/ansible/handlers.yml

@@ -2,5 +2,5 @@
 ---
 - name: clear application cache
   command: "{{DJ_DIR}}/webapp/bin/console cache:clear"
-  become: yes
+  become: true
   become_user: domjudge

icpc-wf/ansible/judgehost.yml

@@ -3,13 +3,14 @@
 
 - name: setup judgehost
   hosts: judgehost
+  # We always leave 1/3 of the judges online
   serial:
-    - 33% # We always leave 1/3 of the judges online
+    - 33%
     - 33%
     - 34%
   vars:
     host_type: judgehost
-  become: yes
+  become: true
   roles:
     - role: base_packages
       tags: base_packages

icpc-wf/ansible/mgmt.yml

@@ -5,7 +5,7 @@
   hosts: mgmt
   vars:
     host_type: mgmt
-  become: yes
+  become: true
   roles:
     - role: prometheus_target_all
       tags: prometheus_target_all

icpc-wf/ansible/roles/base_packages/tasks/main.yml

@@ -47,62 +47,62 @@
   apt:
     state: absent
     pkg:
-    - apport
-    - ntp
+      - apport
+      - ntp
 
 - name: install common required/useful packages
   apt:
     state: present
     pkg:
-    - ack
-    - git
-    - htop
-    - httpie
-    - ncdu
-    - pv
-    - screen
-    - autoconf
-    - automake
-    - efibootmgr
-    - curl
-    - gcc
-    - g++
-    - default-jdk-headless
-    - make
-    - zip
-    - unzip
-    - php-cli
-    - php-gd
-    - php-curl
-    - php-mysql
-    - php-json
-    - php-xml
-    - php-zip
-    - php-mbstring
-    - php-intl
-    - bsdmainutils
-    - libcgroup-dev
-    - libcurl4-gnutls-dev
-    - libjsoncpp-dev
-    - libmagic-dev
-    - debootstrap
-    - texlive-latex-recommended
-    - texlive-latex-extra
-    - apache2-utils
-    - tig
-    - bat
-    - jq
-    - python3-sphinx
-    - autoconf
-    - automake
-    - bats
-    - python3-sphinx
-    - python3-sphinx-rtd-theme
-    - rst2pdf
-    - fontconfig
-    - python3-yaml
-    - latexmk
-    - acl
+      - ack
+      - git
+      - htop
+      - httpie
+      - ncdu
+      - pv
+      - screen
+      - autoconf
+      - automake
+      - efibootmgr
+      - curl
+      - gcc
+      - g++
+      - default-jdk-headless
+      - make
+      - zip
+      - unzip
+      - php-cli
+      - php-gd
+      - php-curl
+      - php-mysql
+      - php-json
+      - php-xml
+      - php-zip
+      - php-mbstring
+      - php-intl
+      - bsdmainutils
+      - libcgroup-dev
+      - libcurl4-gnutls-dev
+      - libjsoncpp-dev
+      - libmagic-dev
+      - debootstrap
+      - texlive-latex-recommended
+      - texlive-latex-extra
+      - apache2-utils
+      - tig
+      - bat
+      - jq
+      - python3-sphinx
+      - autoconf
+      - automake
+      - bats
+      - python3-sphinx
+      - python3-sphinx-rtd-theme
+      - rst2pdf
+      - fontconfig
+      - python3-yaml
+      - latexmk
+      - acl
 
 - name: Check if composer is installed
   stat:

icpc-wf/ansible/roles/cds/handlers/main.yml

@@ -5,7 +5,7 @@
   shell: systemctl daemon-reload
 
 - name: restart cds
-  service: name=cds enabled=yes state=restarted
+  service: name=cds enabled=true state=restarted
 
 - name: restart nginx
-  service: name=nginx enabled=yes state=restarted
+  service: name=nginx enabled=true state=restarted

icpc-wf/ansible/roles/cds/tasks/main.yml

@@ -5,7 +5,7 @@
   uri:
     url: https://api.github.com/repos/icpctools/icpctools/releases?per_page=1
     method: GET
-    return_content: yes
+    return_content: true
     status_code: 200
     body_format: json
   register: latest_cds_release_array
@@ -52,7 +52,7 @@
   copy:
     src: /root/CDS-{{ cds_version_minor }}/CDS.war
     dest: /home/domjudge/cds/wlp/usr/servers/cds/apps/CDS.war
-    remote_src: yes
+    remote_src: true
     owner: domjudge
     group: domjudge
   when: cds_war.stat.exists
@@ -103,28 +103,28 @@
 
 - name: Setup nginx
   block:
-  - name: install nginx
-    apt:
-      state: present
-      pkg:
-        - nginx
-
-  - name: add CDS nginx conf
-    template:
-      src: cds.conf.j2
-      dest: /etc/nginx/sites-available/cds.conf
-    notify: restart nginx
-
-  - name: enable nginx conf for CDS
-    file:
-      src: /etc/nginx/sites-available/cds.conf
-      dest: /etc/nginx/sites-enabled/cds.conf
-      state: link
-    notify: restart nginx
-
-  - name: disable default nginx site
-    file:
-      path: /etc/nginx/sites-enabled/default
-      state: absent
-    notify: restart nginx
+    - name: install nginx
+      apt:
+        state: present
+        pkg:
+          - nginx
+
+    - name: add CDS nginx conf
+      template:
+        src: cds.conf.j2
+        dest: /etc/nginx/sites-available/cds.conf
+      notify: restart nginx
+
+    - name: enable nginx conf for CDS
+      file:
+        src: /etc/nginx/sites-available/cds.conf
+        dest: /etc/nginx/sites-enabled/cds.conf
+        state: link
+      notify: restart nginx
+
+    - name: disable default nginx site
+      file:
+        path: /etc/nginx/sites-enabled/default
+        state: absent
+      notify: restart nginx
   when: CDS_HOSTNAME is defined