Browse Source

Merge branch 'next' of github.com:rtCamp/easyengine into next

bugfixes
harshadyeola 10 years ago
parent
commit
893c917e3d
  1. 8
      bin/update
  2. 4
      src/modules/secure/ee_mod_secure_auth.sh

8
bin/update

@ -427,7 +427,13 @@ if [[ $EE_CURRENT_VERSION < $EE_LATEST_VERSION ]]; then
EE_CURRENT_VERSION="2.1.0"
fi
# if [[ $EE_CURRENT_VERSION = 2.1.0 ]]; then
if [[ $EE_CURRENT_VERSION = 2.1.0 ]]; then
# Update EasyEngine current version
EE_CURRENT_VERSION="2.1.0"
fi
# if [[ $EE_CURRENT_VERSION = 2.2.0 ]]; then
# fi
fi

4
src/modules/secure/ee_mod_secure_auth.sh

@ -22,8 +22,8 @@ function ee_mod_secure_auth()
# Add HTTP authentication details
echo
ee_lib_echo_info "HTTP authentication username: $ee_http_auth_user"
ee_lib_echo_info "HTTP authentication password: $ee_http_auth_pass"
ee_lib_echo "HTTP authentication username: $ee_http_auth_user" &>> $EE_COMMAND_LOG
ee_lib_echo "HTTP authentication password: $ee_http_auth_pass" &>> $EE_COMMAND_LOG
# Generate htpasswd-ee file
printf "$ee_http_auth_user:$(openssl passwd -crypt $ee_http_auth_pass 2> /dev/null)\n" > /etc/nginx/htpasswd-ee 2> /dev/null

Loading…
Cancel
Save