Explorar el Código

* Bug: en instalarVirtualHost() y llamadas

Guzmán Castanedo Villalba hace 6 años
padre
commit
1e294f69d6
Se han modificado 1 ficheros con 13 adiciones y 12 borrados
  1. 13 12
      install

+ 13 - 12
install

@@ -722,7 +722,7 @@ configurarApache() {
 	fi
 	if [ ! -d "/etc/$webServerName/sites-enabled" ]; then
 		mkdir "/etc/$webServerName/sites-enabled" 2>/dev/null
-		comprobarError $? 5 "$webServerRoot/sites-enabled"
+		comprobarError $? 5 "/etc/$webServerName/sites-enabled"
 	fi
 }
 
@@ -760,7 +760,7 @@ configurarNginx() {
 	fi
 	if [ ! -d "/etc/$webServerName/sites-enabled" ]; then
 		mkdir "/etc/$webServerName/sites-enabled" 2>/dev/null
-		comprobarError $? 5 "$webServerRoot/sites-enabled"
+		comprobarError $? 5 "/etc/$webServerName/sites-enabled"
 	fi
 	# Configuramos Usuario y Grupo
 	if [ $debianOS = true ];then
@@ -778,7 +778,6 @@ configurarNginx() {
 instalarVirtualHost() {
 	# Configuramos un Virtual Host para Apache o Nginx
 	# Uso: instalarVirtualHost $root $virtualHost $dominio $alias
-	webServerRoot=$(realpath "/etc/$webServerName/")
 	if [ $# -ge 3 ];then
 		rootVirtualHost=$(realpath $1)
 		shift
@@ -802,7 +801,7 @@ instalarVirtualHost() {
 			sed -i '/ServerName /a\\tServerAlias '$aliasVirtualHost $virtualHostFile
 			comprobarError $? 502
 		fi
-		sed -i '/DocumentRoot /c\DocumentRoot '$dominioVirtualHost $virtualHostFile
+		sed -i '/DocumentRoot /c\DocumentRoot '$rootVirtualHost $virtualHostFile
 		comprobarError $? 502
 		sed -i '/ErrorLog /c\ErrorLog logs/'$dominioVirtualHost'-error.log' $virtualHostFile
 		comprobarError $? 502
@@ -810,7 +809,7 @@ instalarVirtualHost() {
 		comprobarError $? 502
 	elif [ $nginxOn = true ];then
 		# Configuramos root, dominio, logs y php-fpm.sock (NGINX)
-		sed -i '/root /c\\troot '/var/www/$dominioVirtualHost';' $virtualHostFile
+		sed -i '/root /c\\troot '$rootVirtualHost';' $virtualHostFile
 		comprobarError $? 502
 		sed -i '/server_name /c\\tserver_name '$dominioVirtualHost' '$aliasVirtualHost';' $virtualHostFile
 		comprobarError $? 502
@@ -822,12 +821,12 @@ instalarVirtualHost() {
 		sed -i '/fastcgi_pass /c\\t\tfastcgi_pass unix:'$socket';' $virtualHostFile
 	fi
 	# Copiamos ficheros de configuración
-	cp -f $virtualHostFile "$webServerRoot/sites-available/$virtualHostName" >> $logFile 2>&1
+	cp -f $virtualHostFile "/etc/$webServerName/sites-available/$virtualHostName" >> $logFile 2>&1
 	comprobarError $? 910
-	ln -s "$webServerRoot/sites-available/$virtualHostName" "$webServerRoot/sites-enabled/$virtualHostName" >> $logFile 2>&1
+	ln -s "/etc/$webServerName/sites-available/$virtualHostName" "/etc/$webServerName/sites-enabled/$virtualHostName" >> $logFile 2>&1
 	comprobarError $? 911 $virtualHostName
 	recargarServicio $webServerName
-	unset webServerRoot rootVirtualHost dominioVirtualHost virtualHostFile virtualHostName aliasVirtualHost
+	unset rootVirtualHost dominioVirtualHost virtualHostFile virtualHostName aliasVirtualHost
 }
 
 mostrarDatabase() {
@@ -1065,9 +1064,11 @@ instalarPHPInfo() {
 		if [ ! -f $infoFile ];then
 			comprobarError 1 4 "$infoFile"
 		fi
-		cp -f $infoFile /var/www/html/ 2>/dev/null
+		mkdir /var/www/localhost 2>/dev/null
 		comprobarError $? 106
-		chown -R $webServerUser:$webServerGroup /var/www/html 2>/dev/null
+		cp -f $infoFile /var/www/localhost/ 2>/dev/null
+		comprobarError $? 106
+		chown -R $webServerUser:$webServerGroup /var/www/localhost 2>/dev/null
 		comprobarError $? 106
 		unset infoFile
 		# Instalar VirtualHost
@@ -1082,7 +1083,7 @@ instalarPHPInfo() {
 		else
 			comprobarError 1 106
 		fi
-		instalarVirtualHost "/var/www/html" $virtualHost "localhost"
+		instalarVirtualHost "/var/www/localhost" $virtualHost "localhost"
 		unset virtualHost
 		return 0
 	else
@@ -1306,7 +1307,7 @@ configurarMediaWiki() {
 			fi
 			comprobarError $? 502
 		fi
-		instalarVirtualHost "/etc/$webServerName/" $virtualHost $dominioMediaWiki $aliasMediaWiki
+		instalarVirtualHost "/var/www/$dominioMediaWiki" $virtualHost $dominioMediaWiki $aliasMediaWiki
 		unset virtualHost socket
 	else
 		comprobarError 1 503 $dominioMediaWiki