Parcourir la source

* configurarMediaWiki(): arreglar Virtual Hosts

Guzmán Castanedo Villalba il y a 6 ans
Parent
commit
4334ebf651
1 fichiers modifiés avec 12 ajouts et 9 suppressions
  1. 12 9
      install

+ 12 - 9
install

@@ -1303,15 +1303,18 @@ configurarMediaWiki() {
 		chown -R $webServerUser:$webServerGroup /var/www/$dominioMediaWiki
 		comprobarError $? 502
 		# Configuramos VirtualHost
-		if [ $nginxOn = true ];then
-			if [ $sslOn = true ];then
-				virtualHost="./etc/nginx/sites-available/mediawiki-ssl.conf"
-			else
-				virtualHost="./etc/nginx/sites-available/mediawiki.conf"
-			fi
-			if [ ! -f $virtualHost ];then
-				comprobarError $? 502
-			fi
+		if [ $apacheOn = true ] && [ $sslOn = false ];then
+			virtualHost="./etc/apache2/sites-available/mediawiki.conf"
+		elif [ $nginxOn = true ] && [ $sslOn = false ];then
+			virtualHost="./etc/nginx/sites-available/mediawiki.conf"
+		elif [ $apacheOn = true ] && [ $sslOn = true ];then
+			virtualHost="./etc/apache2/sites-available/mediawiki-ssl.conf"
+		elif [ $nginxOn = true ] && [ $sslOn = true ];then
+			virtualHost="./etc/nginx/sites-available/mediawiki-ssl.conf"
+		else
+			comprobarError 1 502
+		fi
+		if [ ! -f $virtualHost ];then
 			comprobarError $? 502
 		fi
 		instalarVirtualHost "/var/www/$dominioMediaWiki" $virtualHost $dominioMediaWiki $aliasMediaWiki