Fixed: FS#1619 - Add apache SNI / SAN support for SSL.

tbrehm

2011-09-26 b31bb1f27f066a2d49f5ab9ee0ca15e985efc788

 interface/web/admin/templates/server_config_web_edit.htm

@@ -55,7 +55,7 @@
         <label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
        <input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" class="textInput" />
         </div>
     <div class="ctrlHolder apache">
     <div class="ctrlHolder">
            <p class="label">{tmpl_var name='security_level_txt'}</p>
               <div class="multiField">
                  <select name="security_level" id="security_level" class="selectInput">
@@ -67,6 +67,12 @@
            <p class="label">{tmpl_var name='check_apache_config_txt'}</p>
               <div class="multiField">
                  {tmpl_var name='check_apache_config'}
               </div>
         </div>
     <div class="ctrlHolder">
            <p class="label">{tmpl_var name='enable_sni_txt'}</p>
               <div class="multiField">
                  {tmpl_var name='enable_sni'}
               </div>
         </div>
     <div class="ctrlHolder apache">
@@ -89,7 +95,7 @@
         <label for="php_ini_path_apache">{tmpl_var name='php_ini_path_apache_txt'}</label>
        <input name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" size="40" maxlength="255" type="text" class="textInput" />
     </div>
     <div class="ctrlHolder">
     <div class="ctrlHolder apache">
         <label for="php_ini_path_cgi">{tmpl_var name='php_ini_path_cgi_txt'}</label>
        <input name="php_ini_path_cgi" id="php_ini_path_cgi" value="{tmpl_var name='php_ini_path_cgi'}" size="40" maxlength="255" type="text" class="textInput" />
     </div>
@@ -108,6 +114,10 @@
     <div class="ctrlHolder nginx">
         <label for="php_fpm_start_port">{tmpl_var name='php_fpm_start_port_txt'}</label>
        <input name="php_fpm_start_port" id="php_fpm_start_port" value="{tmpl_var name='php_fpm_start_port'}" size="40" maxlength="255" type="text" class="textInput" />
     </div>
     <div class="ctrlHolder nginx">
         <label for="php_fpm_socket_dir">{tmpl_var name='php_fpm_socket_dir_txt'}</label>
        <input name="php_fpm_socket_dir" id="php_fpm_socket_dir" value="{tmpl_var name='php_fpm_socket_dir'}" size="40" maxlength="255" type="text" class="textInput" />
     </div>
     <div class="ctrlHolder">
         <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
@@ -162,55 +172,20 @@
</div>
<script language="JavaScript" type="text/javascript">
      var serverType = jQuery('#server_type').val();
      adjustForm(serverType);
      jQuery('#server_type').replaceWith('<label for="server_Type">'+serverType+'</label><input type="hidden" name="server_type" value="'+serverType+'">');
      adjustForm();
      jQuery('#server_type').change(function(){
         serverType = $(this).val();
         adjustForm(serverType);
         adjustForm();
      });
      
      function adjustForm(serverType){
      function adjustForm(){
         if(serverType == "nginx"){
            jQuery('.nginx').show();
            /*
            jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').show();
            jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
            jQuery('#nginx_user').closest('div.ctrlHolder').show();
            jQuery('#nginx_group').closest('div.ctrlHolder').show();
            jQuery('#nginx_cgi_socket').closest('div.ctrlHolder').show();
            */
				
            jQuery('.apache').hide();
            /*
            jQuery('#vhost_conf_dir').closest('div.ctrlHolder').hide();
            jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
            jQuery('#security_level').closest('div.ctrlHolder').hide();
            jQuery('#check_apache_config').closest('div.ctrlHolder').hide();
            jQuery('#user').closest('div.ctrlHolder').hide();
            jQuery('#group').closest('div.ctrlHolder').hide();
            jQuery('#php_ini_path_apache').closest('div.ctrlHolder').hide();
            jQuery('#htaccess_allow_override').closest('div.ctrlHolder').hide();
            */
         } else {
            jQuery('.nginx').hide();
            /*
            jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').hide();
            jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
            jQuery('#nginx_user').closest('div.ctrlHolder').hide();
            jQuery('#nginx_group').closest('div.ctrlHolder').hide();
            jQuery('#nginx_cgi_socket').closest('div.ctrlHolder').hide();
            */
				
            jQuery('.apache').show();
            /*
            jQuery('#vhost_conf_dir').closest('div.ctrlHolder').show();
            jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
            jQuery('#security_level').closest('div.ctrlHolder').show();
            jQuery('#check_apache_config').closest('div.ctrlHolder').show();
            jQuery('#user').closest('div.ctrlHolder').show();
            jQuery('#group').closest('div.ctrlHolder').show();
            jQuery('#php_ini_path_apache').closest('div.ctrlHolder').show();
            jQuery('#htaccess_allow_override').closest('div.ctrlHolder').show();
            */
         }
      }
</script>