From a8903524b632a834c2961d007d9edf52dadf79b9 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Mon, 13 Feb 2012 11:28:18 -0500 Subject: [PATCH] - Reverted some open_basedir changes --- server/conf/apps_php_fpm_pool.conf.master | 2 +- install/tpl/apps_php_fpm_pool.conf.master | 2 +- install/tpl/apache_ispconfig.vhost.master | 2 +- install/tpl/apache_apps.vhost.master | 2 +- install/tpl/php_fpm_pool.conf.master | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install/tpl/apache_apps.vhost.master b/install/tpl/apache_apps.vhost.master index 6ba8266..068158c 100644 --- a/install/tpl/apache_apps.vhost.master +++ b/install/tpl/apache_apps.vhost.master @@ -15,7 +15,7 @@ DocumentRoot {apps_vhost_dir} AddType application/x-httpd-php .php <Directory {apps_vhost_dir}> - php_admin_value open_basedir "{apps_vhost_dir}:/usr/share" + # php_admin_value open_basedir "{apps_vhost_dir}:/usr/share:/tmp" Options FollowSymLinks AllowOverride None Order allow,deny diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master index b23cdd4..bca61b2 100644 --- a/install/tpl/apache_ispconfig.vhost.master +++ b/install/tpl/apache_ispconfig.vhost.master @@ -27,7 +27,7 @@ DocumentRoot /usr/local/ispconfig/interface/web/ AddType application/x-httpd-php .php <Directory /usr/local/ispconfig/interface/web> - php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share" + # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp" Options FollowSymLinks AllowOverride None Order allow,deny diff --git a/install/tpl/apps_php_fpm_pool.conf.master b/install/tpl/apps_php_fpm_pool.conf.master index 9167fc2..e851cf5 100644 --- a/install/tpl/apps_php_fpm_pool.conf.master +++ b/install/tpl/apps_php_fpm_pool.conf.master @@ -16,5 +16,5 @@ chdir = / -php_admin_value[open_basedir] = /var/www/apps:/srv/www/apps:/usr/share +; php_admin_value[open_basedir] = /var/www/apps:/srv/www/apps:/usr/share php_admin_flag[magic_quotes_gpc] = off \ No newline at end of file diff --git a/install/tpl/php_fpm_pool.conf.master b/install/tpl/php_fpm_pool.conf.master index c101094..dfa3059 100644 --- a/install/tpl/php_fpm_pool.conf.master +++ b/install/tpl/php_fpm_pool.conf.master @@ -16,6 +16,6 @@ chdir = / -php_admin_value[open_basedir] = /usr/local/ispconfig/interface:/usr/share +; php_admin_value[open_basedir] = /usr/local/ispconfig/interface:/usr/share php_admin_value[session.save_path] = /usr/local/ispconfig/server/temp php_admin_flag[magic_quotes_gpc] = off \ No newline at end of file diff --git a/server/conf/apps_php_fpm_pool.conf.master b/server/conf/apps_php_fpm_pool.conf.master index 047ed30..2cc7258 100644 --- a/server/conf/apps_php_fpm_pool.conf.master +++ b/server/conf/apps_php_fpm_pool.conf.master @@ -16,5 +16,5 @@ chdir = / -php_admin_value[open_basedir] = /var/www/apps:/srv/www/apps:/usr/share +; php_admin_value[open_basedir] = /var/www/apps:/srv/www/apps:/usr/share php_admin_flag[magic_quotes_gpc] = off \ No newline at end of file -- Gitblit v1.9.1