Skip to content

Commit d46e704

Browse files
committed
Become PHP version agnostic by getting the fact in an earlier role
This introduces a dependency for system_fixes but to prevent unwanted linkage this is left up to the user.
1 parent b563864 commit d46e704

File tree

2 files changed

+10
-5
lines changed
  • provision-contest/ansible/roles

2 files changed

+10
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040

4141
- name: set PHP timezone for FPM
4242
lineinfile:
43-
dest: /etc/php/7.4/fpm/php.ini
43+
dest: "/etc/php/{{ php_version.stdout }}/fpm/php.ini"
4444
state: present
4545
regexp: 'date\.timezone\s*='
4646
line: 'date.timezone = {{ TIMEZONE }}'
4747

4848
- name: enable PHP modules
4949
command: phpenmod {{ item }}
5050
args:
51-
creates: /etc/php/7.4/fpm/conf.d/20-{{ item }}.ini
51+
creates: "/etc/php/{{ php_version.stdout }}/fpm/conf.d/20-{{ item }}.ini"
5252
loop:
5353
- zip
5454
- intl
@@ -86,15 +86,15 @@
8686

8787
- name: symlink domjudge FPM conf
8888
file:
89-
path: /etc/php/7.4/fpm/pool.d/domjudge.conf
89+
path: "/etc/php/{{ php_version.stdout }}/fpm/pool.d/domjudge.conf"
9090
src: "{{ DJ_DIR }}/etc/domjudge-fpm.conf"
9191
state: link
9292
force: true
9393
notify: restart PHP FPM
9494

9595
- name: set PHP settings
9696
lineinfile:
97-
dest: /etc/php/7.4/fpm/pool.d/domjudge.conf
97+
dest: "/etc/php/{{ php_version.stdout }}/fpm/pool.d/domjudge.conf"
9898
regexp: "{{ item.regexp }}"
9999
line: "{{ item.key }} = {{ item.value }}"
100100
loop:

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
---
22
# These tasks perform miscellaneous fixes to the base system.
33

4+
- name: Check installed PHP version
5+
command: php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;'
6+
register: php_version
7+
changed_when: false
8+
49
- name: set timezone
510
timezone:
611
name: "{{ TIMEZONE }}"
712

813
- name: set PHP timezone for CLI
914
lineinfile:
10-
dest: /etc/php/7.4/cli/php.ini
15+
dest: "/etc/php/{{ php_version.stdout }}/cli/php.ini"
1116
state: present
1217
regexp: 'date\.timezone\s*='
1318
line: 'date.timezone = {{ TIMEZONE }}'

0 commit comments

Comments
 (0)