From 794f4cc5ab8a45ae90004d8578cfb159ec545de3 Mon Sep 17 00:00:00 2001 From: Mitesh Shah Date: Fri, 10 Oct 2014 16:43:19 +0530 Subject: [PATCH] Fixed http auth display --- bin/easyengine | 6 ++++++ src/modules/stack/install/ee_mod_setup_nginx.sh | 2 ++ 2 files changed, 8 insertions(+) diff --git a/bin/easyengine b/bin/easyengine index 00011c2a..e5417862 100644 --- a/bin/easyengine +++ b/bin/easyengine @@ -220,6 +220,9 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then fi fi # Display success message + if [ "$EE_THIRD" = "" ] || [ "$EE_THIRD" = "web" ]; then + EE_THIRD="Web packages" + fi ee_lib_echo "$EE_THIRD successfully installed" # EasyEngine remove/purge @@ -293,6 +296,9 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then fi # Display success message + if [ "$EE_THIRD" = "" ] || [ "$EE_THIRD" = "web" ]; then + EE_THIRD="Web packages" + fi if [ "$EE_SECOND" = "remove" ];then ee_lib_echo "$EE_THIRD successfully removed" elif [ "$EE_SECOND" = "purge" ];then diff --git a/src/modules/stack/install/ee_mod_setup_nginx.sh b/src/modules/stack/install/ee_mod_setup_nginx.sh index f2482aa1..53d6139b 100644 --- a/src/modules/stack/install/ee_mod_setup_nginx.sh +++ b/src/modules/stack/install/ee_mod_setup_nginx.sh @@ -98,6 +98,8 @@ function ee_mod_setup_nginx() # Generate htpasswd-ee file if [ ! -f /etc/nginx/htpasswd-ee ]; then + # Export EE_DISPLAY variable to Display ee http auth after site creation. + export EE_DISPLAY=true # Use same variable name as used in ee_mod_secure_auth function EE_HTTP_AUTH_USER=easyengine EE_HTTP_AUTH_PASS=$ee_random