diff options
| author | Dan Rue <dan.rue@linaro.org> | 2017-06-23 15:20:57 +0000 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2017-06-23 15:20:57 +0000 |
| commit | 692f9eb67d4daeabe093868c41e39c3cf97a06a2 (patch) | |
| tree | 140f3e54579272bcb829aabca634d0bcd51e3d48 | |
| parent | 7ff2c8933af1d44175ad4f38e69fba8eba9c5565 (diff) | |
| parent | 091c1f30e783b5a74efefc0b9b38b27c128cd690 (diff) | |
Merge "linux: fix nginx installation on debian"
| -rwxr-xr-x | automated/linux/lemp/lemp.sh | 11 | ||||
| -rwxr-xr-x | automated/linux/nginx-apache-bench/apache-bench.sh | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/automated/linux/lemp/lemp.sh b/automated/linux/lemp/lemp.sh index 99f4b02..fcc13d1 100755 --- a/automated/linux/lemp/lemp.sh +++ b/automated/linux/lemp/lemp.sh @@ -18,18 +18,11 @@ dist_name # shellcheck disable=SC2154 case "${dist}" in debian) - dist_info - # shellcheck disable=SC2154 - if [ "${Codename}" = "jessie" ]; then - install_deps "mysql-server php5-mysql php5-fpm curl" - install_deps "-t jessie-backports nginx" - else - install_deps "nginx mysql-server php5-mysql php5-fpm curl" - fi - # Stop apache server in case it is installed and running. systemctl stop apache2 > /dev/null 2>&1 || true + install_deps "nginx mysql-server php5-mysql php5-fpm curl" + systemctl restart nginx systemctl restart mysql diff --git a/automated/linux/nginx-apache-bench/apache-bench.sh b/automated/linux/nginx-apache-bench/apache-bench.sh index 3bdccfc..2300a01 100755 --- a/automated/linux/nginx-apache-bench/apache-bench.sh +++ b/automated/linux/nginx-apache-bench/apache-bench.sh @@ -32,12 +32,12 @@ dist_name # shellcheck disable=SC2154 case "${dist}" in debian) - pkgs="nginx apache2-utils" - install_deps "${pkgs}" "${SKIP_INSTALL}" - # Stop apache server in case it is installed and running. systemctl stop apache2 > /dev/null 2>&1 || true + pkgs="nginx apache2-utils" + install_deps "${pkgs}" "${SKIP_INSTALL}" + systemctl restart nginx ;; centos) |