Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
13a336cf
Commit
13a336cf
authored
Apr 27, 2015
by
Marius Cramer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'master'
added 'features' (like nfs:on) to openvz See merge request !179
parents
ab79c2c4
503bbb5b
Changes
53
Hide whitespace changes
Inline
Side-by-side
Showing
53 changed files
with
86 additions
and
9 deletions
+86
-9
install/sql/incremental/upd_dev_collection.sql
install/sql/incremental/upd_dev_collection.sql
+4
-1
install/sql/ispconfig3.sql
install/sql/ispconfig3.sql
+3
-1
interface/lib/plugins/vm_openvz_plugin.inc.php
interface/lib/plugins/vm_openvz_plugin.inc.php
+4
-2
interface/web/vm/form/openvz_template.tform.php
interface/web/vm/form/openvz_template.tform.php
+8
-0
interface/web/vm/form/openvz_vm.tform.php
interface/web/vm/form/openvz_vm.tform.php
+8
-0
interface/web/vm/lib/lang/ar_openvz_template.lng
interface/web/vm/lib/lang/ar_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/ar_openvz_vm.lng
interface/web/vm/lib/lang/ar_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/bg_openvz_template.lng
interface/web/vm/lib/lang/bg_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/bg_openvz_vm.lng
interface/web/vm/lib/lang/bg_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/br_openvz_template.lng
interface/web/vm/lib/lang/br_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/br_openvz_vm.lng
interface/web/vm/lib/lang/br_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/cz_openvz_template.lng
interface/web/vm/lib/lang/cz_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/cz_openvz_vm.lng
interface/web/vm/lib/lang/cz_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/de_openvz_template.lng
interface/web/vm/lib/lang/de_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/el_openvz_template.lng
interface/web/vm/lib/lang/el_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/el_openvz_vm.lng
interface/web/vm/lib/lang/el_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/en_openvz_template.lng
interface/web/vm/lib/lang/en_openvz_template.lng
+2
-1
interface/web/vm/lib/lang/en_openvz_vm.lng
interface/web/vm/lib/lang/en_openvz_vm.lng
+2
-1
interface/web/vm/lib/lang/es_openvz_template.lng
interface/web/vm/lib/lang/es_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/es_openvz_vm.lng
interface/web/vm/lib/lang/es_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/fi_openvz_template.lng
interface/web/vm/lib/lang/fi_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/fi_openvz_vm.lng
interface/web/vm/lib/lang/fi_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/fr_openvz_template.lng
interface/web/vm/lib/lang/fr_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/fr_openvz_vm.lng
interface/web/vm/lib/lang/fr_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/hr_openvz_template.lng
interface/web/vm/lib/lang/hr_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/hr_openvz_vm.lng
interface/web/vm/lib/lang/hr_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/hu_openvz_template.lng
interface/web/vm/lib/lang/hu_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/hu_openvz_vm.lng
interface/web/vm/lib/lang/hu_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/id_openvz_template.lng
interface/web/vm/lib/lang/id_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/id_openvz_vm.lng
interface/web/vm/lib/lang/id_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/it_openvz_template.lng
interface/web/vm/lib/lang/it_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/it_openvz_vm.lng
interface/web/vm/lib/lang/it_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/ja_openvz_template.lng
interface/web/vm/lib/lang/ja_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/ja_openvz_vm.lng
interface/web/vm/lib/lang/ja_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/nl_openvz_template.lng
interface/web/vm/lib/lang/nl_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/nl_openvz_vm.lng
interface/web/vm/lib/lang/nl_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/pl_openvz_template.lng
interface/web/vm/lib/lang/pl_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/pl_openvz_vm.lng
interface/web/vm/lib/lang/pl_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/pt_openvz_template.lng
interface/web/vm/lib/lang/pt_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/pt_openvz_vm.lng
interface/web/vm/lib/lang/pt_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/ro_openvz_template.lng
interface/web/vm/lib/lang/ro_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/ro_openvz_vm.lng
interface/web/vm/lib/lang/ro_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/ru_openvz_template.lng
interface/web/vm/lib/lang/ru_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/ru_openvz_vm.lng
interface/web/vm/lib/lang/ru_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/se_openvz_template.lng
interface/web/vm/lib/lang/se_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/se_openvz_vm.lng
interface/web/vm/lib/lang/se_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/sk_openvz_template.lng
interface/web/vm/lib/lang/sk_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/sk_openvz_vm.lng
interface/web/vm/lib/lang/sk_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/tr_openvz_template.lng
interface/web/vm/lib/lang/tr_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/tr_openvz_vm.lng
interface/web/vm/lib/lang/tr_openvz_vm.lng
+1
-0
interface/web/vm/templates/openvz.conf.tpl
interface/web/vm/templates/openvz.conf.tpl
+1
-0
interface/web/vm/templates/openvz_template_advanced_edit.htm
interface/web/vm/templates/openvz_template_advanced_edit.htm
+4
-1
interface/web/vm/templates/openvz_vm_advanced_edit.htm
interface/web/vm/templates/openvz_vm_advanced_edit.htm
+7
-2
No files found.
install/sql/incremental/upd_dev_collection.sql
View file @
13a336cf
...
...
@@ -140,4 +140,7 @@ UPDATE `dbispconfig`.`sys_ini` SET `default_logo` = 'data:image/png;base64,iVBOR
ALTER
TABLE
`directive_snippets`
ADD
`required_php_snippets`
VARCHAR
(
255
)
NOT
NULL
DEFAULT
''
AFTER
`customer_viewable`
;
ALTER
TABLE
`dns_rr`
CHANGE
`ttl`
`ttl`
INT
(
11
)
UNSIGNED
NOT
NULL
DEFAULT
'3600'
;
ALTER
TABLE
`dns_soa`
CHANGE
`minimum`
`minimum`
INT
(
11
)
UNSIGNED
NOT
NULL
DEFAULT
'3600'
,
CHANGE
`ttl`
`ttl`
INT
(
11
)
UNSIGNED
NOT
NULL
DEFAULT
'3600'
;
ALTER
TABLE
`client`
CHANGE
`web_php_options`
`web_php_options`
VARCHAR
(
255
)
NOT
NULL
DEFAULT
'no,fast-cgi,cgi,mod,suphp,php-fpm,hhvm'
;
\ No newline at end of file
ALTER
TABLE
`client`
CHANGE
`web_php_options`
`web_php_options`
VARCHAR
(
255
)
NOT
NULL
DEFAULT
'no,fast-cgi,cgi,mod,suphp,php-fpm,hhvm'
;
ALTER
TABLE
openvz_template
ADD
COLUMN
`features`
varchar
(
255
)
DEFAULT
NULL
AFTER
`capability`
;
ALTER
TABLE
openvz_vm
ADD
COLUMN
`features`
TEXT
DEFAULT
NULL
AFTER
`capability`
;
install/sql/ispconfig3.sql
View file @
13a336cf
...
...
@@ -1087,6 +1087,7 @@ CREATE TABLE IF NOT EXISTS `openvz_template` (
`nameserver`
varchar
(
255
)
DEFAULT
NULL
,
`create_dns`
varchar
(
1
)
NOT
NULL
DEFAULT
'n'
,
`capability`
varchar
(
255
)
DEFAULT
NULL
,
`features`
varchar
(
255
)
DEFAULT
NULL
,
PRIMARY
KEY
(
`template_id`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
;
...
...
@@ -1094,7 +1095,7 @@ CREATE TABLE IF NOT EXISTS `openvz_template` (
-- Dumping data for table `openvz_template`
--
INSERT
INTO
`openvz_template`
(
`template_id`
,
`sys_userid`
,
`sys_groupid`
,
`sys_perm_user`
,
`sys_perm_group`
,
`sys_perm_other`
,
`template_name`
,
`diskspace`
,
`traffic`
,
`bandwidth`
,
`ram`
,
`ram_burst`
,
`cpu_units`
,
`cpu_num`
,
`cpu_limit`
,
`io_priority`
,
`active`
,
`description`
,
`numproc`
,
`numtcpsock`
,
`numothersock`
,
`vmguarpages`
,
`kmemsize`
,
`tcpsndbuf`
,
`tcprcvbuf`
,
`othersockbuf`
,
`dgramrcvbuf`
,
`oomguarpages`
,
`privvmpages`
,
`lockedpages`
,
`shmpages`
,
`physpages`
,
`numfile`
,
`avnumproc`
,
`numflock`
,
`numpty`
,
`numsiginfo`
,
`dcachesize`
,
`numiptent`
,
`swappages`
,
`hostname`
,
`nameserver`
,
`create_dns`
,
`capability`
)
VALUES
(
1
,
1
,
1
,
'riud'
,
'riud'
,
''
,
'small'
,
10
,
-
1
,
-
1
,
256
,
512
,
1000
,
4
,
400
,
4
,
'y'
,
''
,
'999999:999999'
,
'7999992:7999992'
,
'7999992:7999992'
,
'65536:65536'
,
'2147483646:2147483646'
,
'214748160:396774400'
,
'214748160:396774400'
,
'214748160:396774400'
,
'214748160:396774400'
,
'65536:65536'
,
'131072:131072'
,
'999999:999999'
,
'65536:65536'
,
'0:2147483647'
,
'23999976:23999976'
,
'180:180'
,
'999999:999999'
,
'500000:500000'
,
'999999:999999'
,
'2147483646:2147483646'
,
'999999:999999'
,
'256000:256000'
,
'v{VEID}.test.tld'
,
'8.8.8.8 8.8.4.4'
,
'n'
,
''
);
INSERT
INTO
`openvz_template`
(
`template_id`
,
`sys_userid`
,
`sys_groupid`
,
`sys_perm_user`
,
`sys_perm_group`
,
`sys_perm_other`
,
`template_name`
,
`diskspace`
,
`traffic`
,
`bandwidth`
,
`ram`
,
`ram_burst`
,
`cpu_units`
,
`cpu_num`
,
`cpu_limit`
,
`io_priority`
,
`active`
,
`description`
,
`numproc`
,
`numtcpsock`
,
`numothersock`
,
`vmguarpages`
,
`kmemsize`
,
`tcpsndbuf`
,
`tcprcvbuf`
,
`othersockbuf`
,
`dgramrcvbuf`
,
`oomguarpages`
,
`privvmpages`
,
`lockedpages`
,
`shmpages`
,
`physpages`
,
`numfile`
,
`avnumproc`
,
`numflock`
,
`numpty`
,
`numsiginfo`
,
`dcachesize`
,
`numiptent`
,
`swappages`
,
`hostname`
,
`nameserver`
,
`create_dns`
,
`capability`
,
`features`
)
VALUES
(
1
,
1
,
1
,
'riud'
,
'riud'
,
''
,
'small'
,
10
,
-
1
,
-
1
,
256
,
512
,
1000
,
4
,
400
,
4
,
'y'
,
''
,
'999999:999999'
,
'7999992:7999992'
,
'7999992:7999992'
,
'65536:65536'
,
'2147483646:2147483646'
,
'214748160:396774400'
,
'214748160:396774400'
,
'214748160:396774400'
,
'214748160:396774400'
,
'65536:65536'
,
'131072:131072'
,
'999999:999999'
,
'65536:65536'
,
'0:2147483647'
,
'23999976:23999976'
,
'180:180'
,
'999999:999999'
,
'500000:500000'
,
'999999:999999'
,
'2147483646:2147483646'
,
'999999:999999'
,
'256000:256000'
,
'v{VEID}.test.tld'
,
'8.8.8.8 8.8.4.4'
,
'n'
,
''
,
''
);
-- --------------------------------------------------------
...
...
@@ -1150,6 +1151,7 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` (
`nameserver`
varchar
(
255
)
NOT
NULL
DEFAULT
'8.8.8.8 8.8.4.4'
,
`create_dns`
varchar
(
1
)
NOT
NULL
DEFAULT
'n'
,
`capability`
text
,
`features`
text
,
`config`
mediumtext
,
PRIMARY
KEY
(
`vm_id`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
;
...
...
interface/lib/plugins/vm_openvz_plugin.inc.php
View file @
13a336cf
...
...
@@ -132,9 +132,10 @@ class vm_openvz_plugin {
$sql
.
=
"io_priority = ?, "
;
$sql
.
=
"nameserver = ?, "
;
$sql
.
=
"create_dns = ?, "
;
$sql
.
=
"capability = ? "
;
$sql
.
=
"capability = ?, "
;
$sql
.
=
"features = ? "
;
$sql
.
=
"WHERE vm_id = ?"
;
$app
->
db
->
query
(
$sql
,
$tpl
[
'diskspace'
],
$tpl
[
'ram'
],
$tpl
[
'ram_burst'
],
$tpl
[
'cpu_units'
],
$tpl
[
'cpu_num'
],
$tpl
[
'cpu_limit'
],
$tpl
[
'io_priority'
],
$tpl
[
'nameserver'
],
$tpl
[
'create_dns'
],
$tpl
[
'capability'
],
$this
->
id
);
$app
->
db
->
query
(
$sql
,
$tpl
[
'diskspace'
],
$tpl
[
'ram'
],
$tpl
[
'ram_burst'
],
$tpl
[
'cpu_units'
],
$tpl
[
'cpu_num'
],
$tpl
[
'cpu_limit'
],
$tpl
[
'io_priority'
],
$tpl
[
'nameserver'
],
$tpl
[
'create_dns'
],
$tpl
[
'capability'
],
$tpl
[
'features'
],
$this
->
id
);
}
...
...
@@ -193,6 +194,7 @@ class vm_openvz_plugin {
$tpl
->
setVar
(
'ip_address'
,
$vm
[
'ip_address'
]);
$tpl
->
setVar
(
'nameserver'
,
$vm
[
'nameserver'
]);
$tpl
->
setVar
(
'capability'
,
$vm
[
'capability'
]);
$tpl
->
setVar
(
'features'
,
$vm
[
'features'
]);
$tmp
=
$app
->
db
->
queryOneRecord
(
"SELECT template_file FROM openvz_ostemplate WHERE ostemplate_id = ?"
,
$app
->
functions
->
intval
(
$vm
[
'ostemplate_id'
]));
$tpl
->
setVar
(
'ostemplate'
,
$tmp
[
'template_file'
]);
...
...
interface/web/vm/form/openvz_template.tform.php
View file @
13a336cf
...
...
@@ -459,6 +459,14 @@ $form["tabs"]['advanced'] = array (
'width'
=>
'30'
,
'maxlength'
=>
'255'
),
'features'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'TEXT'
,
'default'
=>
''
,
'value'
=>
''
,
'width'
=>
'30'
,
'maxlength'
=>
'255'
),
//#################################
// ENDE Datatable fields
//#################################
...
...
interface/web/vm/form/openvz_vm.tform.php
View file @
13a336cf
...
...
@@ -306,6 +306,14 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') {
'width'
=>
'30'
,
'maxlength'
=>
'255'
),
'features'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'TEXT'
,
'default'
=>
''
,
'value'
=>
''
,
'width'
=>
'30'
,
'maxlength'
=>
'255'
),
//#################################
// ENDE Datatable fields
//#################################
...
...
interface/web/vm/lib/lang/ar_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/ar_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/bg_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/bg_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/br_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/br_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/cz_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,5 +90,6 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Šablona'
;
$wb
[
'Advanced'
]
=
'Pokročilý'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/cz_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,5 +37,6 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Pokročilý'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/de_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent ist leer.';
$wb
[
'swappages_error_empty'
]
=
'Swappages ist leer.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Erweitert'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/el_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/el_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'Το Προτεραιότητα Ε/Ε είνα
$wb
[
'template_nameserver_error_empty'
]
=
'Το Nameserver(s) είναι κενό.'
;
$wb
[
'Virtual server'
]
=
'Εικονικός server'
;
$wb
[
'Advanced'
]
=
'Για προχωρημένους'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/en_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb["numiptent_error_empty"] = 'Numiptent is empty.';
$wb
[
"swappages_error_empty"
]
=
'Swappages is empty.'
;
$wb
[
"Template"
]
=
'Template'
;
$wb
[
"Advanced"
]
=
'Advanced'
;
?>
\ No newline at end of file
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/en_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb["io_priority_error_empty"] = 'I/O priority is empty.';
$wb
[
"template_nameserver_error_empty"
]
=
'Nameserver(s) is empty.'
;
$wb
[
"Virtual server"
]
=
'Virtual server'
;
$wb
[
"Advanced"
]
=
'Advanced'
;
?>
\ No newline at end of file
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/es_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent esta vacío.';
$wb
[
'swappages_error_empty'
]
=
'Swappages esta vacío.'
;
$wb
[
'Template'
]
=
'Plantilla'
;
$wb
[
'Advanced'
]
=
'Avanzado'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/es_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority está vacío.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) está vacío.'
;
$wb
[
'Virtual server'
]
=
'Servidor virtual'
;
$wb
[
'Advanced'
]
=
'Avanzado'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/fi_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/fi_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/fr_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent est vide.';
$wb
[
'swappages_error_empty'
]
=
'Swappages est vide.'
;
$wb
[
'Template'
]
=
'Modèle'
;
$wb
[
'Advanced'
]
=
'Avancé'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/fr_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'Les priorités I/O sont vides.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) est vide.'
;
$wb
[
'Virtual server'
]
=
'Serveur virtuel'
;
$wb
[
'Advanced'
]
=
'Avancé'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/hr_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,6 +90,7 @@ $wb['numiptent_error_empty'] = 'Numiptent polje je prazno.';
$wb
[
'swappages_error_empty'
]
=
'Swappages polje je prazno.'
;
$wb
[
'Template'
]
=
'Predložak'
;
$wb
[
'Advanced'
]
=
'Napredno'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/hr_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,6 +37,7 @@ $wb['io_priority_error_empty'] = 'I/O priority polje je prazno.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(i) polje je prazno.'
;
$wb
[
'Virtual server'
]
=
'Virtualni server'
;
$wb
[
'Advanced'
]
=
'Napredno'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/hu_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/hu_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/id_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/id_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/it_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/it_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/ja_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/ja_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/nl_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/nl_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/pl_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/pl_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/pt_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/pt_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/ro_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/ro_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/ru_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/ru_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/se_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/se_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/sk_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/sk_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/tr_openvz_template.lng
View file @
13a336cf
...
...
@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb
[
'swappages_error_empty'
]
=
'Swappages is empty.'
;
$wb
[
'Template'
]
=
'Template'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/lib/lang/tr_openvz_vm.lng
View file @
13a336cf
...
...
@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
$wb
[
'template_nameserver_error_empty'
]
=
'Nameserver(s) is empty.'
;
$wb
[
'Virtual server'
]
=
'Virtual server'
;
$wb
[
'Advanced'
]
=
'Advanced'
;
$wb
[
'features_txt'
]
=
'Features'
;
?>
interface/web/vm/templates/openvz.conf.tpl
View file @
13a336cf
...
...
@@ -48,3 +48,4 @@ MEMINFO="privvmpages:1"
# SWAPPAGES="
{
tmpl_var
name
=
'swappages'
}
"
CAPABILITY="
{
tmpl_var
name
=
'capability'
}
"
FEATURES="
{
tmpl_var
name
=
'features'
}
"
interface/web/vm/templates/openvz_template_advanced_edit.htm
View file @
13a336cf
...
...
@@ -74,6 +74,9 @@
<div
class=
"form-group"
>
<label
for=
"capability"
class=
"col-sm-3 control-label"
>
{tmpl_var name='capability_txt'}
</label>
<div
class=
"col-sm-9"
><input
type=
"text"
name=
"capability"
id=
"capability"
value=
"{tmpl_var name='capability'}"
class=
"form-control"
/></div></div>
<div
class=
"form-group"
>
<label
for=
"capability"
class=
"col-sm-3 control-label"
>
{tmpl_var name='features_txt'}
</label>
<div
class=
"col-sm-9"
><input
type=
"text"
name=
"features"
id=
"features"
value=
"{tmpl_var name='features'}"
class=
"form-control"
/></div></div>
<input
type=
"hidden"
name=
"id"
value=
"{tmpl_var name='id'}"
>
...
...
@@ -81,4 +84,4 @@
<div
class=
"clear"
><div
class=
"right"
>
<button
class=
"btn btn-default formbutton-success"
type=
"button"
value=
"{tmpl_var name='btn_save_txt'}"
data-submit-form=
"pageForm"
data-form-action=
"vm/openvz_template_edit.php"
>
{tmpl_var name='btn_save_txt'}
</button>
<button
class=
"btn btn-default formbutton-default"
type=
"button"
value=
"{tmpl_var name='btn_cancel_txt'}"
data-load-content=
"vm/openvz_template_list.php"
>
{tmpl_var name='btn_cancel_txt'}
</button>
</div></div>
\ No newline at end of file
</div></div>
interface/web/vm/templates/openvz_vm_advanced_edit.htm
View file @
13a336cf
...
...
@@ -48,7 +48,12 @@
</div></div>
<div
class=
"form-group"
>
<label
for=
"capability"
class=
"col-sm-3 control-label"
>
{tmpl_var name='capability_txt'}
</label>
<div
class=
"col-sm-9"
><input
type=
"text"
name=
"capability"
id=
"capability"
value=
"{tmpl_var name='capability'}"
class=
"form-control"
/></div></div>
<div
class=
"col-sm-9"
><input
type=
"text"
name=
"capability"
id=
"capability"
value=
"{tmpl_var name='capability'}"
class=
"form-control"
/>
</div></div>
<div
class=
"form-group"
>
<label
for=
"features"
class=
"col-sm-3 control-label"
>
{tmpl_var name='features_txt'}
</label>
<div
class=
"col-sm-9"
><input
type=
"text"
name=
"features"
id=
"features"
value=
"{tmpl_var name='features'}"
class=
"form-control"
/>
</div></div>
<input
type=
"hidden"
name=
"id"
value=
"{tmpl_var name='id'}"
>
...
...
@@ -56,4 +61,4 @@
<div
class=
"clear"
><div
class=
"right"
>
<button
class=
"btn btn-default formbutton-success"
type=
"button"
value=
"{tmpl_var name='btn_save_txt'}"
data-submit-form=
"pageForm"
data-form-action=
"vm/openvz_vm_edit.php"
>
{tmpl_var name='btn_save_txt'}
</button>
<button
class=
"btn btn-default formbutton-default"
type=
"button"
value=
"{tmpl_var name='btn_cancel_txt'}"
data-load-content=
"vm/openvz_vm_list.php"
>
{tmpl_var name='btn_cancel_txt'}
</button>
</div></div>
\ No newline at end of file
</div></div>
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