Skip to content

Commit a9cffd4

Browse files
committed
Restructure to make it easier to read
Also this is the new preferred ansible style
1 parent d6f7f7c commit a9cffd4

File tree

10 files changed

+51
-13
lines changed

10 files changed

+51
-13
lines changed

provision-contest/ansible/roles/domjudge_build/handlers/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
command: make -C {{ DJ_DIR }} inplace-postinstall-permissions
44

55
- name: restart rsyslog
6-
service: name=rsyslog enabled=true state=restarted
6+
service:
7+
name: rsyslog
8+
enabled: true
9+
state: restarted

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@
1616
- name: Create working copy of the domjudge repo
1717
become: true
1818
become_user: domjudge
19-
git: repo={{ dj_git_repo }} dest={{ DJ_DIR }} version={{ DJ_BRANCH }} accept_hostkey=yes update=yes
19+
git:
20+
repo: "{{ dj_git_repo }}"
21+
dest: "{{ DJ_DIR }}"
22+
version: "{{ DJ_BRANCH }}"
23+
accept_hostkey: true
24+
update: true
2025
register: git_working_copy
2126

2227
- name: Check composer dependencies present
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
---
22
- name: restart gdm
3-
service: name=gdm3 enabled=true state=restarted
3+
service:
4+
name: gdm3
5+
enabled: true
6+
state: restarted
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
---
22
- name: restart PHP FPM
3-
service: name=php7.4-fpm enabled=true state=restarted
3+
service:
4+
name: php7.4-fpm
5+
enabled: true
6+
state: restarted

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@
1212
group: root
1313
owner: root
1414
mode: 0644
15-

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@
22
# These tasks configure the DOMjudge judgedaemon with chroot
33

44
- name: create domjudge-run users
5-
user: name=domjudge-run-{{ item }} createhome=no home=/nonexistent group=nogroup shell=/bin/false
5+
user:
6+
name: "domjudge-run-{{ item }}"
7+
createhome: false
8+
home: /nonexistent
9+
group: nogroup
10+
shell: /bin/false
611
loop: "{{ cpucore }}"
712

813
- name: create domjudge-run group
9-
group: name=domjudge-run state=present
14+
group:
15+
name: domjudge-run
16+
state: present
1017

1118
- name: create temp package directory
1219
file:
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
---
22
- name: restart keepalived service
3-
service: name=keepalived state=restarted
3+
service:
4+
name: keepalived
5+
state: restarted

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
notify: restart mysql
2424

2525
- name: copy script to setup replication
26-
template: src=setup-replication.sh.j2 dest=/usr/local/sbin/setup-replication.sh mode=0755
26+
template:
27+
src: setup-replication.sh.j2
28+
dest: /usr/local/sbin/setup-replication.sh
29+
mode: 0755
2730

2831
- name: create mysql replication user
2932
mysql_user:
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
---
22
- name: restart mysql
3-
service: name=mysql enabled=true state=restarted
3+
service:
4+
name: mysql
5+
enabled: true
6+
state: restarted
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
---
22
- name: restart php-exporter
3-
service: name=php-fpm-exporter enabled=true state=restarted
3+
service:
4+
name: php-fpm-exporter
5+
enabled: true
6+
state: restarted
7+
daemon_reload: true
48

59
- name: restart nginx-exporter
6-
service: name=prometheus-nginx-exporter enabled=true state=restarted
10+
service:
11+
name: prometheus-nginx-exporter
12+
enabled: true
13+
state: restarted
714

815
- name: restart mysqld-exporter
9-
service: name=prometheus-mysqld-exporter enabled=true state=restarted
16+
service:
17+
name: prometheus-mysqld-exporter
18+
enabled: true
19+
state: restarted

0 commit comments

Comments
 (0)