- Removed ufw configuration from installer to avoid "PHP Notice: Undefined index: ufw in /tmp/trunk/install/install.php on line 251".

- Changed phpMyAdmin location in ISPConfig nginx vhost to allow phpmyadmin and phpmyadmin/ (with and without trailing slash).

Author: falkotimme

install/install.php

@@ -247,18 +247,10 @@
 	$inst->configure_apps_vhost();
 
 	//* Configure Firewall
-	//** Configure Firewall	
-	if($conf['ufw']['installed'] == true) {
-		//* Configure UFW Firewall
-		$conf['services']['firewall'] = true;
-		swriteln('Configuring UFW Firewall');
-		$inst->configure_ufw_firewall();
-	} else {
-		//* Configure Bastille Firewall
-		$conf['services']['firewall'] = true;
-		swriteln('Configuring Bastille Firewall');
-		$inst->configure_firewall();
-	}
+	//* Configure Bastille Firewall
+	$conf['services']['firewall'] = true;
+	swriteln('Configuring Bastille Firewall');
+	$inst->configure_firewall();
 
     //* Configure Fail2ban
     if($conf['fail2ban']['installed'] == true) {

install/tpl/nginx_ispconfig.vhost.master

@@ -29,7 +29,7 @@ server {
                deny  all;
         }
 
-        location /phpmyadmin/ {
+        location /phpmyadmin {
                root /usr/share/;
                index index.php index.html index.htm;
                location ~ ^/phpmyadmin/(.+\.php)$ {