Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
31e0d151
Commit
31e0d151
authored
Jan 26, 2012
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged revisions 2911-2912 from stable branch.
parent
355efb9a
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
279 additions
and
9 deletions
+279
-9
install/dist/lib/debian60.lib.php
install/dist/lib/debian60.lib.php
+14
-1
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+15
-2
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+15
-2
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+15
-2
install/tpl/debian6_dovecot2.conf.master
install/tpl/debian6_dovecot2.conf.master
+42
-0
install/tpl/debian_dovecot2.conf.master
install/tpl/debian_dovecot2.conf.master
+42
-0
install/tpl/fedora_dovecot2.conf.master
install/tpl/fedora_dovecot2.conf.master
+42
-0
install/tpl/opensuse_dovecot2.conf.master
install/tpl/opensuse_dovecot2.conf.master
+42
-0
interface/web/sites/templates/web_aliasdomain_edit.htm
interface/web/sites/templates/web_aliasdomain_edit.htm
+21
-1
interface/web/sites/templates/web_domain_redirect.htm
interface/web/sites/templates/web_domain_redirect.htm
+10
-0
interface/web/sites/templates/web_subdomain_edit.htm
interface/web/sites/templates/web_subdomain_edit.htm
+21
-1
No files found.
install/dist/lib/debian60.lib.php
View file @
31e0d151
...
...
@@ -76,7 +76,20 @@ class installer extends installer_base {
if
(
is_file
(
$config_dir
.
'/'
.
$configfile
)){
copy
(
$config_dir
.
'/'
.
$configfile
,
$config_dir
.
'/'
.
$configfile
.
'~'
);
}
copy
(
'tpl/debian6_dovecot.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
//* Get the dovecot version
exec
(
'dovecot --version'
,
$tmp
);
$parts
=
explode
(
'.'
,
trim
(
$tmp
[
0
]));
$dovecot_version
=
$parts
[
0
];
unset
(
$tmp
);
unset
(
$parts
);
//* Copy dovecot configuration file
if
(
$dovecot_version
==
2
)
{
copy
(
'tpl/debian6_dovecot2.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
else
{
copy
(
'tpl/debian6_dovecot.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
//* dovecot-sql.conf
$configfile
=
'dovecot-sql.conf'
;
...
...
install/dist/lib/fedora.lib.php
View file @
31e0d151
...
...
@@ -308,12 +308,25 @@ class installer_dist extends installer_base {
caselog
(
$command
.
" &> /dev/null"
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
}
//*
copy
dovecot.conf
//*
backup
dovecot.conf
$configfile
=
'dovecot.conf'
;
if
(
is_file
(
"
$config_dir
/
$configfile
"
)){
copy
(
"
$config_dir
/
$configfile
"
,
"
$config_dir
/
$configfile
~"
);
}
copy
(
'tpl/fedora_dovecot.conf.master'
,
"
$config_dir
/
$configfile
"
);
//* Get the dovecot version
exec
(
'dovecot --version'
,
$tmp
);
$parts
=
explode
(
'.'
,
trim
(
$tmp
[
0
]));
$dovecot_version
=
$parts
[
0
];
unset
(
$tmp
);
unset
(
$parts
);
//* Copy dovecot configuration file
if
(
$dovecot_version
==
2
)
{
copy
(
'tpl/fedora_dovecot2.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
else
{
copy
(
'tpl/fedora_dovecot.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
//* dovecot-sql.conf
$configfile
=
'dovecot-sql.conf'
;
...
...
install/dist/lib/opensuse.lib.php
View file @
31e0d151
...
...
@@ -349,12 +349,25 @@ class installer_dist extends installer_base {
caselog
(
$command
.
" &> /dev/null"
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
}
//*
copy
dovecot.conf
//*
backup
dovecot.conf
$configfile
=
'dovecot.conf'
;
if
(
is_file
(
"
$config_dir
/
$configfile
"
)){
copy
(
"
$config_dir
/
$configfile
"
,
"
$config_dir
/
$configfile
~"
);
}
copy
(
'tpl/opensuse_dovecot.conf.master'
,
"
$config_dir
/
$configfile
"
);
//* Get the dovecot version
exec
(
'dovecot --version'
,
$tmp
);
$parts
=
explode
(
'.'
,
trim
(
$tmp
[
0
]));
$dovecot_version
=
$parts
[
0
];
unset
(
$tmp
);
unset
(
$parts
);
//* Copy dovecot configuration file
if
(
$dovecot_version
==
2
)
{
copy
(
'tpl/opensuse_dovecot2.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
else
{
copy
(
'tpl/opensuse_dovecot.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
//* dovecot-sql.conf
$configfile
=
'dovecot-sql.conf'
;
...
...
install/lib/installer_base.lib.php
View file @
31e0d151
...
...
@@ -895,12 +895,25 @@ class installer_base {
caselog
(
$command
.
" &> /dev/null"
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
}
//*
copy
dovecot.conf
//*
backup
dovecot.conf
$configfile
=
'dovecot.conf'
;
if
(
is_file
(
$config_dir
.
'/'
.
$configfile
))
{
copy
(
$config_dir
.
'/'
.
$configfile
,
$config_dir
.
'/'
.
$configfile
.
'~'
);
}
copy
(
'tpl/debian_dovecot.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
//* Get the dovecot version
exec
(
'dovecot --version'
,
$tmp
);
$parts
=
explode
(
'.'
,
trim
(
$tmp
[
0
]));
$dovecot_version
=
$parts
[
0
];
unset
(
$tmp
);
unset
(
$parts
);
//* Copy dovecot configuration file
if
(
$dovecot_version
==
2
)
{
copy
(
'tpl/debian_dovecot2.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
else
{
copy
(
'tpl/debian_dovecot.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
//* dovecot-sql.conf
$configfile
=
'dovecot-sql.conf'
;
...
...
install/tpl/debian6_dovecot2.conf.master
0 → 100644
View file @
31e0d151
protocols = imap pop3
auth_mechanisms = plain login
disable_plaintext_auth = no
log_timestamp = "%Y-%m-%d %H:%M:%S "
mail_privileged_group = vmail
ssl_cert = </etc/postfix/smtpd.cert
ssl_key = </etc/postfix/smtpd.key
passdb {
args = /etc/dovecot/dovecot-sql.conf
driver = sql
}
userdb {
args = /etc/dovecot/dovecot-sql.conf
driver = sql
}
plugin {
quota = dict:user::file:/var/vmail/%d/%n/.quotausage
sieve=/var/vmail/%d/%n/.sieve
}
service auth {
unix_listener /var/spool/postfix/private/auth {
group = postfix
mode = 0660
user = postfix
}
unix_listener auth-userdb {
group = vmail
mode = 0600
user = vmail
}
user = root
}
protocol imap {
mail_plugins = quota imap_quota
}
protocol pop3 {
pop3_uidl_format = %08Xu%08Xv
mail_plugins = quota
}
protocol lda {
mail_plugins = sieve quota
}
\ No newline at end of file
install/tpl/debian_dovecot2.conf.master
0 → 100644
View file @
31e0d151
protocols = imap pop3
auth_mechanisms = plain login
disable_plaintext_auth = no
log_timestamp = "%Y-%m-%d %H:%M:%S "
mail_privileged_group = vmail
ssl_cert = </etc/postfix/smtpd.cert
ssl_key = </etc/postfix/smtpd.key
passdb {
args = /etc/dovecot/dovecot-sql.conf
driver = sql
}
userdb {
args = /etc/dovecot/dovecot-sql.conf
driver = sql
}
plugin {
quota = dict:user::file:/var/vmail/%d/%n/.quotausage
sieve=/var/vmail/%d/%n/.sieve
}
service auth {
unix_listener /var/spool/postfix/private/auth {
group = postfix
mode = 0660
user = postfix
}
unix_listener auth-userdb {
group = vmail
mode = 0600
user = vmail
}
user = root
}
protocol imap {
mail_plugins = quota imap_quota
}
protocol pop3 {
pop3_uidl_format = %08Xu%08Xv
mail_plugins = quota
}
protocol lda {
mail_plugins = sieve quota
}
\ No newline at end of file
install/tpl/fedora_dovecot2.conf.master
0 → 100644
View file @
31e0d151
protocols = imap pop3
auth_mechanisms = plain login
disable_plaintext_auth = no
log_timestamp = "%Y-%m-%d %H:%M:%S "
mail_privileged_group = vmail
ssl_cert = </etc/postfix/smtpd.cert
ssl_key = </etc/postfix/smtpd.key
passdb {
args = /etc/dovecot-sql.conf
driver = sql
}
userdb {
args = /etc/dovecot-sql.conf
driver = sql
}
plugin {
quota = dict:user::file:/var/vmail/%d/%n/.quotausage
sieve=/var/vmail/%d/%n/.sieve
}
service auth {
unix_listener /var/spool/postfix/private/auth {
group = postfix
mode = 0660
user = postfix
}
unix_listener auth-userdb {
group = vmail
mode = 0600
user = vmail
}
user = root
}
protocol imap {
mail_plugins = quota imap_quota
}
protocol pop3 {
pop3_uidl_format = %08Xu%08Xv
mail_plugins = quota
}
protocol lda {
mail_plugins = sieve quota
}
\ No newline at end of file
install/tpl/opensuse_dovecot2.conf.master
0 → 100644
View file @
31e0d151
protocols = imap pop3
auth_mechanisms = plain login
disable_plaintext_auth = no
log_timestamp = "%Y-%m-%d %H:%M:%S "
mail_privileged_group = vmail
ssl_cert = </etc/postfix/smtpd.cert
ssl_key = </etc/postfix/smtpd.key
passdb {
args = /etc/dovecot/dovecot-sql.conf
driver = sql
}
userdb {
args = /etc/dovecot/dovecot-sql.conf
driver = sql
}
plugin {
quota = dict:user::file:/var/vmail/%d/%n/.quotausage
sieve=/var/vmail/%d/%n/.sieve
}
service auth {
unix_listener /var/spool/postfix/private/auth {
group = postfix
mode = 0660
user = postfix
}
unix_listener auth-userdb {
group = vmail
mode = 0600
user = vmail
}
user = root
}
protocol imap {
mail_plugins = quota imap_quota
}
protocol pop3 {
pop3_uidl_format = %08Xu%08Xv
mail_plugins = quota
}
protocol lda {
mail_plugins = sieve quota
}
\ No newline at end of file
interface/web/sites/templates/web_aliasdomain_edit.htm
View file @
31e0d151
...
...
@@ -75,7 +75,12 @@
jQuery
.
getJSON
(
'
sites/ajax_get_json.php
'
+
'
?
'
+
Math
.
round
(
new
Date
().
getTime
()),
{
server_id
:
serverId
,
type
:
"
getservertype
"
},
function
(
data
)
{
var
selected
=
jQuery
(
'
#redirect_type
'
).
val
();
if
(
data
.
servertype
==
"
nginx
"
){
jQuery
(
'
#redirect_type option[value="R"]
'
).
hide
();
jQuery
(
"
#redirect_type option[value='R']
"
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="L"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="R,L"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="R=301,L"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
"
#redirect_type option[value='R']
"
).
hide
();
jQuery
(
'
#redirect_type option[value="L"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="R,L"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="R=301,L"]
'
).
hide
();
...
...
@@ -85,8 +90,18 @@
jQuery
(
'
#redirect_type option[value="redirect"]
'
).
show
();
jQuery
(
'
#redirect_type option[value="permanent"]
'
).
show
();
jQuery
(
'
#redirect_type option[value="last"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="break"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="redirect"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="permanent"]
'
).
attr
(
'
disabled
'
,
false
);
if
(
selected
!=
"
no
"
&&
selected
!=
""
&&
selected
!=
"
last
"
&&
selected
!=
"
break
"
&&
selected
!=
"
redirect
"
&&
selected
!=
"
permanent
"
)
jQuery
(
'
#redirect_type option[value="no"]
'
).
attr
(
'
selected
'
,
'
selected
'
);
}
else
{
jQuery
(
'
#redirect_type option[value="last"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="break"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="redirect"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="permanent"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="last"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="break"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="redirect"]
'
).
hide
();
...
...
@@ -97,6 +112,11 @@
jQuery
(
'
#redirect_type option[value="R,L"]
'
).
show
();
jQuery
(
'
#redirect_type option[value="R=301,L"]
'
).
show
();
jQuery
(
'
#redirect_type option[value="R"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="L"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="R,L"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="R=301,L"]
'
).
attr
(
'
disabled
'
,
false
);
if
(
selected
!=
"
no
"
&&
selected
!=
""
&&
selected
!=
"
R
"
&&
selected
!=
"
L
"
&&
selected
!=
"
R,L
"
&&
selected
!=
"
R=301,L
"
)
jQuery
(
'
#redirect_type option[value="no"]
'
).
attr
(
'
selected
'
,
'
selected
'
);
}
});
...
...
interface/web/sites/templates/web_domain_redirect.htm
View file @
31e0d151
...
...
@@ -48,12 +48,22 @@
jQuery
.
getJSON
(
'
sites/ajax_get_json.php
'
+
'
?
'
+
Math
.
round
(
new
Date
().
getTime
()),
{
server_id
:
serverId
,
type
:
"
getservertype
"
},
function
(
data
)
{
var
selected
=
jQuery
(
'
#redirect_type
'
).
val
();
if
(
data
.
servertype
==
"
nginx
"
){
jQuery
(
"
#redirect_type option[value='R']
"
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="L"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="R,L"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="R=301,L"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="R"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="L"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="R,L"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="R=301,L"]
'
).
hide
();
if
(
selected
!=
"
no
"
&&
selected
!=
""
&&
selected
!=
"
last
"
&&
selected
!=
"
break
"
&&
selected
!=
"
redirect
"
&&
selected
!=
"
permanent
"
)
jQuery
(
'
#redirect_type option[value="no"]
'
).
attr
(
'
selected
'
,
'
selected
'
);
}
else
{
jQuery
(
'
#redirect_type option[value="last"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="break"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="redirect"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="permanent"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="last"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="break"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="redirect"]
'
).
hide
();
...
...
interface/web/sites/templates/web_subdomain_edit.htm
View file @
31e0d151
...
...
@@ -62,7 +62,12 @@
jQuery
.
getJSON
(
'
sites/ajax_get_json.php
'
+
'
?
'
+
Math
.
round
(
new
Date
().
getTime
()),
{
server_id
:
serverId
,
type
:
"
getservertype
"
},
function
(
data
)
{
var
selected
=
jQuery
(
'
#redirect_type
'
).
val
();
if
(
data
.
servertype
==
"
nginx
"
){
jQuery
(
'
#redirect_type option[value="R"]
'
).
hide
();
jQuery
(
"
#redirect_type option[value='R']
"
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="L"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="R,L"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="R=301,L"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
"
#redirect_type option[value='R']
"
).
hide
();
jQuery
(
'
#redirect_type option[value="L"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="R,L"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="R=301,L"]
'
).
hide
();
...
...
@@ -72,8 +77,18 @@
jQuery
(
'
#redirect_type option[value="redirect"]
'
).
show
();
jQuery
(
'
#redirect_type option[value="permanent"]
'
).
show
();
jQuery
(
'
#redirect_type option[value="last"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="break"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="redirect"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="permanent"]
'
).
attr
(
'
disabled
'
,
false
);
if
(
selected
!=
"
no
"
&&
selected
!=
""
&&
selected
!=
"
last
"
&&
selected
!=
"
break
"
&&
selected
!=
"
redirect
"
&&
selected
!=
"
permanent
"
)
jQuery
(
'
#redirect_type option[value="no"]
'
).
attr
(
'
selected
'
,
'
selected
'
);
}
else
{
jQuery
(
'
#redirect_type option[value="last"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="break"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="redirect"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="permanent"]
'
).
attr
(
'
disabled
'
,
'
disabled
'
);
jQuery
(
'
#redirect_type option[value="last"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="break"]
'
).
hide
();
jQuery
(
'
#redirect_type option[value="redirect"]
'
).
hide
();
...
...
@@ -84,6 +99,11 @@
jQuery
(
'
#redirect_type option[value="R,L"]
'
).
show
();
jQuery
(
'
#redirect_type option[value="R=301,L"]
'
).
show
();
jQuery
(
'
#redirect_type option[value="R"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="L"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="R,L"]
'
).
attr
(
'
disabled
'
,
false
);
jQuery
(
'
#redirect_type option[value="R=301,L"]
'
).
attr
(
'
disabled
'
,
false
);
if
(
selected
!=
"
no
"
&&
selected
!=
""
&&
selected
!=
"
R
"
&&
selected
!=
"
L
"
&&
selected
!=
"
R,L
"
&&
selected
!=
"
R=301,L
"
)
jQuery
(
'
#redirect_type option[value="no"]
'
).
attr
(
'
selected
'
,
'
selected
'
);
}
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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