Skip to content

Commit 0ae8da5

Browse files
falkotimmefalkotimme
committed
- Added nginx support.
- Fixed FS#1745.
1 parent ebfdb3a commit 0ae8da5

File tree

158 files changed

+1629
-105731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+1629
-105731
lines changed

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

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,12 @@
321321
##################################
322322
# Begin Datatable fields
323323
##################################
324+
'server_type' => array(
325+
'datatype' => 'VARCHAR',
326+
'formtype' => 'SELECT',
327+
'default' => 'apache',
328+
'value' => array('apache' => 'Apache', 'nginx' => 'nginx')
329+
),
324330
'website_basedir' => array(
325331
'datatype' => 'VARCHAR',
326332
'formtype' => 'TEXT',
@@ -382,6 +388,28 @@
382388
'width' => '40',
383389
'maxlength' => '255'
384390
),
391+
'nginx_vhost_conf_dir' => array(
392+
'datatype' => 'VARCHAR',
393+
'formtype' => 'TEXT',
394+
'default' => '',
395+
'validators' => array(0 => array('type' => 'NOTEMPTY',
396+
'errmsg' => 'nginx_vhost_conf_dir_error_empty'),
397+
),
398+
'value' => '',
399+
'width' => '40',
400+
'maxlength' => '255'
401+
),
402+
'nginx_vhost_conf_enabled_dir' => array(
403+
'datatype' => 'VARCHAR',
404+
'formtype' => 'TEXT',
405+
'default' => '',
406+
'validators' => array(0 => array('type' => 'NOTEMPTY',
407+
'errmsg' => 'nginx_vhost_conf_enabled_dir_error_empty'),
408+
),
409+
'value' => '',
410+
'width' => '40',
411+
'maxlength' => '255'
412+
),
385413
'CA_path' => array(
386414
'datatype' => 'VARCHAR',
387415
'formtype' => 'TEXT',
@@ -463,7 +491,7 @@
463491
),
464492
'value' => '',
465493
'width' => '40',
466-
'maxlength' => '255'
494+
'maxlength' => '4000'
467495
),
468496
'htaccess_allow_override' => array(
469497
'datatype' => 'VARCHAR',

‎interface/web/admin/lib/lang/de_server_config.lng‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted Anwendungen';
55
$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted Anwendungen';
66
$wb['website_path_txt'] = 'Website Pfad';
77
$wb['website_symlinks_txt'] = 'Website Symlinks';
8-
$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
8+
$wb['website_symlinks_rel_txt'] = 'Erstelle relative Symlinks';
99
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
1010
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
1111
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
@@ -85,5 +85,8 @@ $wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
8585
$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
8686
$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
8787
$wb['ufw_log_level_txt'] = 'Log Level';
88-
$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.';
88+
$wb['network_config_warning_txt'] = 'Die Netzwerk-Konfiguration-Option ist nur auf Debian- und Ubuntu-Servern verfügbar. Aktivieren Sie diese Option nicht, falls Ihr Netzwerk-Interface nicht eth0 heißt.';
89+
$wb["server_type_txt"] = 'Server-Typ';
90+
$wb["nginx_vhost_conf_dir_txt"] = 'nginx Vhost config dir';
91+
$wb["nginx_vhost_conf_enabled_dir_txt"] = 'nginx Vhost config enabled dir';
8992
?>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,7 @@ $wb["CA_path_txt"] = 'CA Path';
8888
$wb["CA_pass_txt"] = 'CA passphrase';
8989
$wb["fastcgi_config_syntax_txt"] = 'FastCGI config syntax';
9090
$wb["backup_dir_ftpread_txt"] = 'Backup dir. readable for website FTP users.';
91+
$wb["server_type_txt"] = 'Server Type';
92+
$wb["nginx_vhost_conf_dir_txt"] = 'nginx Vhost config dir';
93+
$wb["nginx_vhost_conf_enabled_dir_txt"] = 'nginx Vhost config enabled dir';
9194
?>

‎interface/web/admin/templates/server_config_web_edit.htm‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
55

66
<div class="pnl_formsarea">
77
<fieldset class="inlineLabels">
8+
<div class="ctrlHolder">
9+
<p class="label">{tmpl_var name='server_type_txt'}</p>
10+
<div class="multiField">
11+
<select name="server_type" id="server_type" class="selectInput">
12+
{tmpl_var name='server_type'}
13+
</select>
14+
</div>
15+
</div>
816
<div class="ctrlHolder">
917
<label for="website_basedir">{tmpl_var name='website_basedir_txt'}</label>
1018
<input name="website_basedir" id="website_basedir" value="{tmpl_var name='website_basedir'}" size="40" maxlength="255" type="text" class="textInput" />
@@ -31,6 +39,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
3139
<label for="vhost_conf_enabled_dir">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
3240
<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" />
3341
</div>
42+
<div class="ctrlHolder">
43+
<label for="nginx_vhost_conf_dir">{tmpl_var name='nginx_vhost_conf_dir_txt'}</label>
44+
<input name="nginx_vhost_conf_dir" id="nginx_vhost_conf_dir" value="{tmpl_var name='nginx_vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
45+
</div>
46+
<div class="ctrlHolder">
47+
<label for="nginx_vhost_conf_enabled_dir">{tmpl_var name='nginx_vhost_conf_enabled_dir_txt'}</label>
48+
<input name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
49+
</div>
3450
<div class="ctrlHolder">
3551
<label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
3652
<input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" class="textInput" />
@@ -71,7 +87,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
7187
</div>
7288
<div class="ctrlHolder">
7389
<label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
74-
<input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="40" maxlength="255" type="text" class="textInput" />
90+
<input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="40" type="text" class="textInput" />
7591
</div>
7692
<div class="ctrlHolder">
7793
<label for="htaccess_allow_override">{tmpl_var name='htaccess_allow_override_txt'}</label>
@@ -116,3 +132,39 @@ <h2><tmpl_var name="list_head_txt"></h2>
116132
</div>
117133

118134
</div>
135+
<script language="JavaScript" type="text/javascript">
136+
var serverType = jQuery('#server_type').val();
137+
adjustForm(serverType);
138+
jQuery('#server_type').change(function(){
139+
serverType = $(this).val();
140+
adjustForm(serverType);
141+
});
142+
143+
function adjustForm(serverType){
144+
if(serverType == "nginx"){
145+
jQuery('#vhost_conf_dir').closest('div.ctrlHolder').hide();
146+
jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
147+
jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').show();
148+
jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
149+
150+
jQuery('#security_level').closest('div.ctrlHolder').hide();
151+
jQuery('#check_apache_config').closest('div.ctrlHolder').hide();
152+
jQuery('#user').closest('div.ctrlHolder').hide();
153+
jQuery('#group').closest('div.ctrlHolder').hide();
154+
jQuery('#php_ini_path_apache').closest('div.ctrlHolder').hide();
155+
jQuery('#htaccess_allow_override').closest('div.ctrlHolder').hide();
156+
} else {
157+
jQuery('#vhost_conf_dir').closest('div.ctrlHolder').show();
158+
jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
159+
jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').hide();
160+
jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
161+
162+
jQuery('#security_level').closest('div.ctrlHolder').show();
163+
jQuery('#check_apache_config').closest('div.ctrlHolder').show();
164+
jQuery('#user').closest('div.ctrlHolder').show();
165+
jQuery('#group').closest('div.ctrlHolder').show();
166+
jQuery('#php_ini_path_apache').closest('div.ctrlHolder').show();
167+
jQuery('#htaccess_allow_override').closest('div.ctrlHolder').show();
168+
}
169+
}
170+
</script>

0 commit comments

Comments
 (0)