diff --git a/usr/local/sbin/easyengine b/usr/local/sbin/easyengine index 03d08952..8183156d 100644 --- a/usr/local/sbin/easyengine +++ b/usr/local/sbin/easyengine @@ -596,7 +596,10 @@ MYSQLINFO() then WPDBNAME=$REPLACEDOT fi +} +EEWPDBPREFIX() +{ # Get The WordPress Database Table Prefix WPDBPREFIX=$(grep wpdbprefix /etc/easyengine/ee.conf | awk '{print($3)}') @@ -614,7 +617,10 @@ MYSQLINFO() then WPDBPREFIX=wp_ fi +} +EECREATEDATABASE() +{ # Create Database mysql -h $MYSQLHOST -u $MYSQLUSER -p$MYSQLPASS -e "create database \`$WPDBNAME\`" \ || OwnError "Unable To Create $WPDBNAME Database" @@ -875,6 +881,8 @@ EEWPSETUP() # Call MYSQLINFO Function For MySQL Values MYSQLINFO + EEWPDBPREFIX + EECREATEDATABASE # Modify wp-config.php & Move Outside The Webroot cp /var/www/$DOMAIN/htdocs/wp-config-sample.php \ @@ -1064,10 +1072,10 @@ REMOVEDB() then # MySQL Information MYSQLROOT - WPDBNAME=$(grep DB_NAME /var/www/$DOMAIN/wp-config.php | cut -d"'" -f4) - WPDBUSER=$(grep DB_USER /var/www/$DOMAIN/wp-config.php | cut -d"'" -f4) - WPDBPASS=$(grep DB_PASS /var/www/$DOMAIN/wp-config.php | cut -d"'" -f4) - MYSQLHOST=$(grep DB_HOST /var/www/$DOMAIN/wp-config.php | cut -d"'" -f4) + WPDBNAME=$(grep DB_NAME /var/www/$DOMAIN/*-config.php | cut -d"'" -f4) + WPDBUSER=$(grep DB_USER /var/www/$DOMAIN/*-config.php | cut -d"'" -f4) + WPDBPASS=$(grep DB_PASS /var/www/$DOMAIN/*-config.php | cut -d"'" -f4) + MYSQLHOST=$(grep DB_HOST /var/www/$DOMAIN/*-config.php | cut -d"'" -f4) echo -e " WPDBNAME = $WPDBNAME \n WPDBUSER = $WPDBUSER \n MYSQLHOST = $MYSQLHOST" # Remove Database @@ -1624,6 +1632,29 @@ then # Display Success Message echo -e "\033[37mSuccessfully Created New Website: http://$WWWDOMAIN\e[0m" + elif [ "$EESITECREATE" = "--mysql" ] + then + + # Configure Variable + NGINXCONF=mysql/basic.conf + echo -e "SITENAMECHECK = $SITENAMECHECK \nEESITECREATE = $EESITECREATE \nWPCACHEOPTION = $WPCACHEOPTION \nNETWORKACTIVATE = $NETWORKACTIVATE \nWPSUBDOMAINS = $WPSUBDOMAINS \nNGINXCONF = $NGINXCONF" &>> $INSTALLLOG + + # Setup PHP Nginx + EESITENAME + EEDOMAINSETUP + PERMISSIONANDGIT + + # Call MYSQLINFO Function For MySQL Values + MYSQLINFO + EECREATEDATABASE + + # Add Database Information On ee-config.php + echo -e "define('DB_NAME', '$WPDBNAME'); \ndefine('DB_USER', '$WPDBUSER'); \ndefine('DB_PASSWORD', '$WPDBPASS'); \ndefine('DB_HOST', '$MYSQLHOST');" \ + &>> /var/www/$DOMAIN/ee-config.php + + # Display Success Message + echo -e "\033[37mSuccessfully Created New Website: http://$WWWDOMAIN\e[0m" + elif [ "$EESITECREATE" = "--wp" ] then diff --git a/usr/share/easyengine/nginx/mysql/basic.conf b/usr/share/easyengine/nginx/mysql/basic.conf new file mode 100644 index 00000000..601d6d7b --- /dev/null +++ b/usr/share/easyengine/nginx/mysql/basic.conf @@ -0,0 +1,24 @@ +# MYSQL NGINX CONFIGURATION +server { + + server_name example.com www.example.com; + + access_log /var/log/nginx/example.com.access.log rt_cache; + error_log /var/log/nginx/example.com.error.log; + + root /var/www/example.com/htdocs; + index index.php index.htm index.html; + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location ~ \.php$ { + try_files $uri =404; + include fastcgi_params; + fastcgi_pass php; + } + + include /etc/nginx/common/locations.conf; + +}