Skip to content
GitLab
Menu
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
534e4529
Commit
534e4529
authored
May 05, 2014
by
Till Brehm
Browse files
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
parents
14f228c3
c9d4ef4e
Changes
6
Hide whitespace changes
Inline
Side-by-side
install/autoupdate.php
View file @
534e4529
...
...
@@ -198,8 +198,10 @@ if($conf['services']['mail'] == true) {
$inst
->
configure_postfix
(
'dont-create-certs'
);
//** Configure mailman
swriteln
(
'Configuring Mailman'
);
$inst
->
configure_mailman
(
'update'
);
if
(
$conf
[
'mailman'
][
'installed'
]
==
true
)
{
swriteln
(
'Configuring Mailman'
);
$inst
->
configure_mailman
(
'update'
);
}
//* Configure Jailkit
swriteln
(
'Configuring Jailkit'
);
...
...
install/dist/lib/fedora.lib.php
View file @
534e4529
...
...
@@ -392,7 +392,6 @@ class installer_dist extends installer_base {
'virtual_transport = dovecot'
,
'smtpd_sasl_type = dovecot'
,
'smtpd_sasl_path = private/auth'
,
'receive_override_options = no_address_mappings'
);
// Make a backup copy of the main.cf file
...
...
install/dist/lib/opensuse.lib.php
View file @
534e4529
...
...
@@ -443,7 +443,6 @@ class installer_dist extends installer_base {
'virtual_transport = dovecot'
,
'smtpd_sasl_type = dovecot'
,
'smtpd_sasl_path = private/auth'
,
'receive_override_options = no_address_mappings'
);
// Make a backup copy of the main.cf file
...
...
@@ -501,7 +500,7 @@ class installer_dist extends installer_base {
exec
(
"chown root:root
$config_dir
/
$configfile
"
);
// Dovecot shall ignore mounts in website directory
exec
(
"doveadm mount add '/srv/www/*' ignore"
);
if
(
is_installed
(
'doveadm'
))
exec
(
"doveadm mount add '/srv/www/*' ignore
> /dev/null 2> /dev/null
"
);
}
...
...
install/install.php
View file @
534e4529
...
...
@@ -191,7 +191,9 @@ if($install_mode == 'standard') {
$inst
->
configure_postfix
();
//* Configure Mailman
$inst
->
configure_mailman
(
'install'
);
if
(
$conf
[
'mailman'
][
'installed'
]
==
true
)
{
$inst
->
configure_mailman
(
'install'
);
}
//* Configure jailkit
swriteln
(
'Configuring Jailkit'
);
...
...
install/update.php
View file @
534e4529
...
...
@@ -262,8 +262,10 @@ if($reconfigure_services_answer == 'yes') {
$inst
->
configure_postfix
(
'dont-create-certs'
);
//** Configure mailman
swriteln
(
'Configuring Mailman'
);
$inst
->
configure_mailman
(
'update'
);
if
(
$conf
[
'mailman'
][
'installed'
]
==
true
)
{
swriteln
(
'Configuring Mailman'
);
$inst
->
configure_mailman
(
'update'
);
}
//* Configure Jailkit
swriteln
(
'Configuring Jailkit'
);
...
...
server/plugins-available/cron_plugin.inc.php
View file @
534e4529
...
...
@@ -213,7 +213,7 @@ class cron_plugin {
}
$command
.
=
"
\t
"
;
if
(
$job
[
'type'
]
!=
'chrooted'
&&
substr
(
$job
[
'command'
],
0
,
1
)
!=
"/"
)
$command
.
=
$this
->
parent_domain
[
'document_root'
]
.
'/'
;
//
if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
$command
.
=
$job
[
'command'
];
}
...
...
Write
Preview
Supports
Markdown
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