Browse Source

fixed http 418 I'm teapot error

old-stable
harshadyeola 10 years ago
parent
commit
d52e1b1ee7
  1. 2
      config/bash_completion.d/ee
  2. 3
      src/modules/site/update/ee_mod_update_domain.sh

2
config/bash_completion.d/ee

@ -105,7 +105,7 @@ function EE_AUTO()
if [ "$PREVIOUS2" = "create" ]; then
COMPREPLY=( $( compgen -W "--html --php --mysql --wp --wpsubdir --wpsubdomain" -- $CURRENT ) )
elif [ "$PREVIOUS2" = "update" ]; then
COMPREPLY=( $( compgen -W "--wp --wpsubdir --wpsubdomain" -- $CURRENT ) )
COMPREPLY=( $( compgen -W "--php --mysql --wp --wpsubdir --wpsubdomain" -- $CURRENT ) )
elif [ "$PREVIOUS2" = "delete" ]; then
COMPREPLY=( $( compgen -W "--db --all --files --no-prompt" -- $CURRENT ) )
fi

3
src/modules/site/update/ee_mod_update_domain.sh

@ -31,7 +31,8 @@ function ee_mod_update_domain()
# Update NGINX conf for HTML site
if [ "$EE_SITE_CURRENT_OPTION" = "HTML" ]; then
sed -i 's/access\.log/access.log rt_cache/' $EE_SITE_NGINX_CONF && \
sed -i '/location \/ {/,/}/c \\tindex index.php index.htm index.html' $EE_SITE_NGINX_CONF || ee_lib_error "Unable to update nginx configuration to $EE_SITE_CREATE_OPTION, $EE_SITE_CACHE_OPTION for $EE_DOMAIN, exit status =" $?
sed -i '/index index.html index.htm;$/d' $EE_SITE_NGINX_CONF && \
sed -i '/location \/ {/,/}/c \\tindex index.php index.htm index.html;' $EE_SITE_NGINX_CONF || ee_lib_error "Unable to update nginx configuration to $EE_SITE_CREATE_OPTION, $EE_SITE_CACHE_OPTION for $EE_DOMAIN, exit status =" $?
if [ "$EE_SITE_CACHE_OPTION" = "--basic" ] || [[ "$EE_SITE_CREATE_OPTION" = "--php" || "$EE_SITE_CREATE_OPTION" = "--mysql" ]]; then
sed -i '/include common\/locations.conf/i \\tinclude common\/php.conf;' $EE_SITE_NGINX_CONF || ee_lib_error "Unable to update nginx configuration to $EE_SITE_CREATE_OPTION, $EE_SITE_CACHE_OPTION for $EE_DOMAIN, exit status =" $?
elif [ "$EE_SITE_CACHE_OPTION" = "--wpfc" ]; then

Loading…
Cancel
Save