Resolve merge conflict

Author: thom

install/lib/installer_base.lib.php

@@ -2841,9 +2841,9 @@ public function make_ispconfig_ssl_cert() {
 
 					// If this is a webserver
 					if($conf['nginx']['installed'] == true)
-						exec("$le_client $certonly $acme_version --nginx --email postmaster@$hostname $renew_hook");
+						exec("$le_client $certonly $acme_version --nginx --email postmaster@$hostname -d $hostname $renew_hook");
 					elseif($conf['apache']['installed'] == true)
-						exec("$le_client $certonly $acme_version --apache --email postmaster@$hostname $renew_hook");
+						exec("$le_client $certonly $acme_version --apache --email postmaster@$hostname -d $hostname $renew_hook");
 					// Else, it is not webserver, so we use standalone
 					else
 						exec("$le_client $certonly $acme_version --standalone --email postmaster@$hostname -d $hostname $hook");

install/tpl/apache_ispconfig.conf.master

@@ -1,3 +1,8 @@
+################################################
+# ISPConfig General Apache Options
+################################################
+ServerTokens ProductOnly
+ServerSignature Off
 
 ################################################
 # ISPConfig Logfile configuration for vlogger

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

@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';

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

@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username';
 $wb['username_err'] = 'The username is too long or contains invalid characters.';
 $wb['username_empty'] = 'The username is empty.';
 $wb['username_unique'] = 'There is already a user with this username.';
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
 $wb['password_strength_txt'] = 'Password strength';
 $wb['modules_txt'] = 'Module';
 $wb['startmodule_txt'] = 'Startmodule';

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

@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Username';
 $wb['client_id_txt'] = 'Client ID';
 $wb['active_txt'] = 'Active';
 $wb['add_new_record_txt'] = 'Add new user';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
 $wb['groups_txt'] = 'Groups';
 ?>

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

@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';

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

@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Потребителско име';
 $wb['username_err'] = 'Потребителското име е твърде дълго или съдържа непозволени символи.';
 $wb['username_empty'] = 'Полето с потребителското име е празно.';
 $wb['username_unique'] = 'Вече съществува потребител с това потребителско име.';
-$wb['passwort_txt'] = 'Парола';
+$wb['password_txt'] = 'Парола';
 $wb['password_strength_txt'] = 'Сила на паролата';
 $wb['modules_txt'] = 'Модул';
 $wb['startmodule_txt'] = 'Старт модул';

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

@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['ufw_enable_txt'] = 'Habilitar';

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

@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Usuário';
 $wb['username_err'] = 'O nome do usuário é muito longo ou contém caracteres inválidos.';
 $wb['username_empty'] = 'O nome do usuário está em branco.';
 $wb['username_unique'] = 'Já existe um usuário com este nome.';
-$wb['passwort_txt'] = 'Senha';
+$wb['password_txt'] = 'Senha';
 $wb['password_strength_txt'] = 'Dificuldade da senha';
 $wb['modules_txt'] = 'Módulo';
 $wb['startmodule_txt'] = 'Módulo inicial';

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

@@ -1,5 +1,6 @@
 <?php
 $wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
 $wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
 $wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
 $wb['ufw_enable_txt'] = 'Enable';