From 333a9f71348b0cbf290b6ae0ac0d3fc931ee4c67 Mon Sep 17 00:00:00 2001
From: Yalh <yalh@yalh.net>
Date: Tue, 15 Jan 2019 06:57:37 +0100
Subject: [PATCH] add rerun

---
 conf/nginx.conf   | 2 +-
 conf/php-fpm.conf | 2 +-
 scripts/upgrade   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 0a4895c..f2277ea 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -18,7 +18,7 @@ location __PATH__/ {
   try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    fastcgi_pass unix:/var/run/php7.0-fpm-__NAME__.sock;
+    fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
 
     fastcgi_index index.php;
     include fastcgi_params;
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index f8c4152..e7b169b 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -30,7 +30,7 @@ group = __USER__
 ;                            specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /var/run/php7.0-fpm-__NAMETOCHANGE__.sock
+listen = /var/run/php/php7.0-fpm-__NAMETOCHANGE__.sock
 
 ; Set listen(2) backlog. A value of '-1' means unlimited.
 ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
diff --git a/scripts/upgrade b/scripts/upgrade
index 8585521..2e1618c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -121,7 +121,7 @@ sudo ./concrete/bin/concrete5 c5:config -g set concrete.maintenance_mode true --
 popd
 ynh_setup_source "$final_path"
 pushd $final_path
-sudo ./concrete/bin/concrete5 c5:update --verbose --no-interaction --allow-as-root
+sudo ./concrete/bin/concrete5 c5:update --rerun --verbose --no-interaction --allow-as-root
 sudo ./concrete/bin/concrete5 c5:config -g set concrete.maintenance_mode false --allow-as-root --no-interaction
 popd