summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xautomated/linux/lemp/lemp.sh11
-rwxr-xr-xautomated/linux/nginx-apache-bench/apache-bench.sh6
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)