Skip to content

Commit 2d19400

Browse files
serghey-rodinserghey-rodin
authored
Merge pull request hestiacp#1144 from icez/master
[*]: fix open_basedir document root value for SSL-enabled site
2 parents 0e2ba8a + 482298a commit 2d19400

File tree

15 files changed

+15
-15
lines changed

15 files changed

+15
-15
lines changed

‎install/debian/7/templates/web/apache2/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
1919
php_admin_value upload_tmp_dir %home%/%user%/tmp
2020
php_admin_value session.save_path %home%/%user%/tmp
2121
</Directory>

‎install/debian/8/templates/web/apache2/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
1919
php_admin_value upload_tmp_dir %home%/%user%/tmp
2020
php_admin_value session.save_path %home%/%user%/tmp
2121
</Directory>

‎install/rhel/5/templates/web/httpd/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
1919
php_admin_value upload_tmp_dir %home%/%user%/tmp
2020
php_admin_value session.save_path %home%/%user%/tmp
2121
</Directory>

‎install/rhel/6/templates/web/httpd/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
1919
php_admin_value upload_tmp_dir %home%/%user%/tmp
2020
php_admin_value session.save_path %home%/%user%/tmp
2121
</Directory>

‎install/rhel/7/templates/web/httpd/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
1919
php_admin_value upload_tmp_dir %home%/%user%/tmp
2020
php_admin_value session.save_path %home%/%user%/tmp
2121
</Directory>

‎install/ubuntu/12.04/templates/web/apache2/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
1919
php_admin_value upload_tmp_dir %home%/%user%/tmp
2020
php_admin_value session.save_path %home%/%user%/tmp
2121
</Directory>

‎install/ubuntu/12.10/templates/web/apache2/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
1919
php_admin_value upload_tmp_dir %home%/%user%/tmp
2020
php_admin_value session.save_path %home%/%user%/tmp
2121
</Directory>

‎install/ubuntu/13.04/templates/web/apache2/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
1919
php_admin_value upload_tmp_dir %home%/%user%/tmp
2020
php_admin_value session.save_path %home%/%user%/tmp
2121
</Directory>

‎install/ubuntu/13.10/templates/web/apache2/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
1919
php_admin_value upload_tmp_dir %home%/%user%/tmp
2020
php_admin_value session.save_path %home%/%user%/tmp
2121
</Directory>

‎install/ubuntu/14.04/templates/web/apache2/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp
1919
php_admin_value upload_tmp_dir %home%/%user%/tmp
2020
php_admin_value session.save_path %home%/%user%/tmp
2121
</Directory>

0 commit comments

Comments
 (0)