Skip to content

Commit 892f21a

Browse files
author
laking
committed
Update on certificte CA-signing. Moved config to control panel.
1 parent b637641 commit 892f21a

File tree

10 files changed

+43
-3
lines changed

10 files changed

+43
-3
lines changed

interface/web/admin/form/server_config.tform.php

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,22 @@
370370
'width' => '40',
371371
'maxlength' => '255'
372372
),
373+
'CA_path' => array(
374+
'datatype' => 'VARCHAR',
375+
'formtype' => 'TEXT',
376+
'default' => '',
377+
'value' => '',
378+
'width' => '40',
379+
'maxlength' => '255'
380+
),
381+
'CA_pass' => array(
382+
'datatype' => 'VARCHAR',
383+
'formtype' => 'TEXT',
384+
'default' => '',
385+
'value' => '',
386+
'width' => '40',
387+
'maxlength' => '255'
388+
),
373389
'security_level' => array(
374390
'datatype' => 'VARCHAR',
375391
'formtype' => 'SELECT',
@@ -847,4 +863,4 @@
847863
##################################
848864
)
849865
);
850-
?>
866+
?>

interface/web/admin/lib/lang/ar_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ $wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
7474
$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
7575
$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
7676
$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
77+
$wb["CA_path_txt"] = 'CA Path';
78+
$wb["CA_pass_txt"] = 'CA passphrase';
7779
?>

interface/web/admin/lib/lang/cz_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ $wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
7474
$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
7575
$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
7676
$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
77+
$wb["CA_path_txt"] = 'CA Path';
78+
$wb["CA_pass_txt"] = 'CA passphrase';
7779
?>

interface/web/admin/lib/lang/el_server_config.lng

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ $wb['named_conf_local_path_txt'] = 'Διαδρομή του named.conf.local τ
7474
$wb['php_ini_path_cgi_txt'] = 'Διαδρομή του php.ini για CGI';
7575
$wb['php_ini_path_apache_txt'] = 'Διαδρομή του php.ini για Apache';
7676
$wb['check_apache_config_txt'] = 'Έλεγχος των ρυθμίσεων του apache ή επαννεκίνηση';
77-
?>
77+
$wb["CA_path_txt"] = 'CA Path';
78+
$wb["CA_pass_txt"] = 'CA passphrase';
79+
?>

interface/web/admin/lib/lang/en_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,6 @@ $wb["php_ini_path_cgi_txt"] = 'CGI php.ini path';
7979
$wb["php_ini_path_apache_txt"] = 'Apache php.ini path';
8080
$wb["check_apache_config_txt"] = 'Test apache configuration on restart';
8181
$wb["network_config_warning_txt"] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
82+
$wb["CA_path_txt"] = 'CA Path';
83+
$wb["CA_pass_txt"] = 'CA passphrase';
8284
?>

interface/web/admin/lib/lang/es_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ $wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
7474
$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
7575
$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
7676
$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
77+
$wb["CA_path_txt"] = 'CA Path';
78+
$wb["CA_pass_txt"] = 'CA passphrase';
7779
?>

interface/web/admin/lib/lang/pt_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ $wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
7474
$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
7575
$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
7676
$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
77+
$wb["CA_path_txt"] = 'CA Path';
78+
$wb["CA_pass_txt"] = 'CA passphrase';
7779
?>

interface/web/admin/lib/lang/ru_server_config.lng

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ $wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
7474
$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
7575
$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
7676
$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
77-
?>
77+
$wb["CA_path_txt"] = 'CA Path';
78+
$wb["CA_pass_txt"] = 'CA passphrase';
79+
?>

interface/web/admin/lib/lang/tr_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ $wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
7474
$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
7575
$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
7676
$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
77+
$wb["CA_path_txt"] = 'CA Path';
78+
$wb["CA_pass_txt"] = 'CA passphrase';
7779
?>

interface/web/admin/templates/server_config_web_edit.htm

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
2525
<label for="vhost_conf_enabled_dir">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
2626
<input name="vhost_conf_enabled_dir" id="vhost_conf_enabled_dir" value="{tmpl_var name='vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
2727
</div>
28+
<div class="ctrlHolder">
29+
<label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
30+
<input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" class="textInput" />
31+
</div>
32+
<div class="ctrlHolder">
33+
<label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
34+
<input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" class="textInput" />
35+
</div>
2836
<div class="ctrlHolder">
2937
<p class="label">{tmpl_var name='security_level_txt'}</p>
3038
<div class="multiField">

0 commit comments

Comments
 (0)