aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMat Booth <mbooth@apache.org>2019-12-14 13:52:40 +0000
committerMat Booth <mbooth@apache.org>2019-12-14 13:52:40 +0000
commit909667885517066a26db74ed72d4dc565641c506 (patch)
tree97503a3bce32851b614f68a91188174d22b9fd5b
parent650170bd0f465e5633c40a3fcc9be296e30fc280 (diff)
downloaddarkpeak-services-909667885517066a26db74ed72d4dc565641c506.tar.gz
darkpeak-services-909667885517066a26db74ed72d4dc565641c506.tar.xz
darkpeak-services-909667885517066a26db74ed72d4dc565641c506.zip
#63 - Fix wiki login issues by ensuring php 7.3 versions of all our deps are installed
-rw-r--r--dev-playbook-template.yml2
-rw-r--r--prod-playbook.yml2
-rw-r--r--roles/apache2/tasks/main.yml4
-rw-r--r--roles/mediawiki/tasks/main.yml4
-rw-r--r--roles/php-fpm/defaults/main.yml2
-rw-r--r--roles/php-fpm/handlers/main.yml2
-rw-r--r--roles/sabredav/tasks/main.yml4
-rw-r--r--roles/ttrss/tasks/main.yml6
8 files changed, 13 insertions, 13 deletions
diff --git a/dev-playbook-template.yml b/dev-playbook-template.yml
index fd3c921..c40b329 100644
--- a/dev-playbook-template.yml
+++ b/dev-playbook-template.yml
@@ -33,7 +33,7 @@
domain_name: darkpeak.localhost
default_web_root: /var/www
- php_fpm_config_path: /etc/php/7.0/fpm
+ php_fpm_config_path: /etc/php/7.3/fpm
php_session_path: /var/lib/php/sessions
postgresql_user: postgres
postgresql_group: postgres
diff --git a/prod-playbook.yml b/prod-playbook.yml
index 6c36adb..5e39ecb 100644
--- a/prod-playbook.yml
+++ b/prod-playbook.yml
@@ -33,7 +33,7 @@
domain_name: darkpeak.org
default_web_root: /var/www
- php_fpm_config_path: /etc/php/7.0/fpm
+ php_fpm_config_path: /etc/php/7.3/fpm
php_session_path: /var/lib/php/sessions
postgresql_user: postgres
postgresql_group: postgres
diff --git a/roles/apache2/tasks/main.yml b/roles/apache2/tasks/main.yml
index b39db1e..eae2492 100644
--- a/roles/apache2/tasks/main.yml
+++ b/roles/apache2/tasks/main.yml
@@ -6,7 +6,7 @@
cache_valid_time: 10800 # 3 hours
with_items:
- apache2
- - libapache2-mod-php7.0
+ - libapache2-mod-php7.3
notify:
- reload apache2
@@ -62,7 +62,7 @@
- proxy_http
- ssl
- rewrite
- - php7.0
+ - php7.3
notify:
- reload apache2
diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml
index 67a49e4..e3c7693 100644
--- a/roles/mediawiki/tasks/main.yml
+++ b/roles/mediawiki/tasks/main.yml
@@ -28,8 +28,8 @@
with_items:
- imagemagick
- mediawiki
- - php7.0-sqlite3
- - php7.0-ldap
+ - php7.3-sqlite3
+ - php7.3-ldap
- name: Commission mediawiki
become_user: www-data
diff --git a/roles/php-fpm/defaults/main.yml b/roles/php-fpm/defaults/main.yml
index ab1b795..b296b5f 100644
--- a/roles/php-fpm/defaults/main.yml
+++ b/roles/php-fpm/defaults/main.yml
@@ -1,4 +1,4 @@
-php_fpm_config_path: /etc/php/7.0/fpm
+php_fpm_config_path: /etc/php/7.3/fpm
php_open_basedir: "{{ web_root }}:/usr/share/php:/tmp"
php_path: /var/lib/php
php_pid_path: /var/run/php
diff --git a/roles/php-fpm/handlers/main.yml b/roles/php-fpm/handlers/main.yml
index 7ee71f2..309cd1e 100644
--- a/roles/php-fpm/handlers/main.yml
+++ b/roles/php-fpm/handlers/main.yml
@@ -1,5 +1,5 @@
---
- name: restart php-fpm
service:
- name: php7.0-fpm
+ name: php7.3-fpm
state: restarted
diff --git a/roles/sabredav/tasks/main.yml b/roles/sabredav/tasks/main.yml
index 689f435..16af96b 100644
--- a/roles/sabredav/tasks/main.yml
+++ b/roles/sabredav/tasks/main.yml
@@ -42,8 +42,8 @@
apt:
name: "{{ item }}"
with_items:
- - php7.0
- - php7.0-xml
+ - php7.3
+ - php7.3-xml
- php-mbstring
- php-mysql
- php-ldap
diff --git a/roles/ttrss/tasks/main.yml b/roles/ttrss/tasks/main.yml
index e016856..16aa215 100644
--- a/roles/ttrss/tasks/main.yml
+++ b/roles/ttrss/tasks/main.yml
@@ -22,9 +22,9 @@
with_items:
- git # For cloning ttrss souece
- php-curl
- - php7.0-mbstring
- - php7.0-pgsql
- - php7.0-xml
+ - php7.3-mbstring
+ - php7.3-pgsql
+ - php7.3-xml
- php-net-ldap2
- name: Clone repository