Merge pull request #99 from moodlebox/revert-95-php72

Revert "Patch for using PHP7.2"
moodlebox · Oct 18, 2018 · 4cfa5f1 · 4cfa5f1
2 parents 90f5881 + 64328a7
commit 4cfa5f1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 21 deletions.
diff --git a/roles/install/tasks/packages.yml b/roles/install/tasks/packages.yml
@@ -1,16 +1,5 @@
 ---
 
-- name: add apt-key for PHP7.2 apt repository
-  apt_key:
-    url: 'https://packages.sury.org/php/apt.gpg'
-    state: 'present'
-
-- name: add PHP7.2 apt repository
-  apt_repository:
-    repo: 'deb https://packages.sury.org/php/ stretch main'
-    filename: 'php.list'
-    state: 'present'
-
 - name: uninstall useless packages
   apt:
     pkg: '{{ item }}'

diff --git a/roles/install/vars/main.yml b/roles/install/vars/main.yml
@@ -8,12 +8,12 @@ moodlebox_install_packages:
   - lockfile-progs
   - incron
   - nginx
-  - php7.2-fpm
-  - php7.2-cli
-  - php7.2-xmlrpc
-  - php7.2-curl
-  - php7.2-gd
-  - php7.2-intl
-  - php7.2-soap
-  - php7.2-mysql
+  - php7.0-fpm
+  - php7.0-cli
+  - php7.0-xmlrpc
+  - php7.0-curl
+  - php7.0-gd
+  - php7.0-intl
+  - php7.0-soap
+  - php7.0-mysql
   - php-apcu
diff --git a/roles/network/handlers/main.yml b/roles/network/handlers/main.yml
@@ -11,4 +11,4 @@
     state: 'restarted'
   with_items:
     - 'nginx'
-    - 'php7.2-fpm'
+    - 'php7.0-fpm'
diff --git a/roles/network/templates/etc/nginx/sites-available/default.j2 b/roles/network/templates/etc/nginx/sites-available/default.j2
@@ -23,7 +23,7 @@ server {
 		include fastcgi_params;
 		fastcgi_split_path_info	^(.+\.php)(/.+)$;
 		fastcgi_read_timeout	300;
-		fastcgi_pass	unix:/var/run/php/php7.2-fpm.sock;
+		fastcgi_pass	unix:/var/run/php/php7.0-fpm.sock;
 		fastcgi_index	index.php;
 		fastcgi_param	PATH_INFO	$fastcgi_path_info;
 		fastcgi_param	SCRIPT_FILENAME	$document_root$fastcgi_script_name;