diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index a5e90a4..92164b8 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -302,7 +302,7 @@ pm.max_requests = 500 ; The log file for slow requests ; Default Value: not set ; Note: slowlog is mandatory if request_slowlog_timeout is set -slowlog = /var/log/nginx/{POOLNAME}.slow.log +slowlog = /var/log/nginx/__NAMETOCHANGE__.slow.log ; The timeout for serving a single request after which a PHP backtrace will be ; dumped to the 'slowlog' file. A value of '0s' means 'off'. diff --git a/scripts/remove b/scripts/remove index 8a942e1..831ef6b 100644 --- a/scripts/remove +++ b/scripts/remove @@ -28,6 +28,9 @@ domain=$(ynh_app_setting_get "$app" domain) #================================================= ynh_remove_app_dependencies +# The following command is kept as a matter of transition with the previous way +# of managing dependencies +ynh_package_autoremove "wallabag-deps" || true #================================================= # REMOVE THE MYSQL DB @@ -52,14 +55,6 @@ ynh_remove_nginx_config sudo systemctl restart php5-fpm sudo systemctl reload nginx -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_remove_app_dependencies -# The following command is keeped as a matter of transition with the previous way -# of managing dependencies -ynh_package_autoremove "wallabag-deps" || true - #================================================= # REMOVE DEDICATED USER #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4cc5529..e6e98d7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,7 +98,7 @@ ynh_replace_string "{DESKEY}" "${deskey}" "$wb_conf" # Replace files and set permissions ynh_secure_remove "${final_path}/var/cache" sudo mkdir "${final_path}/var/cache" -sudo rsync -a $TMPDIR/* "${final_path}" +sudo cp -a $TMPDIR/. "${final_path}" sudo chown -R $app: "${final_path}" sudo chmod 755 $final_path diff --git a/update.sh b/update.sh deleted file mode 100755 index 96bd911..0000000 --- a/update.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -set -eu - -# check usage -if [[ $# -ne 1 ]]; then - cat << EOF -Usage: `basename $0` version -Update the application version shipped by this package. -EOF - exit 1 -fi - -version=$1 - -# -- helper: -# check that the version is set in a given file. -check_version() { - grep -q "$version" "$1" \ - && echo "[OK]" \ - || echo "[ERROR]" -} - -# set new version -echo ":: set new version: ${version}" - -echo -n "- processing 'scripts/_common.sh'... " -sed -ri "s#^(VERSION=).*#\1\"${version}\"#" \ - ./scripts/_common.sh -check_version "./scripts/_common.sh" - -echo -n "- processing 'manifest.json'... " -sed -ri "s#(\"version\":).*#\1 \"${version}\",#" \ - manifest.json -check_version "./manifest.json" - -echo -n "- processing 'README.md'... " -sed -ri "s#(\*\*Shipped version:\*\*).*#\1 ${version}#" \ - README.md -check_version "./README.md" - -source ./scripts/_common.sh - -# download and calculate the checksum -echo ":: downloading source tarball..." -rm -f "source.tar.gz" -wget -O "source.tar.gz" "$WALLABAG_SOURCE_URL" -calc_sum=$(sha256sum "source.tar.gz" | awk '{print $1}') - -# set new checksum -echo ":: set new checksum: ${calc_sum}" -sed -ri "s#^(WALLABAG_SOURCE_SHA256=).*#\1\"${calc_sum}\"#" \ - ./scripts/_common.sh - -echo "DONE!"