From 7c274f98566eae1935034c4349428343d1bc48f6 Mon Sep 17 00:00:00 2001 From: Mitesh Shah Date: Fri, 6 Jun 2014 15:09:40 +0530 Subject: [PATCH] Fix phpmyadmin and adminer installation --- bin/easyengine | 13 +++++++------ src/modules/system/install/ee_mod_setup_nginx.sh | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bin/easyengine b/bin/easyengine index 52b5ee62..c9993867 100644 --- a/bin/easyengine +++ b/bin/easyengine @@ -33,8 +33,7 @@ then if [ "$EE_SECOND" = "install" ] then - if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ] - then + if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ] || [ "$EE_THIRD" = "postfix" ] || [ "$EE_THIRD" = "phpmyadmin" ] || [ "$EE_THIRD" = "adminer" ]; then if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ]; then # Setup nginx/php repository @@ -42,14 +41,16 @@ then # Fix GnuPG key ee_lib_gpg_key_fix - fi - - # Execute: apt-get update - ee_lib_apt_get_update + fi if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ] || [ "$EE_THIRD" = "postfix" ]; then + + # Execute: apt-get update + ee_lib_apt_get_update + # Install nginx/php/mysql/postfix package ee_mod_install_$EE_THIRD + elif [ "$EE_THIRD" = "adminer" ] || [ "$EE_THIRD" = "phpmyadmin" ];then # Install phpmyadmin/adminer ee_ven_install_$EE_THIRD diff --git a/src/modules/system/install/ee_mod_setup_nginx.sh b/src/modules/system/install/ee_mod_setup_nginx.sh index 9b411755..ab76e6b2 100644 --- a/src/modules/system/install/ee_mod_setup_nginx.sh +++ b/src/modules/system/install/ee_mod_setup_nginx.sh @@ -46,7 +46,7 @@ function ee_mod_setup_nginx() cp -a /usr/share/easyengine/nginx/conf.d /usr/share/easyengine/nginx/common /etc/nginx # Setup port 22222 - cp -v /usr/share/easyengine/nginx/22222 /etc/nginx/sites-available/ + cp /usr/share/easyengine/nginx/22222 /etc/nginx/sites-available/ # Create a symbolic link for 22222 if [ ! -L /etc/nginx/sites-enabled/22222 ]; then