Malfunction - Changes in imscp.conf are lost after upgrading

CHANGELOG

@@ -83,6 +83,7 @@ Tickets:
 	- Fixed #311: Defect - autoinstaller cleans squirrel data folder
 	- Fixed #313: Enhancement - Some improvements on postfix's master.cf (tx aseques)
 	- Fixed #314: Defect: Software package installation failed
+	- Fixed #318: Malfunction - Changes in imscp.conf are lost after upgrading
 
 
 -------------------------------------------------------------------------------------

configs/debian/imscp.conf

@@ -143,7 +143,7 @@ PHP_TIMEZONE =
 
 RESOLVER_CONF_FILE = /etc/resolv.conf
 
-LOCAL_DNS_RESOLVER = yes
+LOCAL_DNS_RESOLVER =
 
 #
 # LOGROTATE

configs/ubuntu/imscp.conf

@@ -143,7 +143,7 @@ PHP_TIMEZONE =
 
 RESOLVER_CONF_FILE = /etc/resolv.conf
 
-LOCAL_DNS_RESOLVER = yes
+LOCAL_DNS_RESOLVER =
 
 #
 # LOGROTATE

docs/Migrate from ispCP

@@ -0,0 +1,54 @@
+Migration from ispCP to i-MSCP
+
+This intends to be a guide for those interested into migrate your control panel from
+ispcp to imscp. Luckily there's a standard migration path ready for us.
+
+Currently you can go from ispCP 1.0.7 to i-MSCP 1.0.1.5 or newer.
+
+IMPORTANT: Test it before with a clone of your system, there could be problems and
+it's important to find them on the test phase
+
+1.  Download the current version of i-mscp from http://i-mscp.net/download
+2.  Untar the downloaded file
+
+    # tar -xzf i-mscp-1.0.1.5.tar.gz
+
+3.  Start the installation of the system (as you would for a new install), but
+    IMPORTANT, when you see the i-mscp setup screen. SAY NO, because you've to
+    continue using the console instead of this installer.
+
+    # perl imscp-autoinstall
+
+4.  Until you see the i-mscp setup screen. SAY NO, because you've to continue using
+    the console. Copy the generated files into their destination, after this point
+    there's NO POSSIBLE ROLLBACK
+
+    # cp -Rv /tmp/imscp/* /
+
+5.  It's interesting to have the debug enabled to inspect possible problems, you have
+    to change in /etc/imspc/imscp.conf
+
+    DEBUG = 1
+
+6.  Now you have to use the migration script wich will be already in place.
+
+    # cd /var/www/imscp/engine/setup/
+    # perl imscp-migrate-from-ispcp
+
+7.  After the run of this script you'll have to run the regular install
+
+    # perl /var/www/imscp/engine/setup/imscp-setup
+
+If all the steps are fine, you should be able to enter in the control panel
+Some considerations
+
+The logs for either a failed or succesful setup will be at /var/log/imscp/imscp-setup.log
+
+    # less /var/log/imscp/imscp-setup.log
+
+The database user MUST have full privileges (or else it won't be able to create and
+populate the imscp table). You have two options, either using the root database user
+or having a database user with full rights:
+
+    # mysql -u root -p
+    # GRANT ALL PRIVILEGES ON *.* TO 'your_database_user'@'localhost'

engine/setup/imscp-setup-methods.pl

@@ -1538,7 +1538,10 @@ sub setup_ssl{
 
 	my $rs;
 
-	$main::imscpConfig{'SSL_ENABLED'} = $main::imscpConfigOld{'SSL_ENABLED'} if(!$main::imscpConfig{'SSL_ENABLED'} && $main::imscpConfigOld{'SSL_ENABLED'});
+	$main::imscpConfig{'SSL_ENABLED'} = $main::imscpConfigOld{'SSL_ENABLED'}
+		if(!$main::imscpConfig{'SSL_ENABLED'} && $main::imscpConfigOld{'SSL_ENABLED'});
+	$main::imscpConfig{'BASE_SERVER_VHOST_PREFIX'} = $main::imscpConfigOld{'BASE_SERVER_VHOST_PREFIX'}
+		if $main::imscpConfig{'BASE_SERVER_VHOST_PREFIX'} ne $main::imscpConfigOld{'BASE_SERVER_VHOST_PREFIX'};
 
 	if(!$main::imscpConfig{'SSL_ENABLED'}){
 		Modules::openssl->new()->{openssl_path} = $main::imscpConfig{'CMD_OPENSSL'};