Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
482
Issues
482
List
Boards
Labels
Service Desk
Milestones
Merge Requests
23
Merge Requests
23
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISPConfig
ISPConfig 3
Commits
d12a905c
Commit
d12a905c
authored
Sep 07, 2011
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: FS#1701 - Backup symlink folder permissions wrong - pre 3.0.3.3
parent
763507d9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
1 deletion
+23
-1
install/tpl/server.ini.master
install/tpl/server.ini.master
+1
-0
interface/web/admin/form/server_config.tform.php
interface/web/admin/form/server_config.tform.php
+6
-0
interface/web/admin/lib/lang/en_server_config.lng
interface/web/admin/lib/lang/en_server_config.lng
+1
-0
interface/web/admin/templates/server_config_server_edit.htm
interface/web/admin/templates/server_config_server_edit.htm
+6
-0
server/cron_daily.php
server/cron_daily.php
+9
-1
No files found.
install/tpl/server.ini.master
View file @
d12a905c
...
@@ -13,6 +13,7 @@ hostname=server1.domain.tld
...
@@ -13,6 +13,7 @@ hostname=server1.domain.tld
nameservers=192.168.0.1,192.168.0.2
nameservers=192.168.0.1,192.168.0.2
loglevel=2
loglevel=2
backup_dir=/var/backup
backup_dir=/var/backup
backup_dir_ftpread=y
[mail]
[mail]
module=postfix_mysql
module=postfix_mysql
...
...
interface/web/admin/form/server_config.tform.php
View file @
d12a905c
...
@@ -138,6 +138,12 @@ $form["tabs"]['server'] = array(
...
@@ -138,6 +138,12 @@ $form["tabs"]['server'] = array(
'width'
=>
'40'
,
'width'
=>
'40'
,
'maxlength'
=>
'255'
'maxlength'
=>
'255'
),
),
'backup_dir_ftpread'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'CHECKBOX'
,
'default'
=>
'y'
,
'value'
=>
array
(
0
=>
'n'
,
1
=>
'y'
)
),
##################################
##################################
# ENDE Datatable fields
# ENDE Datatable fields
##################################
##################################
...
...
interface/web/admin/lib/lang/en_server_config.lng
View file @
d12a905c
...
@@ -86,4 +86,5 @@ $wb["network_config_warning_txt"] = 'The network configuration option is only av
...
@@ -86,4 +86,5 @@ $wb["network_config_warning_txt"] = 'The network configuration option is only av
$wb
[
"CA_path_txt"
]
=
'CA Path'
;
$wb
[
"CA_path_txt"
]
=
'CA Path'
;
$wb
[
"CA_pass_txt"
]
=
'CA passphrase'
;
$wb
[
"CA_pass_txt"
]
=
'CA passphrase'
;
$wb
[
"fastcgi_config_syntax_txt"
]
=
'FastCGI config syntax'
;
$wb
[
"fastcgi_config_syntax_txt"
]
=
'FastCGI config syntax'
;
$wb
[
"backup_dir_ftpread_txt"
]
=
'Backup dir. readable for website FTP users.'
;
?>
?>
\ No newline at end of file
interface/web/admin/templates/server_config_server_edit.htm
View file @
d12a905c
...
@@ -42,6 +42,12 @@
...
@@ -42,6 +42,12 @@
<label
for=
"backup_dir"
>
{tmpl_var name='backup_dir_txt'}
</label>
<label
for=
"backup_dir"
>
{tmpl_var name='backup_dir_txt'}
</label>
<input
name=
"backup_dir"
id=
"backup_dir"
value=
"{tmpl_var name='backup_dir'}"
size=
"40"
maxlength=
"255"
type=
"text"
class=
"textInput"
/>
<input
name=
"backup_dir"
id=
"backup_dir"
value=
"{tmpl_var name='backup_dir'}"
size=
"40"
maxlength=
"255"
type=
"text"
class=
"textInput"
/>
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='backup_dir_ftpread_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='backup_dir_ftpread'}
</div>
</div>
</fieldset>
</fieldset>
<input
type=
"hidden"
name=
"id"
value=
"{tmpl_var name='id'}"
>
<input
type=
"hidden"
name=
"id"
value=
"{tmpl_var name='id'}"
>
...
...
server/cron_daily.php
View file @
d12a905c
...
@@ -435,8 +435,16 @@ $backup_dir = $server_config['backup_dir'];
...
@@ -435,8 +435,16 @@ $backup_dir = $server_config['backup_dir'];
if
(
$backup_dir
!=
''
)
{
if
(
$backup_dir
!=
''
)
{
if
(
isset
(
$server_config
[
'backup_dir_ftpread'
])
&&
$server_config
[
'backup_dir_ftpread'
]
==
'y'
)
{
$backup_dir_permissions
=
0755
;
}
else
{
$backup_dir_permissions
=
0750
;
}
if
(
!
is_dir
(
$backup_dir
))
{
if
(
!
is_dir
(
$backup_dir
))
{
mkdir
(
escapeshellcmd
(
$backup_dir
),
0750
,
true
);
mkdir
(
escapeshellcmd
(
$backup_dir
),
$backup_dir_permissions
,
true
);
}
else
{
chmod
(
escapeshellcmd
(
$backup_dir
),
$backup_dir_permissions
);
}
}
$sql
=
"SELECT * FROM web_domain WHERE type = 'vhost'"
;
$sql
=
"SELECT * FROM web_domain WHERE type = 'vhost'"
;
...
...
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