From d0423afd185b50019be9218a42c4f1f3bea83046 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Fri, 22 Sep 2017 11:10:48 -0400 Subject: [PATCH] Nextcloud install shouldn't fail if php-fpm isn't already running --- setup/owncloud.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/owncloud.sh b/setup/owncloud.sh index b193120..760aa3b 100755 --- a/setup/owncloud.sh +++ b/setup/owncloud.sh @@ -161,9 +161,9 @@ owncloud_hash=beab41f6a748a43f0accfa6a9808387aef718c61 if [ ! -d /usr/local/lib/owncloud/ ] \ || ! grep -q $owncloud_ver /usr/local/lib/owncloud/version.php; then - # Stop php-fpm - hide_output service php7.0-fpm stop - hide_output service php5-fpm stop + # Stop php-fpm if running. If theyre not running (which happens on a previously failed install), dont bail. + service php7.0-fpm stop &> /dev/null || /bin/true + service php5-fpm stop &> /dev/null || /bin/true # Backup the existing ownCloud/Nextcloud. # Create a backup directory to store the current installation and database to