Update CDS role to work with new 2.5 CDS with accounts.json.

Also fix some small issues.

Author: nickygerritsen

icpc-wf/ansible/group_vars/all/secret.yml.example

@@ -18,26 +18,36 @@ ADMIN_PASSWORD: some-admin-password
 # created on the domserver and judgehosts.
 #DJ_SHELL_USER_PW: some-hashed-password
 
-# Users to create when setting up the CDS
-CDS_USERS:
+# Accounts to create when setting up the CDS
+CDS_ACCOUNTS:
     - username: admin
       password: adm1n
+      type: admin
     - username: presAdmin
       password: padm1n
+      type: admin
     - username: blue
       password: blu3
+      type: staff
     - username: balloon
       password: balloonPr1nter
+      type: balloon
     - username: public
       password: publ1c
+      type: public
     - username: presentation
       password: presentat1on
+      type: public
     - username: myicpc
       password: my1cpc
+      type: spectator
     - username: live
       password: l1ve
+      type: analyst
     - username: team1
       password: t3am
+      type: team
+      team_id: 1
 
 # Contest(s) to configure in the CDS
 CDS_CONTESTS:

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

@@ -1,18 +1,22 @@
 ---
 # These tasks configure the CDS
 
-- name: Get the latest CDS release
+- name: Get the CDS release
   uri:
-    url: https://api.github.com/repos/icpctools/icpctools/releases/latest
+    url: https://api.github.com/repos/icpctools/icpctools/releases?per_page=1
     method: GET
     return_content: yes
     status_code: 200
     body_format: json
-  register: latest_cds_release
+  register: latest_cds_release_array
 
 - name: Set CDS latest version
   set_fact:
-    cds_version: "{{ latest_cds_release.json.name | replace('v', '') }}"
+    cds_version: "{{ latest_cds_release_array.json[0].name | replace('v', '') }}"
+
+- name: Set CDS minor version
+  set_fact:
+    cds_version_minor: "{{ cds_version | regex_replace('\\.\\d+$', '') }}"
 
 - name: Check if CDS is installed
   stat:
@@ -46,18 +50,18 @@
 
 - name: Copy new CDS war
   copy:
-    src: /root/CDS-2.3/CDS.war
+    src: /root/CDS-{{ cds_version_minor }}/CDS.war
     dest: /home/domjudge/cds/wlp/usr/servers/cds/apps/CDS.war
     remote_src: yes
     owner: domjudge
     group: domjudge
   when: cds_war.stat.exists
   notify: restart cds
 
-- name: Populate CDS users.xml
+- name: Populate CDS accounts.json
   template:
-    src: users.xml.j2
-    dest: /home/domjudge/cds/wlp/usr/servers/cds/users.xml
+    src: accounts.json.j2
+    dest: /home/domjudge/cds/wlp/usr/servers/cds/config/accounts.json
     owner: domjudge
     group: domjudge
     mode: 0600

icpc-wf/ansible/roles/cds/templates/accounts.json.j2

@@ -0,0 +1,13 @@
+[
+{% for account in CDS_ACCOUNTS %}
+    {
+        "id": "{{ account.username }}",
+        "username": "{{ account.username }}",
+        "password": "{{ account.password }}",
+        "type": "{{ account.type }}"{% if account.team_id is defined %},
+        "team_id": "{{ account.team_id }}"{% endif %}
+
+    }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+]