Browse Source

Display HTTP Auth after site create, bug fix, easyengine version update

old-stable
harshadyeola 10 years ago
parent
commit
2d3ed50cc3
  1. 11
      bin/easyengine
  2. 4
      src/lib/ee_lib_package_check.sh
  3. 2
      src/lib/ee_lib_stack_packages.sh
  4. 2
      src/lib/ee_lib_variables.sh

11
bin/easyengine

@ -427,6 +427,11 @@ elif [ "$EE_FIRST" = "site" ]; then
# Git commit # Git commit
ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options" ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
# Display Http Auth credentials
if [ "$EE_DISPLAY" = "true" ]; then
ee_lib_echo_info "HTTP Authentication username: easyengine"
ee_lib_echo_info "HTTP Authentication password: $(grep "HTTP Authentication password:" $EE_COMMAND_LOG | tail -n1 | awk '{print $4}')"
fi
# Display Success Message # Display Success Message
ee_lib_echo_info "Successfully Created New Website: http://$EE_WWW_DOMAIN" ee_lib_echo_info "Successfully Created New Website: http://$EE_WWW_DOMAIN"
elif [ "$EE_SITE_CREATE_OPTION" = "--wp" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then elif [ "$EE_SITE_CREATE_OPTION" = "--wp" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
@ -471,6 +476,12 @@ elif [ "$EE_FIRST" = "site" ]; then
# Execute: service nginx reload # Execute: service nginx reload
ee_lib_service nginx reload ee_lib_service nginx reload
# Display Http Auth credentials
if [ "$EE_DISPLAY" = "true" ]; then
ee_lib_echo_info "HTTP Authentication username: easyengine"
ee_lib_echo_info "HTTP Authentication password: $(grep "HTTP Authentication password:" $EE_COMMAND_LOG | tail -n1 | awk '{print $4}')"
fi
# Display WordPress credential # Display WordPress credential
echo echo
ee_lib_echo_info "WordPress Admin Username: $EE_WP_USER" ee_lib_echo_info "WordPress Admin Username: $EE_WP_USER"

4
src/lib/ee_lib_package_check.sh

@ -2,6 +2,10 @@
function ee_lib_package_check() function ee_lib_package_check()
{ {
# If nginx is not installed and php is installed
# ee site create example.com --wp is tries to installl php as $EE_PACKAGE_NAME=nginx-custom
EE_PACKAGE_NAME=""
local ee_package local ee_package
for ee_package in $@;do for ee_package in $@;do

2
src/lib/ee_lib_stack_packages.sh

@ -9,6 +9,8 @@ function ee_lib_stack_packages()
if [ "$ee_stack_package" = "nginx" ]; then if [ "$ee_stack_package" = "nginx" ]; then
ee_lib_package_check $EE_NGINX_PACKAGE ee_lib_package_check $EE_NGINX_PACKAGE
if [ "$EE_PACKAGE_NAME" != "" ]; then if [ "$EE_PACKAGE_NAME" != "" ]; then
# Export EE_DISPLAY variable to Display ee http auth after site creation.
export EE_DISPLAY=true
# The following command creates its own sub-shell # The following command creates its own sub-shell
# and our ee_lib_error function only exit from that sub-shell # and our ee_lib_error function only exit from that sub-shell
# so we need to exit from parent shell also # so we need to exit from parent shell also

2
src/lib/ee_lib_variables.sh

@ -1,7 +1,7 @@
# Define global variables # Define global variables
# EasyEngine version # EasyEngine version
readonly EE_VERSION='2.1.0' readonly EE_VERSION='2.2.0'
# WP-CLI version # WP-CLI version
readonly EE_WP_CLI_VERSION='0.17.0' readonly EE_WP_CLI_VERSION='0.17.0'

Loading…
Cancel
Save