lukechilds
/
easyengine
mirror of https://github.com/lukechilds/easyengine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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

old-stable
gau1991 11 years ago
parent
7ea7c3aa1d 932c437381
commit
247ad913a2
4 changed files with 112 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      .travis.yml
  2. 105
      bin/easyengine
  3. 18
      bin/ee
  4. 2
      src/modules/site/ee_mod_site_edit.sh

9
.travis.yml
View File

@ -41,8 +41,13 @@ script:
- sudo bash ee site create wpsubdirwpfc.com --wpsubdirectory --wpfc
- sudo bash ee site create wpsubdomainwpfc.com --wpfc --wpsubdom
- sudo cat /var/log/easyengine/*
- sudo mysql -e "show databases";
- sudo bash ee site delete wwpsubdomainwpsc.com --files --no-prompt
- sudo bash ee site delete wpwpfc.com --db --no-prompt
- sudo bash ee site delete wpsubdirwpfc.com --all --no-prompt
- sudo bash ee site delete wpsubdomainwpfc.com --no-prompt
- sudo mysql -e "show databases";
- sudo cat /var/log/easyengine/*
- sudo wp --allow-root --info

105
bin/easyengine
View File

@ -207,6 +207,50 @@ elif [ "$EE_FIRST" = "site" ]; then
|| ee_lib_error "Unable to display NGINX configuration for $EE_DOMAIN, exit status = " $?
fi
fi
elif [ "$EE_SECOND" = "enable" ]; then
# Check the website name is empty or not
EE_DOMAIN_CHECK=$EE_THIRD
ee_lib_check_domain
# Creating symbolic link
ee_lib_echo "Creating symbolic link for $EE_DOMAIN"
ee_lib_symbolic_link /etc/nginx/sites-available/$EE_DOMAIN /etc/nginx/sites-enabled/
# Execute: service nginx reload
ee_lib_service nginx reload
# Git commit
ee_lib_git /etc/nginx/ "Enable website: $EE_DOMAIN"
elif [ "$EE_SECOND" = "disable" ]; then
# Check the website name is empty or not
EE_DOMAIN_CHECK=$EE_THIRD
ee_lib_check_domain
# Remove symbolic link
ee_lib_echo "Removing symbolic link for $EE_DOMAIN"
rm /etc/nginx/sites-enabled/$EE_DOMAIN \
|| ee_lib_error "Unable to remove symbolic link for $EE_DOMAIN, exit status = " $?
# Execute: service nginx reload
ee_lib_service nginx reload
# Git commit
ee_lib_git /etc/nginx/ "Disable website: $EE_DOMAIN"
elif [ "$EE_SECOND" = "edit" ]; then
# Check the website name is empty or not
EE_DOMAIN_CHECK=$EE_THIRD
ee_lib_check_domain
# Edit the NGINX configuration for $EE_DOMAIN
ee_mod_site_edit "$EE_THIRD"
if [ $(cd /etc/nginx; git status -s /etc/nginx/sites-available/$EE_DOMAIN | wc -l) -ne 0 ]; then
# Git commit
ee_lib_git /etc/nginx/ "Edit website: $EE_DOMAIN"
# Execute: service nginx reload
ee_lib_service nginx reload
fi
elif [ "$EE_SECOND" = "create" ]; then
# Configure variables
EE_DOMAIN_CHECK=$EE_THIRD
@ -271,7 +315,6 @@ elif [ "$EE_FIRST" = "site" ]; then
# Display Success Message
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
if [ "$EE_SITE_CACHE_OPTION" = "--basic" ] || [ "$EE_SITE_CACHE_OPTION" = "--wpsc" ] || [ "$EE_SITE_CACHE_OPTION" = "--w3tc" ] || [ "$EE_SITE_CACHE_OPTION" = "--wpfc" ]; then
# Configure variable
EE_NGINX_CONF=$(echo $EE_SITE_CREATE_OPTION | cut -c3-)/$(echo $EE_SITE_CACHE_OPTION | cut -c3-).conf
@ -327,30 +370,72 @@ elif [ "$EE_FIRST" = "site" ]; then
fi
fi
if [ "$EE_SITE_CACHE_OPTION" = "--wpfc" ]; then
if [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
ee_lib_echo_escape "Configure nginx-helper:\thttp://$EE_DOMAIN/wp-admin/network/settings.php?page=nginx"
else
ee_lib_echo_escape "Configure nginx-helper:\thttp://$EE_DOMAIN/wp-admin/options-general.php?page=nginx"
fi
fi
if [ "$EE_SITE_CACHE_OPTION" = "--w3tc" ] || [ "$EE_SITE_CACHE_OPTION" = "--wpfc" ]; then
if [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
ee_lib_echo_escape "Configure W3TC:\t\thttp://$EE_DOMAIN/wp-admin/network/admin.php?page=w3tc_general"
else
ee_lib_echo_escape "Configure W3TC:\t\thttp://$EE_DOMAIN/wp-admin/admin.php?page=w3tc_general"
fi
ee_lib_echo_escape "Page Cache:\t\tDisk Enhanced"
if [ "$EE_SITE_CACHE_OPTION" = "--wpfc" ]; then
ee_lib_echo_escape "Page Cache:\t\tDisable"
elif [ "$EE_SITE_CACHE_OPTION" = "--w3tc" ]; then
ee_lib_echo_escape "Page Cache:\t\tDisk Enhanced"
fi
ee_lib_echo_escape "Database Cache:\t\tMemcache"
ee_lib_echo_escape "Object Cache:\t\tMemcache"
ee_lib_echo_escape "Browser Cache:\t\tDisable"
fi
if [ "$EE_SITE_CACHE_OPTION" = "--wpfc" ]; then
if [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
ee_lib_echo_escape "Configure nginx-helper:\thttp://$EE_DOMAIN/wp-admin/network/settings.php?page=nginx"
else
ee_lib_echo_escape "Configure nginx-helper:\thttp://$EE_DOMAIN/wp-admin/options-general.php?page=nginx"
fi
fi
# Display Success Message
ee_lib_echo_info "Successfully created new website: http://$EE_WWW_DOMAIN"
fi
fi
elif [ "$EE_SECOND" = "delete" ]; then
# Check the website name is empty or not
EE_DELETE_ARGS=$EE_FOURTH
EE_DOMAIN_CHECK=$EE_THIRD
ee_lib_check_domain
# Use default whenever possible
# ee site delete example.com
# ee site delete example.com --no-prompt
if [ "$EE_DELETE_ARGS" = "" ]; then
EE_DELETE_ARGS="--all"
elif [ "$EE_DELETE_ARGS" = "--no-prompt" ]; then
EE_DELETE_ARGS="--all"
EE_FIFTH="--no-prompt"
fi
if [ "$EE_DELETE_ARGS" = "--db" ]; then
# Delete MySQL database
ee_mod_delete_database $EE_FIFTH
elif [ "$EE_DELETE_ARGS" = "--files" ]; then
# Delete webroot
ee_mod_delete_webroot $EE_FIFTH
elif [ "$EE_DELETE_ARGS" = "--all" ]; then
# Delete MySQL database
ee_mod_delete_database $EE_FIFTH
# Delete webroot
ee_mod_delete_webroot $EE_FIFTH
# Delete NGINX configuration file
ee_mod_delete_nginxconf $EE_FIFTH
# Git commit
ee_lib_git /etc/nginx/ "Delete website: $EE_DOMAIN"
# Execute: service nginx reload
ee_lib_service nginx reload
fi
fi
fi

18
bin/ee
View File

@ -1617,28 +1617,28 @@ then
# Check SITENAME Is Empty Or Not
EE_DOMAIN_CHECK=$EE_THIRD
SITEDELETEARG=$4
EE_DELETE_ARGS=$4
ee_lib_check_domain
# USE DEFAULT WHEN POSSIBLES
if [ "$SITEDELETEARG" = "" ]
if [ "$EE_DELETE_ARGS" = "" ]
then
SITEDELETEARG=--all
EE_DELETE_ARGS=--all
fi
if [ "$SITEDELETEARG" = "--db" ]
if [ "$EE_DELETE_ARGS" = "--db" ]
then
# Remove Database
ee_mod_delete_database
elif [ "$SITEDELETEARG" = "--files" ]
elif [ "$EE_DELETE_ARGS" = "--files" ]
then
# Remove Webroot
ee_mod_delete_webroot
elif [ "$SITEDELETEARG" = "--all" ]
elif [ "$EE_DELETE_ARGS" = "--all" ]
then
# Remove All Database And Webroot
@ -1653,10 +1653,10 @@ then
# Take Nginx Configuration In Git Version Control
EE_GIT_DIR=/etc/nginx
EE_GIT_MESSAGE="Delete Website With $SITEDELETEARG Option: $EE_DOMAIN"
EE_GIT_MESSAGE="Delete Website With $EE_DELETE_ARGS Option: $EE_DOMAIN"
ee_lib_git_commit
elif [ "$SITEDELETEARG" = "--all---no-prompt" ]
elif [ "$EE_DELETE_ARGS" = "--all---no-prompt" ]
then
# Remove All Database And Webroot
@ -1671,7 +1671,7 @@ then
# Take Nginx Configuration In Git Version Control
EE_GIT_DIR=/etc/nginx
EE_GIT_MESSAGE="Delete Website With $SITEDELETEARG Option: $EE_DOMAIN"
EE_GIT_MESSAGE="Delete Website With $EE_DELETE_ARGS Option: $EE_DOMAIN"
ee_lib_git_commit
fi

2
src/modules/site/ee_mod_site_edit.sh
View File

@ -2,5 +2,5 @@
function ee_mod_site_edit()
{
sensible-editor /etc/nginx/sites-available/$EE_DOMAIN $EE_VIM 2> /dev/null
sensible-editor /etc/nginx/sites-available/$EE_DOMAIN $1 2> /dev/null
}

Write Preview
Loading…
Cancel
Save