From 0ee22c71f98b4d9481c03bf3032e1b8d94c8f12f Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 26 Sep 2011 13:54:48 +0000
Subject: [PATCH] - 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).
---
install/install.php | 16 ++++------------
install/tpl/nginx_ispconfig.vhost.master | 2 +-
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/install/install.php b/install/install.php
index 4dce11cf43..4a04ec3ad2 100644
--- a/install/install.php
+++ b/install/install.php
@@ -247,18 +247,10 @@ if($install_mode == 'standard') {
$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) {
diff --git a/install/tpl/nginx_ispconfig.vhost.master b/install/tpl/nginx_ispconfig.vhost.master
index c7274fb45b..2c9173b151 100644
--- a/install/tpl/nginx_ispconfig.vhost.master
+++ b/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)$ {
--
GitLab