From fb4ddfce6f8ebab56af4b824c6bdc54f27dad509 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Wed, 20 Nov 2013 23:52:25 +0200
Subject: [PATCH] roundcube and phpmyadmin basedir

---
 install/debian/templates/web/apache2/hosting.stpl | 2 +-
 install/debian/templates/web/apache2/hosting.tpl  | 2 +-
 install/rhel/templates/web/httpd/hosting.stpl     | 2 +-
 install/rhel/templates/web/httpd/hosting.tpl      | 2 +-
 install/ubuntu/templates/web/apache2/hosting.stpl | 2 +-
 install/ubuntu/templates/web/apache2/hosting.tpl  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/install/debian/templates/web/apache2/hosting.stpl b/install/debian/templates/web/apache2/hosting.stpl
index 49af8fcef..e4a0ee62a 100755
--- a/install/debian/templates/web/apache2/hosting.stpl
+++ b/install/debian/templates/web/apache2/hosting.stpl
@@ -28,7 +28,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/roundcubemail:
+    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
     SSLEngine on
     SSLVerifyClient none
     SSLCertificateFile %ssl_crt%
diff --git a/install/debian/templates/web/apache2/hosting.tpl b/install/debian/templates/web/apache2/hosting.tpl
index 8763b1a90..ef5df0298 100755
--- a/install/debian/templates/web/apache2/hosting.tpl
+++ b/install/debian/templates/web/apache2/hosting.tpl
@@ -27,7 +27,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/roundcubemail:
+    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
diff --git a/install/rhel/templates/web/httpd/hosting.stpl b/install/rhel/templates/web/httpd/hosting.stpl
index f21c38823..ee06dfce7 100755
--- a/install/rhel/templates/web/httpd/hosting.stpl
+++ b/install/rhel/templates/web/httpd/hosting.stpl
@@ -28,7 +28,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/roundcubemail:
+    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
     SSLEngine on
     SSLVerifyClient none
     SSLCertificateFile %ssl_crt%
diff --git a/install/rhel/templates/web/httpd/hosting.tpl b/install/rhel/templates/web/httpd/hosting.tpl
index 76a9b0b0e..c3b839972 100755
--- a/install/rhel/templates/web/httpd/hosting.tpl
+++ b/install/rhel/templates/web/httpd/hosting.tpl
@@ -27,7 +27,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/roundcubemail:
+    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
diff --git a/install/ubuntu/templates/web/apache2/hosting.stpl b/install/ubuntu/templates/web/apache2/hosting.stpl
index 49af8fcef..e4a0ee62a 100755
--- a/install/ubuntu/templates/web/apache2/hosting.stpl
+++ b/install/ubuntu/templates/web/apache2/hosting.stpl
@@ -28,7 +28,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/roundcubemail:
+    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
     SSLEngine on
     SSLVerifyClient none
     SSLCertificateFile %ssl_crt%
diff --git a/install/ubuntu/templates/web/apache2/hosting.tpl b/install/ubuntu/templates/web/apache2/hosting.tpl
index 8763b1a90..ef5df0298 100755
--- a/install/ubuntu/templates/web/apache2/hosting.tpl
+++ b/install/ubuntu/templates/web/apache2/hosting.tpl
@@ -27,7 +27,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/roundcubemail:
+    php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%