Browse Source

Fixed site bindings.

Nathaniel van Diepen 9 years ago
parent
commit
20c30044d0

+ 4 - 12
data/etc/apache2/sites-available/omnimaga.conf

@@ -1,23 +1,15 @@
-<VirtualHost omnimaga.org:80>
-	UseCanonicalName Off
+<VirtualHost *:80>
 	ServerName omnimaga.org
-	VirtualDocumentRoot /var/www/omnimaga
+	ServerAlias www.omnimaga.org
+	DocumentRoot /var/www/omnimaga
 	<Directory /var/www/omnimaga>
-		AddHandler cgi-script .cgi
 		Options +ExecCGI +Indexes +FollowSymLinks +MultiViews
 		AllowOverride All
 		RewriteEngine On
-		# Require all granted
 		Order allow,deny
 		allow from all
 	</Directory>
 	ErrorLog ${APACHE_LOG_DIR}/error.log
-	# Possible values include: debug, info, notice, warn, error, crit, alert, emerg.
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 	ServerAdmin [email protected]
-</VirtualHost>
-<VirtualHost www.omnimaga.org:80>
-	Redirect 301 / http://omnimaga.org/
-</VirtualHost>
-Listen omnimaga.org:80
-Listen www.omnimaga.org:80
+</VirtualHost>

+ 3 - 8
data/etc/apache2/sites-available/pma.conf

@@ -1,19 +1,14 @@
-<VirtualHost pma.omnimaga.org:80>
-	UseCanonicalName Off
+<VirtualHost *:80>
 	ServerName pma.omnimaga.org
-	VirtualDocumentRoot /var/www/phpmyadmin
+	DocumentRoot /var/www/phpmyadmin
 	<Directory /var/www/phpmyadmin>
-		AddHandler cgi-script .cgi
 		Options +ExecCGI +Indexes +FollowSymLinks +MultiViews
 		AllowOverride All
 		RewriteEngine On
-		# Require all granted
 		Order allow,deny
 		allow from all
 	</Directory>
 	ErrorLog ${APACHE_LOG_DIR}/error.log
-	# Possible values include: debug, info, notice, warn, error, crit, alert, emerg.
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 	ServerAdmin [email protected]
-</VirtualHost>
-Listen pma.omnimaga.org:80
+</VirtualHost>