Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
10b13b85
Commit
10b13b85
authored
Feb 18, 2014
by
Till Brehm
Browse files
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
parents
1af70cf1
7b699b69
Changes
11
Hide whitespace changes
Inline
Side-by-side
install/dist/lib/opensuse.lib.php
View file @
10b13b85
...
@@ -652,7 +652,7 @@ class installer_dist extends installer_base {
...
@@ -652,7 +652,7 @@ class installer_dist extends installer_base {
$content
=
rf
(
'/etc/apache2/httpd.conf'
);
$content
=
rf
(
'/etc/apache2/httpd.conf'
);
if
(
!
stristr
(
$content
,
'Include /etc/apache2/sites-enabled/'
))
{
if
(
!
stristr
(
$content
,
'Include /etc/apache2/sites-enabled/'
))
{
af
(
'/etc/apache2/httpd.conf'
,
"
\n
<Directory /srv/www>
\n
Options FollowSymlinks
\n
</Directory>
\n\n
Include /etc/apache2/sites-enabled/
\n\n
"
);
af
(
'/etc/apache2/httpd.conf'
,
"
\n
<Directory /srv/www>
\n
Options
+
FollowSymlinks
\n
</Directory>
\n\n
Include /etc/apache2/sites-enabled/
\n\n
"
);
}
}
unset
(
$content
);
unset
(
$content
);
...
...
install/dist/tpl/gentoo/apache_apps.vhost.master
View file @
10b13b85
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
DocumentRoot {apps_vhost_dir}
DocumentRoot {apps_vhost_dir}
SuexecUserGroup ispapps ispapps
SuexecUserGroup ispapps ispapps
<Directory {apps_vhost_dir}>
<Directory {apps_vhost_dir}>
Options Indexes FollowSymLinks MultiViews +ExecCGI
Options
+
Indexes
+
FollowSymLinks
+
MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo
AllowOverride AuthConfig Indexes Limit Options FileInfo
<FilesMatch "\.ph(p[3-5]?|tml)$">
<FilesMatch "\.ph(p[3-5]?|tml)$">
SetHandler fcgid-script
SetHandler fcgid-script
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
DocumentRoot {apps_vhost_dir}
DocumentRoot {apps_vhost_dir}
AddType application/x-httpd-php .php
AddType application/x-httpd-php .php
<Directory {apps_vhost_dir}>
<Directory {apps_vhost_dir}>
Options FollowSymLinks
Options
+
FollowSymLinks
AllowOverride None
AllowOverride None
Order allow,deny
Order allow,deny
Allow from all
Allow from all
...
...
install/dist/tpl/gentoo/apache_ispconfig.vhost.master
View file @
10b13b85
...
@@ -14,7 +14,7 @@ NameVirtualHost *:{vhost_port}
...
@@ -14,7 +14,7 @@ NameVirtualHost *:{vhost_port}
DocumentRoot /var/www/ispconfig/
DocumentRoot /var/www/ispconfig/
SuexecUserGroup ispconfig ispconfig
SuexecUserGroup ispconfig ispconfig
<Directory /var/www/ispconfig/>
<Directory /var/www/ispconfig/>
Options Indexes FollowSymLinks MultiViews +ExecCGI
Options
+
Indexes
+
FollowSymLinks
+
MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo
AllowOverride AuthConfig Indexes Limit Options FileInfo
<FilesMatch "\.ph(p[3-5]?|tml)$">
<FilesMatch "\.ph(p[3-5]?|tml)$">
SetHandler fcgid-script
SetHandler fcgid-script
...
@@ -30,7 +30,7 @@ NameVirtualHost *:{vhost_port}
...
@@ -30,7 +30,7 @@ NameVirtualHost *:{vhost_port}
DocumentRoot /usr/local/ispconfig/interface/web/
DocumentRoot /usr/local/ispconfig/interface/web/
AddType application/x-httpd-php .php
AddType application/x-httpd-php .php
<Directory /usr/local/ispconfig/interface/web>
<Directory /usr/local/ispconfig/interface/web>
Options FollowSymLinks
Options
+
FollowSymLinks
AllowOverride None
AllowOverride None
Order allow,deny
Order allow,deny
Allow from all
Allow from all
...
...
install/sql/incremental/upd_0068.sql
View file @
10b13b85
ALTER
TABLE
`dbispconfig`
.
`web_domain`
ADD
UNIQUE
`serverdomain`
(
`server_id`
,
`domain`
);
ALTER
TABLE
`dbispconfig`
.
`web_domain`
ADD
UNIQUE
`serverdomain`
(
`server_id`
,
`domain`
);
DROP
INDEX
rr
ON
dns_rr
;
ALTER
TABLE
`dns_rr`
CHANGE
`name`
`name`
VARCHAR
(
128
)
NOT
NULL
;
ALTER
TABLE
`dns_rr`
DROP
KEY
rr
,
CREATE
INDEX
`rr`
ON
dns_rr
(
`zone`
,
`type`
,
`name`
);
CHANGE
`name`
`name`
VARCHAR
(
128
)
NOT
NULL
,
\ No newline at end of file
ADD
KEY
`rr`
(
`zone`
,
`type`
,
`name`
);
install/sql/incremental/upd_0069.sql
0 → 100644
View file @
10b13b85
ALTER
TABLE
`cron`
ADD
`log`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'n'
AFTER
`run_wday`
;
install/sql/ispconfig3.sql
View file @
10b13b85
...
@@ -402,6 +402,7 @@ CREATE TABLE `cron` (
...
@@ -402,6 +402,7 @@ CREATE TABLE `cron` (
`run_mday`
varchar
(
100
)
NULL
,
`run_mday`
varchar
(
100
)
NULL
,
`run_month`
varchar
(
100
)
NULL
,
`run_month`
varchar
(
100
)
NULL
,
`run_wday`
varchar
(
100
)
NULL
,
`run_wday`
varchar
(
100
)
NULL
,
`log`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'n'
,
`active`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'y'
,
`active`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'y'
,
PRIMARY
KEY
(
`id`
)
PRIMARY
KEY
(
`id`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
AUTO_INCREMENT
=
1
;
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
AUTO_INCREMENT
=
1
;
...
...
install/tpl/apache_apps.vhost.master
View file @
10b13b85
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
AddType application/x-httpd-php .php
AddType application/x-httpd-php .php
<Directory {apps_vhost_dir}>
<Directory {apps_vhost_dir}>
# php_admin_value open_basedir "{apps_vhost_dir}:/usr/share:/tmp"
# php_admin_value open_basedir "{apps_vhost_dir}:/usr/share:/tmp"
Options FollowSymLinks
Options
+
FollowSymLinks
AllowOverride None
AllowOverride None
Order allow,deny
Order allow,deny
Allow from all
Allow from all
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
DocumentRoot {apps_vhost_dir}
DocumentRoot {apps_vhost_dir}
SuexecUserGroup ispapps ispapps
SuexecUserGroup ispapps ispapps
<Directory {apps_vhost_dir}>
<Directory {apps_vhost_dir}>
Options Indexes FollowSymLinks MultiViews +ExecCGI
Options
+
Indexes
+
FollowSymLinks
+
MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo
AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php
AddHandler fcgid-script .php
FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
...
...
install/tpl/apache_ispconfig.vhost.master
View file @
10b13b85
...
@@ -18,7 +18,7 @@ NameVirtualHost *:{vhost_port}
...
@@ -18,7 +18,7 @@ NameVirtualHost *:{vhost_port}
DocumentRoot /var/www/ispconfig/
DocumentRoot /var/www/ispconfig/
SuexecUserGroup ispconfig ispconfig
SuexecUserGroup ispconfig ispconfig
<Directory /var/www/ispconfig/>
<Directory /var/www/ispconfig/>
Options -Indexes FollowSymLinks MultiViews +ExecCGI
Options -Indexes
+
FollowSymLinks
+
MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo
AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php
AddHandler fcgid-script .php
FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
...
@@ -35,7 +35,7 @@ NameVirtualHost *:{vhost_port}
...
@@ -35,7 +35,7 @@ NameVirtualHost *:{vhost_port}
AddType application/x-httpd-php .php
AddType application/x-httpd-php .php
<Directory /usr/local/ispconfig/interface/web>
<Directory /usr/local/ispconfig/interface/web>
# php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
# php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
Options FollowSymLinks
Options
+
FollowSymLinks
AllowOverride None
AllowOverride None
Order allow,deny
Order allow,deny
Allow from all
Allow from all
...
...
interface/lib/classes/remoting.inc.php
View file @
10b13b85
...
@@ -150,8 +150,8 @@ class remoting {
...
@@ -150,8 +150,8 @@ class remoting {
return
false
;
return
false
;
}
}
if
(
!
empty
(
$session_id
))
{
if
(
!
empty
(
$session_id
))
{
$app
->
uses
(
'remoting_lib , getconf'
);
if
(
!
empty
(
$server_id
))
{
if
(
!
empty
(
$server_id
))
{
$app
->
uses
(
'remoting_lib , getconf'
);
$section_config
=
$app
->
getconf
->
get_server_config
(
$server_id
,
$section
);
$section_config
=
$app
->
getconf
->
get_server_config
(
$server_id
,
$section
);
return
$section_config
;
return
$section_config
;
}
else
{
}
else
{
...
...
server/conf/apache_apps.vhost.master
View file @
10b13b85
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
DocumentRoot {tmpl_var name='apps_vhost_dir'}
DocumentRoot {tmpl_var name='apps_vhost_dir'}
SuexecUserGroup ispapps ispapps
SuexecUserGroup ispapps ispapps
<Directory {tmpl_var name='apps_vhost_dir'}>
<Directory {tmpl_var name='apps_vhost_dir'}>
Options Indexes FollowSymLinks MultiViews +ExecCGI
Options
+
Indexes
+
FollowSymLinks
+
MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo
AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php
AddHandler fcgid-script .php
FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php
FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php
...
...
server/conf/vhost.conf.master
View file @
10b13b85
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
</IfModule>
</IfModule>
<Directory {tmpl_var name='web_document_root_www'}>
<Directory {tmpl_var name='web_document_root_www'}>
Options FollowSymLinks
Options
+
FollowSymLinks
AllowOverride <tmpl_var name='allow_override'>
AllowOverride <tmpl_var name='allow_override'>
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
Require all granted
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
</tmpl_if>
</tmpl_if>
</Directory>
</Directory>
<Directory {tmpl_var name='web_document_root'}>
<Directory {tmpl_var name='web_document_root'}>
Options FollowSymLinks
Options
+
FollowSymLinks
AllowOverride <tmpl_var name='allow_override'>
AllowOverride <tmpl_var name='allow_override'>
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
Require all granted
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment