Просмотр исходного кода

Fix issue with changing roundcube settings

Jaap Marcus 3 лет назад
Родитель
Сommit
003d34cc24
2 измененных файлов с 5 добавлено и 4 удалено
  1. 0 3
      bin/v-add-sys-roundcube
  2. 5 1
      install/upgrade/versions/1.6.7.sh

+ 0 - 3
bin/v-add-sys-roundcube

@@ -191,9 +191,6 @@ else
     fi
     rm -f -r $RC_INSTALL_DIR/$RC_FILE
     rm -f -r $RC_INSTALL_DIR/$RC_EXTRACT
-    
-    # "Bug" in Roundcube causes issues with creating mail accounts in database
-    sed -i "s/\$config\['auto_create_user'] = false;/\$config\['auto_create_user'] = true;/g" /etc/roundcube/config.inc.php    
 fi
 
 #----------------------------------------------------------#

+ 5 - 1
install/upgrade/versions/1.6.7.sh

@@ -22,5 +22,9 @@ upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
 
 if [ -f "/etc/roundcube/config.inc.php" ]; then
-    sed -i "s/\$config\['auto_create_user'] = false;/\$config\['auto_create_user'] = true;/g" /etc/roundcube/config.inc.php    
+    sed -i "s/\$config\['auto_create_user'] = false;/\$config\['auto_create_user'] = true;/g" /etc/roundcube/config.inc.php  
+    sed -i "s/\$config\['prefer_html'] = false;/\$config\['prefer_html'] = true;/g" /etc/roundcube/config.inc.php  
+          
+    #For older installs
+    sed -i "s/\$config\['default_host']/\$config\['imap_host']/g" /etc/roundcube/config.inc.php    
 fi