beenull/webinoly
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.5.0

Browse source
This commit is contained in:
Cristhian Martínez Ochoa 2018-05-13 18:59:46 -06:00
parent f21f8d20d5 4088125ee0
commit dd40579db9
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/sites
View file

@ -90,8 +90,7 @@ dbword_check() {
wpinstall() {
local dom=$(echo $domain | sed "s/[^0-9A-Za-z]/_/g")
[[ $domain == "-mysql" ]] && dom="Webinoly_$(pwgen -s -1)"
[[ $domain == "-mysql" ]] && local dom="Webinoly_$(pwgen -s -1)" || local dom=$(echo $domain | sed "s/[^0-9A-Za-z]/_/g")
local ROOT_PASS=$( echo $(conf_read mysql-root) | openssl enc -d -a -salt )
local AUTOGENPASS_WPDB=`pwgen -s -1`
local setupmysql="y"
@ -477,7 +476,10 @@ deletesite() {
createsite() {
# Check domain and then prevent reserved characters for file names.
domain_check $domain
domain=$(echo $domain | sed "s/[^\.0-9A-Za-z\-]/_/g")
if [[ $(conf_read php) != "true" && ("$wp" == [123] || "$type" == "-php") ]]; then
echo "${red}"
echo " [ERROR] PHP must be installed before you can create a WP site!"