ftimme
2011-09-15 0ae8da5c37cea9841359d7d39e758f0a077e9c37
- Added nginx support.
- Fixed FS#1745.
143 files deleted
1 files renamed
11 files modified
3 files added
107378 ■■■■■ changed files
interface/web/admin/form/server_config.tform.php 30 ●●●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 7 ●●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 3 ●●●●● patch | view | raw | blame | history
interface/web/admin/templates/server_config_web_edit.htm 54 ●●●●● patch | view | raw | blame | history
interface/web/js/yui-combo.js 26 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/animation/README 45 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/animation/animation-debug.js 1361 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/animation/animation-min.js 75 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/animation/animation.js 1358 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/autocomplete/README 77 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/autocomplete/autocomplete-debug.js 3100 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/autocomplete/autocomplete-min.js 183 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/autocomplete/autocomplete.js 3071 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/button/README 3 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/button/assets/background.png patch | view | raw | blame | history
interface/web/js/yui/button/assets/button.css 217 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/button/assets/menuarrow.gif patch | view | raw | blame | history
interface/web/js/yui/button/assets/splitarrow.gif patch | view | raw | blame | history
interface/web/js/yui/button/assets/splitarrow_active.gif patch | view | raw | blame | history
interface/web/js/yui/button/button-beta-debug.js 4061 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/button/button-beta-min.js 126 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/button/button-beta.js 3949 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/calendar/README 88 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/calendar/assets/calendar.css 197 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/calendar/assets/callt.gif patch | view | raw | blame | history
interface/web/js/yui/calendar/assets/calrt.gif patch | view | raw | blame | history
interface/web/js/yui/calendar/assets/calx.gif patch | view | raw | blame | history
interface/web/js/yui/calendar/calendar-debug.js 4331 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/calendar/calendar-min.js 116 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/calendar/calendar.js 4309 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/connection/README 182 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/connection/connection-debug.js 1082 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/connection/connection-min.js 104 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/connection/connection.js 1054 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/container/README 207 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/container/assets/alrt16_1.gif patch | view | raw | blame | history
interface/web/js/yui/container/assets/blck16_1.gif patch | view | raw | blame | history
interface/web/js/yui/container/assets/close12_1.gif patch | view | raw | blame | history
interface/web/js/yui/container/assets/container.css 230 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/container/assets/hlp16_1.gif patch | view | raw | blame | history
interface/web/js/yui/container/assets/info16_1.gif patch | view | raw | blame | history
interface/web/js/yui/container/assets/tip16_1.gif patch | view | raw | blame | history
interface/web/js/yui/container/assets/warn16_1.gif patch | view | raw | blame | history
interface/web/js/yui/container/container-debug.js 4752 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/container/container-min.js 159 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/container/container.js 4727 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/container/container_core-debug.js 2932 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/container/container_core-min.js 109 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/container/container_core.js 2919 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/datasource/README 5 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/datasource/datasource-beta-debug.js 912 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/datasource/datasource-beta-min.js 59 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/datasource/datasource-beta.js 902 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/datatable/README 9 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/datatable/assets/datatable.css 82 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/datatable/datatable-beta-debug.js 4956 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/datatable/datatable-beta-min.js 214 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/datatable/datatable-beta.js 4930 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/dom/README 79 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/dom/dom-debug.js 935 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/dom/dom-min.js 59 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/dom/dom.js 901 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/dragdrop/README 118 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/dragdrop/dragdrop-debug.js 3068 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/dragdrop/dragdrop-min.js 93 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/dragdrop/dragdrop.js 2958 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/element/README 7 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/element/element-beta-debug.js 906 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/element/element-beta-min.js 30 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/element/element-beta.js 896 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/event/README 161 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/event/event-debug.js 2076 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/event/event-min.js 84 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/event/event.js 2054 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/fonts/README 13 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/fonts/fonts-min.css 7 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/fonts/fonts.css 29 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/grids/README 48 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/grids/grids-min.css 7 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/grids/grids.css 129 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/history/README 11 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/history/assets/blank.html 1 ●●●● patch | view | raw | blame | history
interface/web/js/yui/history/history-experimental-debug.js 649 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/history/history-experimental-min.js 44 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/history/history-experimental.js 649 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/logger/README 51 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/logger/assets/logger.css 26 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/logger/logger-debug.js 1597 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/logger/logger-min.js 63 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/logger/logger.js 1597 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/menu/README 385 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/menu/assets/map.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menu.css 384 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuarodwn8_dim_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuarodwn8_hov_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuarodwn8_nrm_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuarorght8_dim_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuarorght8_hov_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuarorght8_nrm_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuaroup8_dim_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuaroup8_nrm_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuchk8_dim_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuchk8_hov_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/assets/menuchk8_nrm_1.gif patch | view | raw | blame | history
interface/web/js/yui/menu/menu-debug.js 8317 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/menu/menu-min.js 260 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/menu/menu.js 8265 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/reset-fonts-grids/README 24 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/reset-fonts-grids/reset-fonts-grids.css 9 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/reset/README 25 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/reset/reset-min.css 7 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/reset/reset.css 15 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/slider/README 69 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/slider/slider-debug.js 1259 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/slider/slider-min.js 36 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/slider/slider.js 1222 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/tabview/README 21 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/tabview/assets/border_tabs.css 54 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/tabview/assets/tabview.css 75 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/tabview/tabview-debug.js 1025 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/tabview/tabview-min.js 35 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/tabview/tabview.js 1021 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/treeview/README 147 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/lm.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/lmh.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/ln.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/loading.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/lp.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/lph.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/tm.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/tmh.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/tn.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/tp.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/tph.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/tree.css 102 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/treeview/assets/vline.gif patch | view | raw | blame | history
interface/web/js/yui/treeview/treeview-debug.js 2287 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/treeview/treeview-min.js 70 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/treeview/treeview.js 2248 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/utilities/README 36 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/utilities/utilities.js 418 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/yahoo-dom-event/README 35 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/yahoo-dom-event/yahoo-dom-event.js 144 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/yahoo/README 64 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/yahoo/yahoo-debug.js 433 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/yahoo/yahoo-min.js 15 ●●●●● patch | view | raw | blame | history
interface/web/js/yui/yahoo/yahoo.js 433 ●●●●● patch | view | raw | blame | history
interface/web/sites/ajax_get_json.php 66 ●●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/de_web_domain.lng 1 ●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/en_web_domain.lng 3 ●●●● patch | view | raw | blame | history
interface/web/sites/templates/web_domain_advanced.htm 25 ●●●●● patch | view | raw | blame | history
interface/web/sites/templates/web_domain_edit.htm 42 ●●●● patch | view | raw | blame | history
server/conf/nginx_reverseproxy_rewrites.conf.master patch | view | raw | blame | history
server/conf/nginx_reverseproxy_vhost.conf.master 69 ●●●●● patch | view | raw | blame | history
server/conf/nginx_vhost.conf.master 146 ●●●●● patch | view | raw | blame | history
server/mods-available/web_module.inc.php 18 ●●●● patch | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 1041 ●●●● patch | view | raw | blame | history
server/plugins-available/nginx_reverseproxy_plugin.inc.php 368 ●●●●● patch | view | raw | blame | history
interface/web/admin/form/server_config.tform.php
@@ -321,6 +321,12 @@
        ##################################
        # Begin Datatable fields
        ##################################
        'server_type' => array(
            'datatype' => 'VARCHAR',
            'formtype' => 'SELECT',
            'default' => 'apache',
            'value' => array('apache' => 'Apache', 'nginx' => 'nginx')
        ),
        'website_basedir' => array(
            'datatype' => 'VARCHAR',
            'formtype' => 'TEXT',
@@ -377,6 +383,28 @@
            'default' => '',
            'validators' => array(0 => array('type' => 'NOTEMPTY',
                    'errmsg' => 'vhost_conf_enabled_dir_error_empty'),
            ),
            'value' => '',
            'width' => '40',
            'maxlength' => '255'
        ),
        'nginx_vhost_conf_dir' => array(
            'datatype' => 'VARCHAR',
            'formtype' => 'TEXT',
            'default' => '',
            'validators' => array(0 => array('type' => 'NOTEMPTY',
                    'errmsg' => 'nginx_vhost_conf_dir_error_empty'),
            ),
            'value' => '',
            'width' => '40',
            'maxlength' => '255'
        ),
        'nginx_vhost_conf_enabled_dir' => array(
            'datatype' => 'VARCHAR',
            'formtype' => 'TEXT',
            'default' => '',
            'validators' => array(0 => array('type' => 'NOTEMPTY',
                    'errmsg' => 'nginx_vhost_conf_enabled_dir_error_empty'),
            ),
            'value' => '',
            'width' => '40',
@@ -463,7 +491,7 @@
            ),
            'value' => '',
            'width' => '40',
            'maxlength' => '255'
            'maxlength' => '4000'
        ),
        'htaccess_allow_override' => array(
            'datatype' => 'VARCHAR',
interface/web/admin/lib/lang/de_server_config.lng
@@ -5,7 +5,7 @@
$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted Anwendungen';
$wb['website_path_txt'] = 'Website Pfad';
$wb['website_symlinks_txt'] = 'Website Symlinks';
$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['website_symlinks_rel_txt'] = 'Erstelle relative Symlinks';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
@@ -85,5 +85,8 @@
$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
$wb['ufw_log_level_txt'] = 'Log Level';
$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.';
$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.';
$wb["server_type_txt"] = 'Server-Typ';
$wb["nginx_vhost_conf_dir_txt"] = 'nginx Vhost config dir';
$wb["nginx_vhost_conf_enabled_dir_txt"] = 'nginx Vhost config enabled dir';
?>
interface/web/admin/lib/lang/en_server_config.lng
@@ -88,4 +88,7 @@
$wb["CA_pass_txt"] = 'CA passphrase';
$wb["fastcgi_config_syntax_txt"] = 'FastCGI config syntax';
$wb["backup_dir_ftpread_txt"] = 'Backup dir. readable for website FTP users.';
$wb["server_type_txt"] = 'Server Type';
$wb["nginx_vhost_conf_dir_txt"] = 'nginx Vhost config dir';
$wb["nginx_vhost_conf_enabled_dir_txt"] = 'nginx Vhost config enabled dir';
?>
interface/web/admin/templates/server_config_web_edit.htm
@@ -5,6 +5,14 @@
  
  <div class="pnl_formsarea">
    <fieldset class="inlineLabels">
        <div class="ctrlHolder">
                <p class="label">{tmpl_var name='server_type_txt'}</p>
                    <div class="multiField">
                        <select name="server_type" id="server_type" class="selectInput">
                    {tmpl_var name='server_type'}
                </select>
                    </div>
            </div>
      <div class="ctrlHolder">
          <label for="website_basedir">{tmpl_var name='website_basedir_txt'}</label>
        <input name="website_basedir" id="website_basedir" value="{tmpl_var name='website_basedir'}" size="40" maxlength="255" type="text" class="textInput" />
@@ -30,6 +38,14 @@
      <div class="ctrlHolder">
          <label for="vhost_conf_enabled_dir">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
        <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" />
            </div>
    <div class="ctrlHolder">
          <label for="nginx_vhost_conf_dir">{tmpl_var name='nginx_vhost_conf_dir_txt'}</label>
        <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" />
            </div>
      <div class="ctrlHolder">
          <label for="nginx_vhost_conf_enabled_dir">{tmpl_var name='nginx_vhost_conf_enabled_dir_txt'}</label>
        <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" />
            </div>
      <div class="ctrlHolder">
          <label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
@@ -71,7 +87,7 @@
      </div>
      <div class="ctrlHolder">
          <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
        <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="40" maxlength="255" type="text" class="textInput" />
        <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="40" type="text" class="textInput" />
      </div>
      <div class="ctrlHolder">
          <label for="htaccess_allow_override">{tmpl_var name='htaccess_allow_override_txt'}</label>
@@ -116,3 +132,39 @@
  </div>
  
</div>
<script language="JavaScript" type="text/javascript">
        var serverType = jQuery('#server_type').val();
        adjustForm(serverType);
        jQuery('#server_type').change(function(){
            serverType = $(this).val();
            adjustForm(serverType);
        });
        function adjustForm(serverType){
            if(serverType == "nginx"){
                jQuery('#vhost_conf_dir').closest('div.ctrlHolder').hide();
                jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
                jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').show();
                jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
                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('#vhost_conf_dir').closest('div.ctrlHolder').show();
                jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
                jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').hide();
                jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
                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>
interface/web/js/yui-combo.js
File was deleted
interface/web/js/yui/animation/README
File was deleted
interface/web/js/yui/animation/animation-debug.js
File was deleted
interface/web/js/yui/animation/animation-min.js
File was deleted
interface/web/js/yui/animation/animation.js
File was deleted
interface/web/js/yui/autocomplete/README
File was deleted
interface/web/js/yui/autocomplete/autocomplete-debug.js
File was deleted
interface/web/js/yui/autocomplete/autocomplete-min.js
File was deleted
interface/web/js/yui/autocomplete/autocomplete.js
File was deleted
interface/web/js/yui/button/README
File was deleted
interface/web/js/yui/button/assets/background.png
Binary files differ
interface/web/js/yui/button/assets/button.css
File was deleted
interface/web/js/yui/button/assets/menuarrow.gif
Binary files differ
interface/web/js/yui/button/assets/splitarrow.gif
Binary files differ
interface/web/js/yui/button/assets/splitarrow_active.gif
Binary files differ
interface/web/js/yui/button/button-beta-debug.js
File was deleted
interface/web/js/yui/button/button-beta-min.js
File was deleted
interface/web/js/yui/button/button-beta.js
File was deleted
interface/web/js/yui/calendar/README
File was deleted
interface/web/js/yui/calendar/assets/calendar.css
File was deleted
interface/web/js/yui/calendar/assets/callt.gif
Binary files differ
interface/web/js/yui/calendar/assets/calrt.gif
Binary files differ
interface/web/js/yui/calendar/assets/calx.gif
Binary files differ
interface/web/js/yui/calendar/calendar-debug.js
File was deleted
interface/web/js/yui/calendar/calendar-min.js
File was deleted
interface/web/js/yui/calendar/calendar.js
File was deleted
interface/web/js/yui/connection/README
File was deleted
interface/web/js/yui/connection/connection-debug.js
File was deleted
interface/web/js/yui/connection/connection-min.js
File was deleted
interface/web/js/yui/connection/connection.js
File was deleted
interface/web/js/yui/container/README
File was deleted
interface/web/js/yui/container/assets/alrt16_1.gif
Binary files differ
interface/web/js/yui/container/assets/blck16_1.gif
Binary files differ
interface/web/js/yui/container/assets/close12_1.gif
Binary files differ
interface/web/js/yui/container/assets/container.css
File was deleted
interface/web/js/yui/container/assets/hlp16_1.gif
Binary files differ
interface/web/js/yui/container/assets/info16_1.gif
Binary files differ
interface/web/js/yui/container/assets/tip16_1.gif
Binary files differ
interface/web/js/yui/container/assets/warn16_1.gif
Binary files differ
interface/web/js/yui/container/container-debug.js
File was deleted
interface/web/js/yui/container/container-min.js
File was deleted
interface/web/js/yui/container/container.js
File was deleted
interface/web/js/yui/container/container_core-debug.js
File was deleted
interface/web/js/yui/container/container_core-min.js
File was deleted
interface/web/js/yui/container/container_core.js
File was deleted
interface/web/js/yui/datasource/README
File was deleted
interface/web/js/yui/datasource/datasource-beta-debug.js
File was deleted
interface/web/js/yui/datasource/datasource-beta-min.js
File was deleted
interface/web/js/yui/datasource/datasource-beta.js
File was deleted
interface/web/js/yui/datatable/README
File was deleted
interface/web/js/yui/datatable/assets/datatable.css
File was deleted
interface/web/js/yui/datatable/datatable-beta-debug.js
File was deleted
interface/web/js/yui/datatable/datatable-beta-min.js
File was deleted
interface/web/js/yui/datatable/datatable-beta.js
File was deleted
interface/web/js/yui/dom/README
File was deleted
interface/web/js/yui/dom/dom-debug.js
File was deleted
interface/web/js/yui/dom/dom-min.js
File was deleted
interface/web/js/yui/dom/dom.js
File was deleted
interface/web/js/yui/dragdrop/README
File was deleted
interface/web/js/yui/dragdrop/dragdrop-debug.js
File was deleted
interface/web/js/yui/dragdrop/dragdrop-min.js
File was deleted
interface/web/js/yui/dragdrop/dragdrop.js
File was deleted
interface/web/js/yui/element/README
File was deleted
interface/web/js/yui/element/element-beta-debug.js
File was deleted
interface/web/js/yui/element/element-beta-min.js
File was deleted
interface/web/js/yui/element/element-beta.js
File was deleted
interface/web/js/yui/event/README
File was deleted
interface/web/js/yui/event/event-debug.js
File was deleted
interface/web/js/yui/event/event-min.js
File was deleted
interface/web/js/yui/event/event.js
File was deleted
interface/web/js/yui/fonts/README
File was deleted
interface/web/js/yui/fonts/fonts-min.css
File was deleted
interface/web/js/yui/fonts/fonts.css
File was deleted
interface/web/js/yui/grids/README
File was deleted
interface/web/js/yui/grids/grids-min.css
File was deleted
interface/web/js/yui/grids/grids.css
File was deleted
interface/web/js/yui/history/README
File was deleted
interface/web/js/yui/history/assets/blank.html
File was deleted
interface/web/js/yui/history/history-experimental-debug.js
File was deleted
interface/web/js/yui/history/history-experimental-min.js
File was deleted
interface/web/js/yui/history/history-experimental.js
File was deleted
interface/web/js/yui/logger/README
File was deleted
interface/web/js/yui/logger/assets/logger.css
File was deleted
interface/web/js/yui/logger/logger-debug.js
File was deleted
interface/web/js/yui/logger/logger-min.js
File was deleted
interface/web/js/yui/logger/logger.js
File was deleted
interface/web/js/yui/menu/README
File was deleted
interface/web/js/yui/menu/assets/map.gif
Binary files differ
interface/web/js/yui/menu/assets/menu.css
File was deleted
interface/web/js/yui/menu/assets/menuarodwn8_dim_1.gif
Binary files differ
interface/web/js/yui/menu/assets/menuarodwn8_hov_1.gif
Binary files differ
interface/web/js/yui/menu/assets/menuarodwn8_nrm_1.gif
Binary files differ
interface/web/js/yui/menu/assets/menuarorght8_dim_1.gif
Binary files differ
interface/web/js/yui/menu/assets/menuarorght8_hov_1.gif
Binary files differ
interface/web/js/yui/menu/assets/menuarorght8_nrm_1.gif
Binary files differ
interface/web/js/yui/menu/assets/menuaroup8_dim_1.gif
Binary files differ
interface/web/js/yui/menu/assets/menuaroup8_nrm_1.gif
Binary files differ
interface/web/js/yui/menu/assets/menuchk8_dim_1.gif
Binary files differ
interface/web/js/yui/menu/assets/menuchk8_hov_1.gif
Binary files differ
interface/web/js/yui/menu/assets/menuchk8_nrm_1.gif
Binary files differ
interface/web/js/yui/menu/menu-debug.js
File was deleted
interface/web/js/yui/menu/menu-min.js
File was deleted
interface/web/js/yui/menu/menu.js
File was deleted
interface/web/js/yui/reset-fonts-grids/README
File was deleted
interface/web/js/yui/reset-fonts-grids/reset-fonts-grids.css
File was deleted
interface/web/js/yui/reset/README
File was deleted
interface/web/js/yui/reset/reset-min.css
File was deleted
interface/web/js/yui/reset/reset.css
File was deleted
interface/web/js/yui/slider/README
File was deleted
interface/web/js/yui/slider/slider-debug.js
File was deleted
interface/web/js/yui/slider/slider-min.js
File was deleted
interface/web/js/yui/slider/slider.js
File was deleted
interface/web/js/yui/tabview/README
File was deleted
interface/web/js/yui/tabview/assets/border_tabs.css
File was deleted
interface/web/js/yui/tabview/assets/tabview.css
File was deleted
interface/web/js/yui/tabview/tabview-debug.js
File was deleted
interface/web/js/yui/tabview/tabview-min.js
File was deleted
interface/web/js/yui/tabview/tabview.js
File was deleted
interface/web/js/yui/treeview/README
File was deleted
interface/web/js/yui/treeview/assets/lm.gif
Binary files differ
interface/web/js/yui/treeview/assets/lmh.gif
Binary files differ
interface/web/js/yui/treeview/assets/ln.gif
Binary files differ
interface/web/js/yui/treeview/assets/loading.gif
Binary files differ
interface/web/js/yui/treeview/assets/lp.gif
Binary files differ
interface/web/js/yui/treeview/assets/lph.gif
Binary files differ
interface/web/js/yui/treeview/assets/tm.gif
Binary files differ
interface/web/js/yui/treeview/assets/tmh.gif
Binary files differ
interface/web/js/yui/treeview/assets/tn.gif
Binary files differ
interface/web/js/yui/treeview/assets/tp.gif
Binary files differ
interface/web/js/yui/treeview/assets/tph.gif
Binary files differ
interface/web/js/yui/treeview/assets/tree.css
File was deleted
interface/web/js/yui/treeview/assets/vline.gif
Binary files differ
interface/web/js/yui/treeview/treeview-debug.js
File was deleted
interface/web/js/yui/treeview/treeview-min.js
File was deleted
interface/web/js/yui/treeview/treeview.js
File was deleted
interface/web/js/yui/utilities/README
File was deleted
interface/web/js/yui/utilities/utilities.js
File was deleted
interface/web/js/yui/yahoo-dom-event/README
File was deleted
interface/web/js/yui/yahoo-dom-event/yahoo-dom-event.js
File was deleted
interface/web/js/yui/yahoo/README
File was deleted
interface/web/js/yui/yahoo/yahoo-debug.js
File was deleted
interface/web/js/yui/yahoo/yahoo-min.js
File was deleted
interface/web/js/yui/yahoo/yahoo.js
File was deleted
interface/web/sites/ajax_get_json.php
New file
@@ -0,0 +1,66 @@
<?php
/*
Copyright (c) 2005, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of ISPConfig nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
//* Check permissions for module
$app->auth->check_module_permissions('sites');
$server_id = intval($_GET["server_id"]);
$web_id = intval($_GET["web_id"]);
$type = $_GET["type"];
if($_SESSION["s"]["user"]["typ"] == 'admin') {
    if($type == 'getservertype'){
        $json = '{"servertype":"';
        $server_type = 'apache';
        $app->uses('getconf');
        $web_config = $app->getconf->get_server_config($server_id, 'web');
        if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
        $json .= $server_type;
        unset($webconfig);
        $json .= '"}';
    }
    if($type == 'getserverid'){
        $json = '{"serverid":"';
        $sql = "SELECT server_id FROM web_domain WHERE domain_id = $web_id";
        $server = $app->db->queryOneRecord($sql);
        $json .= $server['server_id'];
        unset($server);
        $json .= '"}';
    }
}
echo $json;
?>
interface/web/sites/lib/lang/de_web_domain.lng
@@ -72,4 +72,5 @@
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
$wb['nginx_directives_txt'] = 'nginx Direktiven';
?>
interface/web/sites/lib/lang/en_web_domain.lng
@@ -36,7 +36,7 @@
$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
$wb["apache_directives_txt"] = 'Apache directives';
$wb["apache_directives_txt"] = 'Apache Directives';
$wb["domain_error_empty"] = 'Domain is empty.';
$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
$wb["domain_error_regex"] = 'Domain name invalid.';
@@ -72,4 +72,5 @@
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
$wb["nginx_directives_txt"] = 'nginx Directives';
?>
interface/web/sites/templates/web_domain_advanced.htm
@@ -47,3 +47,28 @@
  </div>
  
</div>
<script language="JavaScript" type="text/javascript">
        var webId = jQuery('input[name="id"]').val();
        var serverId;
        getServerId(webId);
        serverType(serverId);
        function getServerId(webId){
            jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
                serverId = data.serverid;
            });
        }
        function serverType(serverId){
            jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
                if(data.servertype == "nginx"){
                    jQuery('#allow_override').closest('div.ctrlHolder').hide();
                    jQuery('#apache_directives').closest('div.ctrlHolder').hide();
                } else {
                    jQuery('#allow_override').closest('div.ctrlHolder').show();
                    jQuery('#apache_directives').closest('div.ctrlHolder').show();
                }
            });
        }
</script>
interface/web/sites/templates/web_domain_edit.htm
@@ -89,12 +89,7 @@
                        {tmpl_var name='errordocs'}
                    </div>
            </div>
      <div class="ctrlHolder">
                <p class="label">{tmpl_var name='is_subdomainwww_txt'}</p>
                    <div class="multiField">
                        {tmpl_var name='is_subdomainwww'}
                    </div>
            </div>
      <div class="ctrlHolder">
          <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
        <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
@@ -130,3 +125,38 @@
  </div>
  
</div>
<script language="JavaScript" type="text/javascript">
        var serverId;
        var serverIdDisabled = jQuery('#server_id_disabled').val();
        if(serverIdDisabled > 0){
            serverId = serverIdDisabled;
        } else {
            serverId = jQuery('#server_id').val();
            jQuery('#server_id').change(function(){
                serverId = $(this).val();
                serverType(serverId);
            });
        }
        serverType(serverId);
        function serverType(serverId){
            jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
                if(data.servertype == "nginx"){
                    var selected = jQuery('#php').val();
                    jQuery('#ruby').closest('div.ctrlHolder').hide();
                    jQuery('#suexec').closest('div.ctrlHolder').hide();
                    jQuery('#php option[value="cgi"]').hide();
                    jQuery('#php option[value="mod"]').hide();
                    jQuery('#php option[value="suphp"]').hide();
                    if(selected != "no" && selected != "fast-cgi") jQuery('#php option[value="fast-cgi"]').attr('selected', 'selected');
                } else {
                    jQuery('#ruby').closest('div.ctrlHolder').show();
                    jQuery('#suexec').closest('div.ctrlHolder').show();
                    jQuery('#php option[value="cgi"]').show();
                    jQuery('#php option[value="mod"]').show();
                    jQuery('#php option[value="suphp"]').show();
                }
            });
        }
</script>
server/conf/nginx_reverseproxy_rewrites.conf.master
server/conf/nginx_reverseproxy_vhost.conf.master
New file
@@ -0,0 +1,69 @@
server {
        listen   80;
        server_name  <tmpl_var name='alias'> <tmpl_var name='domain'>;
        access_log  /var/log/ispconfig/nginx/<tmpl_var name='domain'>/access.log;
        error_log  /var/log/ispconfig/nginx/<tmpl_var name='domain'>/error.log;
        include         /etc/nginx/proxy.conf;
        location / {
                proxy_pass      http://<tmpl_var name='ip_address'>:80;
        }
        location ~* \.(jpg|png|gif|jpeg|css|js|mp3|wav|swf|mov|doc|pdf|xls|ppt|docx|pptx|xlsx)$ {
                # Cache static-looking files for 120 minutes, setting a 10 day expiry time in the HTTP header,
                # whether logged in or not (may be too heavy-handed).
                proxy_cache_valid 200 120m;
                expires 864000;
                proxy_pass      http://<tmpl_var name='ip_address'>:80;
        }
        <tmpl_if name='nginx_directives'>
            <tmpl_var name='nginx_directives'>
        </tmpl_if>
}
<tmpl_if name='ssl_enabled'>
###########################################################
# SSL Vhost
###########################################################
server {
        listen   443;
        server_name  <tmpl_var name='ssl_domain'> <tmpl_var name='alias'>;
        access_log  /var/log/ispconfig/nginx/<tmpl_var name='domain'>/access.log
        error_log  /var/log/ispconfig/nginx/<tmpl_var name='domain'>/error.log
        ### SSL cert files ###
        ssl_certificate      <tmpl_var name='config_dir'>/ssl/<tmpl_var name='ssl_domain'>.crt
        ssl_certificate_key  <tmpl_var name='config_dir'>/ssl/<tmpl_var name='ssl_domain'>.crt
        <tmpl_if name='has_bundle_cert'>
            ssl_client_certificate <tmpl_var name='config_dir'>/ssl/<tmpl_var name='ssl_domain'>.bundle
        </tmpl_if>
        ### Add SSL specific settings here ###
        keepalive_timeout    60;
        ###  Limiting Ciphers ########################
        # Uncomment as per your setup
        #ssl_ciphers HIGH:!ADH;
        #ssl_perfer_server_ciphers on;
        #ssl_protocols SSLv3;
        ##############################################
        include         /etc/nginx/proxy.conf;
        ### Most PHP, Python, Rails, Java App can use this header ###
        proxy_set_header X-Forwarded-Proto https;
        location / {
                proxy_pass      https://<tmpl_var name='ip_address'>:443;
        }
}
</tmpl_if>
server/conf/nginx_vhost.conf.master
@@ -1,69 +1,99 @@
server {
        listen   80;
        server_name  <tmpl_var name='alias'> <tmpl_var name='domain'>;
        listen <tmpl_var name='ip_address'>:80;
        <tmpl_if name='ssl_enabled'>
        listen <tmpl_var name='ip_address'>:443 ssl;
        ssl_certificate <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt;
        ssl_certificate_key <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key;
        </tmpl_if>
        server_name <tmpl_var name='domain'> <tmpl_var name='alias'>;
        access_log  /var/log/ispconfig/nginx/<tmpl_var name='domain'>/access.log;
        error_log  /var/log/ispconfig/nginx/<tmpl_var name='domain'>/error.log;
        include         /etc/nginx/proxy.conf;
        root   <tmpl_var name='web_document_root_www'>;
        location / {
                proxy_pass      http://<tmpl_var name='ip_address'>:80;
            index index.html index.php;
        }
        <tmpl_if name='ssi' op='==' value='y'>
        location ~ \.shtml$ {
            ssi on;
        }
        </tmpl_if>
        <tmpl_if name='errordocs'>
        error_page 400 /error/400.html;
        error_page 401 /error/401.html;
        error_page 403 /error/403.html;
        error_page 404 /error/404.html;
        error_page 405 /error/405.html;
        error_page 500 /error/500.html;
        error_page 503 /error/503.html;
        </tmpl_if>
        error_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/error.log;
        # serve static files directly
        location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
            access_log        off;
        }
        location ~* \.(jpg|png|gif|jpeg|css|js|mp3|wav|swf|mov|doc|pdf|xls|ppt|docx|pptx|xlsx)$ {
                # Cache static-looking files for 120 minutes, setting a 10 day expiry time in the HTTP header,
                # whether logged in or not (may be too heavy-handed).
                proxy_cache_valid 200 120m;
                expires 864000;
                proxy_pass      http://<tmpl_var name='ip_address'>:80;
        ## Disable .htaccess and other hidden files
        location ~ /\. {
            deny all;
            access_log off;
            log_not_found off;
        }
        location = /favicon.ico {
            log_not_found off;
            access_log off;
        }
        location = /robots.txt {
            allow all;
            log_not_found off;
            access_log off;
        }
        location /stats {
            index index.html index.php;
            auth_basic "Members Only";
            auth_basic_user_file <tmpl_var name='stats_auth_passwd_file'>;
        }
        <tmpl_if name='php' op='==' value='fast-cgi'>
        location ~ \.php$ {
            fastcgi_pass 127.0.0.1:9000;
            fastcgi_index index.php;
            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
            fastcgi_param PATH_INFO $fastcgi_script_name;
            include /etc/nginx/fastcgi_params;
        }
        </tmpl_else>
        location ~ \.php$ {
            deny all;
        }
        </tmpl_if>
        <tmpl_if name='cgi' op='==' value='y'>
        location /cgi-bin/ {
            root <tmpl_var name='document_root'>;
            gzip off;
            fastcgi_pass  unix:/var/run/fcgiwrap.socket;
            fastcgi_index index.cgi;
            fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
            include /etc/nginx/fastcgi_params;
        }
        </tmpl_if>
        <tmpl_if name='nginx_directives'>
            <tmpl_var name='nginx_directives'>
        </tmpl_if>
}
<tmpl_if name='ssl_enabled'>
###########################################################
# SSL Vhost
###########################################################
server {
        listen   443;
        server_name  <tmpl_var name='ssl_domain'> <tmpl_var name='alias'>;
        access_log  /var/log/ispconfig/nginx/<tmpl_var name='domain'>/access.log
        error_log  /var/log/ispconfig/nginx/<tmpl_var name='domain'>/error.log
        ### SSL cert files ###
        ssl_certificate      <tmpl_var name='config_dir'>/ssl/<tmpl_var name='ssl_domain'>.crt
        ssl_certificate_key  <tmpl_var name='config_dir'>/ssl/<tmpl_var name='ssl_domain'>.crt
        <tmpl_if name='has_bundle_cert'>
            ssl_client_certificate <tmpl_var name='config_dir'>/ssl/<tmpl_var name='ssl_domain'>.bundle
        </tmpl_if>
        ### Add SSL specific settings here ###
        keepalive_timeout    60;
        ###  Limiting Ciphers ########################
        # Uncomment as per your setup
        #ssl_ciphers HIGH:!ADH;
        #ssl_perfer_server_ciphers on;
        #ssl_protocols SSLv3;
        ##############################################
        include         /etc/nginx/proxy.conf;
        ### Most PHP, Python, Rails, Java App can use this header ###
        proxy_set_header X-Forwarded-Proto https;
        location / {
                proxy_pass      https://<tmpl_var name='ip_address'>:443;
        }
}
</tmpl_if>
}
server/mods-available/web_module.inc.php
@@ -129,11 +129,21 @@
    function restartHttpd($action = 'restart') {
        global $app,$conf;
        
        // load the server configuration options
        $app->uses('getconf');
        $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
        $daemon = '';
        if(is_file($conf['init_scripts'] . '/' . 'httpd')) {
            $daemon = 'httpd';
        } else {
            $daemon = 'apache2';
        switch ($web_config['server_type']) {
            case 'nginx':
                $daemon = $web_config['server_type'];
                break;
            default:
                if(is_file($conf['init_scripts'] . '/' . 'httpd')) {
                    $daemon = 'httpd';
                } else {
                    $daemon = 'apache2';
                }
        }
        
        if($action == 'restart') {
server/plugins-available/nginx_plugin.inc.php
@@ -1,5 +1,33 @@
<?php
/*
Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of ISPConfig nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
class nginx_plugin {
    var $plugin_name = 'nginx_plugin';
@@ -13,7 +41,7 @@
    function onInstall() {
        global $conf;
        if($conf['services']['proxy'] == true && $conf['nginx']['installed'] == true) {
        if($conf['services']['web'] == true) {
            return true;
        } else {
            return false;
@@ -32,7 +60,6 @@
        /*
        Register for the events
        */
        $app->plugins->registerEvent('web_domain_insert',$this->plugin_name,'ssl');
        $app->plugins->registerEvent('web_domain_update',$this->plugin_name,'ssl');
        $app->plugins->registerEvent('web_domain_delete',$this->plugin_name,'ssl');
@@ -40,24 +67,177 @@
        $app->plugins->registerEvent('web_domain_insert',$this->plugin_name,'insert');
        $app->plugins->registerEvent('web_domain_update',$this->plugin_name,'update');
        $app->plugins->registerEvent('web_domain_delete',$this->plugin_name,'delete');
        $app->plugins->registerEvent('server_ip_insert',$this->plugin_name,'server_ip');
        $app->plugins->registerEvent('server_ip_update',$this->plugin_name,'server_ip');
        $app->plugins->registerEvent('server_ip_delete',$this->plugin_name,'server_ip');
        /*
        $app->plugins->registerEvent('webdav_user_insert',$this->plugin_name,'webdav');
        $app->plugins->registerEvent('webdav_user_update',$this->plugin_name,'webdav');
        $app->plugins->registerEvent('webdav_user_delete',$this->plugin_name,'webdav');
        */
        
    //    $app->plugins->registerEvent('proxy_reverse_insert',$this->plugin_name,'rewrite_insert');
    //    $app->plugins->registerEvent('proxy_reverse_update',$this->plugin_name,'rewrite_update');
    //    $app->plugins->registerEvent('proxy_reverse_delete',$this->plugin_name,'rewrite_delete');
        $app->plugins->registerEvent('client_delete',$this->plugin_name,'client_delete');
    }
    // Handle the creation of SSL certificates
    function ssl($event_name,$data) {
        global $app, $conf;
        // load the server configuration options
        $app->uses('getconf');
        $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
        if ($web_config['CA_path']!='' && !file_exists($web_config['CA_path'].'/openssl.cnf'))
            $app->log("CA path error, file does not exist:".$web_config['CA_path'].'/openssl.conf',LOGLEVEL_ERROR);
        //* Only vhosts can have a ssl cert
        if($data["new"]["type"] != "vhost") return;
        if(!is_dir($data['new']['document_root'].'/ssl')) exec('mkdir -p '.$data['new']['document_root'].'/ssl');
        $ssl_dir = $data['new']['document_root'].'/ssl';
        $domain = $data['new']['ssl_domain'];
        $key_file = $ssl_dir.'/'.$domain.'.key.org';
        $key_file2 = $ssl_dir.'/'.$domain.'.key';
        $csr_file = $ssl_dir.'/'.$domain.'.csr';
        $crt_file = $ssl_dir.'/'.$domain.'.crt';
        //* Create a SSL Certificate
        if($data['new']['ssl_action'] == 'create') {
            $rand_file = $ssl_dir.'/random_file';
            $rand_data = md5(uniqid(microtime(),1));
            for($i=0; $i<1000; $i++) {
                $rand_data .= md5(uniqid(microtime(),1));
                $rand_data .= md5(uniqid(microtime(),1));
                $rand_data .= md5(uniqid(microtime(),1));
                $rand_data .= md5(uniqid(microtime(),1));
            }
            file_put_contents($rand_file, $rand_data);
            $ssl_password = substr(md5(uniqid(microtime(),1)), 0, 15);
            $ssl_cnf = "        RANDFILE               = $rand_file
        [ req ]
        default_bits           = 2048
        default_keyfile        = keyfile.pem
        distinguished_name     = req_distinguished_name
        attributes             = req_attributes
        prompt                 = no
        output_password        = $ssl_password
        [ req_distinguished_name ]
        C                      = ".$data['new']['ssl_country']."
        ST                     = ".$data['new']['ssl_state']."
        L                      = ".$data['new']['ssl_locality']."
        O                      = ".$data['new']['ssl_organisation']."
        OU                     = ".$data['new']['ssl_organisation_unit']."
        CN                     = $domain
        emailAddress           = webmaster@".$data['new']['domain']."
        [ req_attributes ]
        challengePassword              = A challenge password";
            $ssl_cnf_file = $ssl_dir.'/openssl.conf';
            file_put_contents($ssl_cnf_file,$ssl_cnf);
            $rand_file = escapeshellcmd($rand_file);
            $key_file = escapeshellcmd($key_file);
            $key_file2 = escapeshellcmd($key_file2);
            $ssl_days = 3650;
            $csr_file = escapeshellcmd($csr_file);
            $config_file = escapeshellcmd($ssl_cnf_file);
            $crt_file = escapeshellcmd($crt_file);
            if(is_file($ssl_cnf_file)) {
                exec("openssl genrsa -des3 -rand $rand_file -passout pass:$ssl_password -out $key_file 2048");
                exec("openssl req -new -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -out $csr_file -days $ssl_days -config $config_file");
                exec("openssl rsa -passin pass:$ssl_password -in $key_file -out $key_file2");
                if(file_exists($web_config['CA_path'].'/openssl.cnf'))
                {
                    exec("openssl ca -batch -out $crt_file -config ".$web_config['CA_path']."/openssl.cnf -passin pass:".$web_config['CA_pass']." -in $csr_file");
                    $app->log("Creating CA-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
                    if (filesize($crt_file)==0 || !file_exists($crt_file)) $app->log("CA-Certificate signing failed.  openssl ca -out $crt_file -config ".$web_config['CA_path']."/openssl.cnf -passin pass:".$web_config['CA_pass']." -in $csr_file",LOGLEVEL_ERROR);
                };
                if (filesize($crt_file)==0 || !file_exists($crt_file)){
                    exec("openssl req -x509 -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -in $csr_file -out $crt_file -days $ssl_days -config $config_file ");
                    $app->log("Creating self-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
                };
            }
            exec('chmod 400 '.$key_file2);
            @unlink($config_file);
            @unlink($rand_file);
            $ssl_request = $app->db->quote(file_get_contents($csr_file));
            $ssl_cert = $app->db->quote(file_get_contents($crt_file));
            /* Update the DB of the (local) Server */
            $app->db->query("UPDATE web_domain SET ssl_request = '$ssl_request', ssl_cert = '$ssl_cert' WHERE domain = '".$data['new']['domain']."'");
            $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
            /* Update also the master-DB of the Server-Farm */
            $app->dbmaster->query("UPDATE web_domain SET ssl_request = '$ssl_request', ssl_cert = '$ssl_cert' WHERE domain = '".$data['new']['domain']."'");
            $app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
        }
        //* Save a SSL certificate to disk
        if($data["new"]["ssl_action"] == 'save') {
            $ssl_dir = $data["new"]["document_root"]."/ssl";
            $domain = $data["new"]["ssl_domain"];
            $csr_file = $ssl_dir.'/'.$domain.".csr";
            $crt_file = $ssl_dir.'/'.$domain.".crt";
            //$bundle_file = $ssl_dir.'/'.$domain.".bundle";
            if(trim($data["new"]["ssl_request"]) != '') file_put_contents($csr_file,$data["new"]["ssl_request"]);
            if(trim($data["new"]["ssl_cert"]) != '') file_put_contents($crt_file,$data["new"]["ssl_cert"]);
            // for nginx, bundle files have to be appended to the certificate file
            if(trim($data["new"]["ssl_bundle"]) != '') file_put_contents($crt_file,$data["new"]["ssl_bundle"], FILE_APPEND);
            /* Update the DB of the (local) Server */
            $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
            /* Update also the master-DB of the Server-Farm */
            $app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
            $app->log('Saving SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
        }
        //* Delete a SSL certificate
        if($data['new']['ssl_action'] == 'del') {
            $ssl_dir = $data['new']['document_root'].'/ssl';
            $domain = $data['new']['ssl_domain'];
            $csr_file = $ssl_dir.'/'.$domain.'.csr';
            $crt_file = $ssl_dir.'/'.$domain.'.crt';
            //$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
            if(file_exists($web_config['CA_path'].'/openssl.cnf'))
                {
                    exec("openssl ca -batch -config ".$web_config['CA_path']."/openssl.cnf -passin pass:".$web_config['CA_pass']." -revoke $crt_file");
                    $app->log("Revoking CA-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
                };
            unlink($csr_file);
            unlink($crt_file);
            //unlink($bundle_file);
            /* Update the DB of the (local) Server */
            $app->db->query("UPDATE web_domain SET ssl_request = '', ssl_cert = '' WHERE domain = '".$data['new']['domain']."'");
            $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
            /* Update also the master-DB of the Server-Farm */
            $app->dbmaster->query("UPDATE web_domain SET ssl_request = '', ssl_cert = '' WHERE domain = '".$data['new']['domain']."'");
            $app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
            $app->log('Deleting SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
        }
    }
    function insert($event_name,$data) {
        global $app, $conf;
        $this->action = 'insert';
        // just run the update function
        $this->update($event_name,$data);
    }
    function update($event_name,$data) {
        global $app, $conf;
@@ -68,9 +248,9 @@
            $old_parent_domain_id = intval($data['old']['parent_domain_id']);
            $new_parent_domain_id = intval($data['new']['parent_domain_id']);
            // If the parent_domain_id has been chenged, we will have to update the old site as well.
            // If the parent_domain_id has been changed, we will have to update the old site as well.
            if($this->action == 'update' && $data['new']['parent_domain_id'] != $data['old']['parent_domain_id']) {
                $tmp = $app->dbmaster->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$old_parent_domain_id." AND active = 'y'");
                $tmp = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$old_parent_domain_id." AND active = 'y'");
                $data['new'] = $tmp;
                $data['old'] = $tmp;
                $this->action = 'update';
@@ -78,21 +258,375 @@
            }
            // This is not a vhost, so we need to update the parent record instead.
            $tmp = $app->dbmaster->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$new_parent_domain_id." AND active = 'y'");
            $tmp = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$new_parent_domain_id." AND active = 'y'");
            $data['new'] = $tmp;
            $data['old'] = $tmp;
            $this->action = 'update';
        }
        // load the server configuration options
        $app->uses('getconf');
        $nginx_config = $app->getconf->get_server_config($conf['server_id'], 'nginx');
        $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
        //* Check if this is a chrooted setup
        if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) {
            $nginx_chrooted = true;
            $app->log('Info: nginx is chrooted.',LOGLEVEL_DEBUG);
        } else {
            $nginx_chrooted = false;
        }
        if($data['new']['document_root'] == '') {
            $app->log('document_root not set',LOGLEVEL_WARN);
            return 0;
        }
        if($data['new']['system_user'] == 'root' or $data['new']['system_group'] == 'root') {
            $app->log('Websites cannot be owned by the root user or group.',LOGLEVEL_WARN);
            return 0;
        }
        //* If the client of the site has been changed, we have a change of the document root
        if($this->action == 'update' && $data['new']['document_root'] != $data['old']['document_root']) {
            //* Get the old client ID
            $old_client = $app->dbmaster->queryOneRecord('SELECT client_id FROM sys_group WHERE sys_group.groupid = '.intval($data['old']['sys_groupid']));
            $old_client_id = intval($old_client['client_id']);
            unset($old_client);
            //* Remove the old symlinks
            $tmp_symlinks_array = explode(':',$web_config['website_symlinks']);
            if(is_array($tmp_symlinks_array)) {
                foreach($tmp_symlinks_array as $tmp_symlink) {
                    $tmp_symlink = str_replace('[client_id]',$old_client_id,$tmp_symlink);
                    $tmp_symlink = str_replace('[website_domain]',$data['old']['domain'],$tmp_symlink);
                    // Remove trailing slash
                    if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
                    // create the symlinks, if not exist
                    if(is_link($tmp_symlink)) {
                        exec('rm -f '.escapeshellcmd($tmp_symlink));
                        $app->log('Removed symlink: rm -f '.$tmp_symlink,LOGLEVEL_DEBUG);
                    }
                }
            }
            //* Move the site data
            $tmp_docroot = explode('/',$data['new']['document_root']);
            unset($tmp_docroot[count($tmp_docroot)-1]);
            $new_dir = implode('/',$tmp_docroot);
            $tmp_docroot = explode('/',$data['old']['document_root']);
            unset($tmp_docroot[count($tmp_docroot)-1]);
            $old_dir = implode('/',$tmp_docroot);
            exec('rm -rf '.$data['new']['document_root']);
            if(!is_dir($new_dir)) exec('mkdir -p '.$new_dir);
            exec('mv '.$data['old']['document_root'].' '.$new_dir);
            $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG);
            // Handle the change in php_open_basedir
            $data['new']['php_open_basedir'] = str_replace($data['old']['document_root'],$data['new']['document_root'],$data['old']['php_open_basedir']);
            //* Change the owner of the website files to the new website owner
            exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir);
            //* Change the home directory and group of the website user
            $command = 'usermod';
            $command .= ' --home '.escapeshellcmd($data['new']['document_root']);
            $command .= ' --gid '.escapeshellcmd($data['new']['system_group']);
            $command .= ' '.escapeshellcmd($data['new']['system_user']);
            exec($command);
            if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
        }
        //print_r($data);
        // Check if the directories are there and create them if necessary.
        if(!is_dir($data['new']['document_root'].'/web')) exec('mkdir -p '.$data['new']['document_root'].'/web');
        if(!is_dir($data['new']['document_root'].'/web/error') and $data['new']['errordocs']) exec('mkdir -p '.$data['new']['document_root'].'/web/error');
        //if(!is_dir($data['new']['document_root'].'/log')) exec('mkdir -p '.$data['new']['document_root'].'/log');
        if(!is_dir($data['new']['document_root'].'/ssl')) exec('mkdir -p '.$data['new']['document_root'].'/ssl');
        if(!is_dir($data['new']['document_root'].'/cgi-bin')) exec('mkdir -p '.$data['new']['document_root'].'/cgi-bin');
        if(!is_dir($data['new']['document_root'].'/tmp')) exec('mkdir -p '.$data['new']['document_root'].'/tmp');
        // Remove the symlink for the site, if site is renamed
        if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
            if(is_dir('/var/log/ispconfig/httpd/'.$data['old']['domain'])) exec('rm -rf /var/log/ispconfig/httpd/'.$data['old']['domain']);
            if(is_link($data['old']['document_root'].'/log')) unlink($data['old']['document_root'].'/log');
        }
        // Create the symlink for the logfiles
        if(!is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data['new']['domain']);
        if(!is_link($data['new']['document_root'].'/log')) {
            exec('ln -s /var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/log');
            $app->log('Creating symlink: ln -s /var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/log',LOGLEVEL_DEBUG);
        }
        /*
        // Create the symlink for the logfiles
        // This does not work as vlogger cannot log trough symlinks.
        if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
            if(is_dir($data['old']['document_root'].'/log')) exec('rm -rf '.$data['old']['document_root'].'/log');
            if(is_link('/var/log/ispconfig/httpd/'.$data['old']['domain'])) unlink('/var/log/ispconfig/httpd/'.$data['old']['domain']);
        }
        // Create the symlink for the logfiles
        if(!is_dir($data['new']['document_root'].'/log')) exec('mkdir -p '.$data['new']['document_root'].'/log');
        if(!is_link('/var/log/ispconfig/httpd/'.$data['new']['domain'])) {
            exec('ln -s '.$data['new']['document_root'].'/log /var/log/ispconfig/httpd/'.$data['new']['domain']);
            $app->log('Creating symlink: ln -s '.$data['new']['document_root'].'/log /var/log/ispconfig/httpd/'.$data['new']['domain'],LOGLEVEL_DEBUG);
        }
        */
        // Get the client ID
        $client = $app->dbmaster->queryOneRecord('SELECT client_id FROM sys_group WHERE sys_group.groupid = '.intval($data['new']['sys_groupid']));
        $client_id = intval($client['client_id']);
        unset($client);
        // Remove old symlinks, if site is renamed
        if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
            $tmp_symlinks_array = explode(':',$web_config['website_symlinks']);
            if(is_array($tmp_symlinks_array)) {
                foreach($tmp_symlinks_array as $tmp_symlink) {
                    $tmp_symlink = str_replace('[client_id]',$client_id,$tmp_symlink);
                    $tmp_symlink = str_replace('[website_domain]',$data['old']['domain'],$tmp_symlink);
                    // Remove trailing slash
                    if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
                    // remove the symlinks, if not exist
                    if(is_link($tmp_symlink)) {
                        exec('rm -f '.escapeshellcmd($tmp_symlink));
                        $app->log('Removed symlink: rm -f '.$tmp_symlink,LOGLEVEL_DEBUG);
                    }
                }
            }
        }
        // Create the symlinks for the sites
        $tmp_symlinks_array = explode(':',$web_config['website_symlinks']);
        if(is_array($tmp_symlinks_array)) {
            foreach($tmp_symlinks_array as $tmp_symlink) {
                $tmp_symlink = str_replace('[client_id]',$client_id,$tmp_symlink);
                $tmp_symlink = str_replace('[website_domain]',$data['new']['domain'],$tmp_symlink);
                // Remove trailing slash
                if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
                //* Remove symlink if target folder has been changed.
                if($data['old']['document_root'] != '' && $data['old']['document_root'] != $data['new']['document_root'] && is_link($tmp_symlink)) {
                    unlink($tmp_symlink);
                }
                // create the symlinks, if not exist
                if(!is_link($tmp_symlink)) {
                    exec('ln -s '.escapeshellcmd($data['new']['document_root']).'/ '.escapeshellcmd($tmp_symlink));
                    $app->log('Creating symlink: ln -s '.$data['new']['document_root'].'/ '.$tmp_symlink,LOGLEVEL_DEBUG);
                }
            }
        }
        // Install the Standard or Custom Error, Index and other related files
        // /usr/local/ispconfig/server/conf is for the standard files
        // /usr/local/ispconfig/server/conf-custom is for the custom files
        // setting a local var here
        // normally $conf['templates'] = "/usr/local/ispconfig/server/conf";
        if($this->action == 'insert' && $data['new']['type'] == 'vhost') {
            // Copy the error pages
            if($data['new']['errordocs']) {
                $error_page_path = escapeshellcmd($data['new']['document_root']).'/web/error/';
                if (file_exists($conf['templates'] . '-custom/error/'.substr(escapeshellcmd($conf['language']),0,2))) {
                    exec('cp ' . $conf['templates'] . '-custom/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path);
                }
                else {
                    if (file_exists($conf['templates'] . '-custom/error/400.html')) {
                        exec('cp '. $conf['templates'] .'-custom/error/*.html '.$error_page_path);
                    }
                    else {
                        exec('cp ' . $conf['templates'] . '/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path);
                    }
                }
                exec('chmod -R a+r '.$error_page_path);
            }
            if (file_exists($conf['templates'] . '-custom/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2))) {
                exec('cp ' . $conf['templates'] . '-custom/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2).' '.escapeshellcmd($data['new']['document_root']).'/web/index.html');
            if(is_file($conf['templates'] . '-custom/index/favicon.ico')) {
                exec('cp ' . $conf['templates'] . '-custom/index/favicon.ico '.escapeshellcmd($data['new']['document_root']).'/web/');
            }
            if(is_file($conf['templates'] . '-custom/index/robots.txt')) {
                exec('cp ' . $conf['templates'] . '-custom/index/robots.txt '.escapeshellcmd($data['new']['document_root']).'/web/');
                }
                if(is_file($conf['templates'] . '-custom/index/.htaccess')) {
                    exec('cp ' . $conf['templates'] . '-custom/index/.htaccess '.escapeshellcmd($data['new']['document_root']).'/web/');
                }
            }
            else {
                if (file_exists($conf['templates'] . '-custom/index/standard_index.html')) {
                    exec('cp ' . $conf['templates'] . '-custom/index/standard_index.html '.escapeshellcmd($data['new']['document_root']).'/web/index.html');
                }
                else {
                    exec('cp ' . $conf['templates'] . '/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2).' '.escapeshellcmd($data['new']['document_root']).'/web/index.html');
                    if(is_file($conf['templates'] . '/index/favicon.ico')) exec('cp ' . $conf['templates'] . '/index/favicon.ico '.escapeshellcmd($data['new']['document_root']).'/web/');
                    if(is_file($conf['templates'] . '/index/robots.txt')) exec('cp ' . $conf['templates'] . '/index/robots.txt '.escapeshellcmd($data['new']['document_root']).'/web/');
                    if(is_file($conf['templates'] . '/index/.htaccess')) exec('cp ' . $conf['templates'] . '/index/.htaccess '.escapeshellcmd($data['new']['document_root']).'/web/');
                }
            }
            exec('chmod -R a+r '.escapeshellcmd($data['new']['document_root']).'/web/');
            //** Copy the error documents on update when the error document checkbox has been activated and was deactivated before
        } elseif ($this->action == 'update' && $data['new']['type'] == 'vhost' && $data['old']['errordocs'] == 0 && $data['new']['errordocs'] == 1) {
            $error_page_path = escapeshellcmd($data['new']['document_root']).'/web/error/';
            if (file_exists($conf['templates'] . '-custom/error/'.substr(escapeshellcmd($conf['language']),0,2))) {
                exec('cp ' . $conf['templates'] . '-custom/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path);
            }
            else {
                if (file_exists($conf['templates'] . '-custom/error/400.html')) {
                    exec('cp ' . $conf['templates'] . '-custom/error/*.html '.$error_page_path);
                }
                else {
                    exec('cp ' . $conf['templates'] . '/error/'.substr(escapeshellcmd($conf['language']),0,2).'/* '.$error_page_path);
                }
            }
            exec('chmod -R a+r '.$error_page_path);
            exec('chown -R '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.$error_page_path);
        }  // end copy error docs
        // Create group and user, if not exist
        $app->uses('system');
        $groupname = escapeshellcmd($data['new']['system_group']);
        if($data['new']['system_group'] != '' && !$app->system->is_group($data['new']['system_group'])) {
            exec('groupadd '.$groupname);
            if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' groupadd '.$groupname);
            $app->log('Adding the group: '.$groupname,LOGLEVEL_DEBUG);
        }
        $username = escapeshellcmd($data['new']['system_user']);
        if($data['new']['system_user'] != '' && !$app->system->is_user($data['new']['system_user'])) {
            exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname -G sshusers $username -s /bin/false");
            if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname -G sshusers $username -s /bin/false");
            $app->log('Adding the user: '.$username,LOGLEVEL_DEBUG);
        }
        // Set the quota for the user
        if($username != '' && $app->system->is_user($username)) {
            if($data['new']['hd_quota'] > 0) {
                $blocks_soft = $data['new']['hd_quota'] * 1024;
                $blocks_hard = $blocks_soft + 1024;
            } else {
                $blocks_soft = $blocks_hard = 0;
            }
            exec("setquota -u $username $blocks_soft $blocks_hard 0 0 -a &> /dev/null");
            exec('setquota -T -u '.$username.' 604800 604800 -a &> /dev/null');
        }
        if($this->action == 'insert' || $data["new"]["system_user"] != $data["old"]["system_user"]) {
            // Chown and chmod the directories below the document root
            $this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
            // The document root itself has to be owned by root in normal level and by the web owner in security level 20
            if($web_config['security_level'] == 20) {
                $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
            } else {
                $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
            }
        }
        //* If the security level is set to high
        if($web_config['security_level'] == 20) {
            $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']));
            $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']).'/*');
            $this->_exec('chmod 710 '.escapeshellcmd($data['new']['document_root'].'/web'));
            // make tmp directory writable for nginx and the website users
            $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
            // Set Log symlink to 755 to make the logs accessible by the FTP user
            $this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"])."/log");
            $command = 'usermod';
            $command .= ' --groups sshusers';
            $command .= ' '.escapeshellcmd($data['new']['system_user']);
            $this->_exec($command);
            //* if we have a chrooted nginx environment
            if($nginx_chrooted) {
                $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
                //* add the nginx user to the client group in the chroot environment
                $tmp_groupfile = $app->system->server_conf['group_datei'];
                $app->system->server_conf['group_datei'] = $web_config['website_basedir'].'/etc/group';
                $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
                $app->system->server_conf['group_datei'] = $tmp_groupfile;
                unset($tmp_groupfile);
            }
            //* add the nginx user to the client group
            $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
            $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));
            /*
            * Workaround for jailkit: If jailkit is enabled for the site, the
            * website root has to be owned by the root user and we have to chmod it to 755 then
            */
            //* Check if there is a jailkit user for this site
            $tmp = $app->db->queryOneRecord('SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = '.$data['new']['domain_id']." AND chroot = 'jailkit'");
            if($tmp['number'] > 0) {
                $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
                $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
            }
            unset($tmp);
            // If the security Level is set to medium
        } else {
            $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root']));
            $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/*'));
            $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']));
            // make temp directory writable for nginx and the website users
            $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp'));
        }
        // Change the ownership of the error log to the owner of the website
        if(!@is_file($data['new']['document_root'].'/log/error.log')) exec('touch '.escapeshellcmd($data['new']['document_root']).'/log/error.log');
        $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']).'/log/error.log');
        /*
        //* Write the custom php.ini file, if custom_php_ini filed is not empty
        $custom_php_ini_dir = $web_config['website_basedir'].'/conf/'.$data['new']['system_user'];
        if(!is_dir($web_config['website_basedir'].'/conf')) mkdir($web_config['website_basedir'].'/conf');
        if(trim($data['new']['custom_php_ini']) != '') {
            $has_custom_php_ini = true;
            if(!is_dir($custom_php_ini_dir)) mkdir($custom_php_ini_dir);
            $php_ini_content = '';
            if($data['new']['php'] == 'mod') {
                $master_php_ini_path = $web_config['php_ini_path_apache'];
            } else {
                if($data["new"]['php'] == 'fast-cgi' && file_exists($fastcgi_config["fastcgi_phpini_path"])) {
                    $master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"];
                } else {
                    $master_php_ini_path = $web_config['php_ini_path_cgi'];
                }
            }
            if($master_php_ini_path != '' && substr($master_php_ini_path,-7) == 'php.ini' && is_file($master_php_ini_path)) {
                $php_ini_content .= file_get_contents($master_php_ini_path)."\n";
            }
            $php_ini_content .= trim($data['new']['custom_php_ini']);
            file_put_contents($custom_php_ini_dir.'/php.ini',$php_ini_content);
        } else {
            $has_custom_php_ini = false;
            if(is_file($custom_php_ini_dir.'/php.ini')) unlink($custom_php_ini_dir.'/php.ini');
        }
        */
        //* Create the vhost config file
        $app->load('tpl');
@@ -101,36 +635,67 @@
        $tpl->newTemplate('nginx_vhost.conf.master');
        $vhost_data = $data['new'];
        $vhost_data['config_dir'] = $config['nginx']['config_dir'];
        $vhost_data['web_document_root'] = $data['new']['document_root'].'/web';
        $vhost_data['web_document_root_www'] = $web_config['website_basedir'].'/'.$data['new']['domain'].'/web';
        $vhost_data['web_basedir'] = $web_config['website_basedir'];
        $vhost_data['security_level'] = $web_config['security_level'];
        $vhost_data['allow_override'] = ($data['new']['allow_override'] == '')?'All':$data['new']['allow_override'];
        //$vhost_data['php_open_basedir'] = ($data['new']['php_open_basedir'] == '')?$data['new']['document_root']:$data['new']['php_open_basedir'];
        $vhost_data['ssl_domain'] = $data['new']['ssl_domain'];
        //$vhost_data['has_custom_php_ini'] = $has_custom_php_ini;
        //$vhost_data['custom_php_ini_dir'] = escapeshellcmd($custom_php_ini_dir);
        // Check if a SSL cert exists
        $ssl_dir = $config['nginx']['config_dir'].'/ssl';
        $ssl_dir = $data['new']['document_root'].'/ssl';
        $domain = $data['new']['ssl_domain'];
        $key_file = $ssl_dir.'/'.$domain.'.key';
        $crt_file = $ssl_dir.'/'.$domain.'.crt';
        $bundle_file = $ssl_dir.'/'.$domain.'.bundle';
        //$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
        $vhost_data['nginx_directives'] = preg_replace("/\[IP\]/", $vhost_data['ip_address'], $vhost_data['nginx_directives']);
        if($data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file)) {
        if($domain!='' && $data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file) && (@filesize($crt_file)>0)  && (@filesize($key_file)>0)) {
            $vhost_data['ssl_enabled'] = 1;
            $app->log('Enable SSL for: '.$domain,LOGLEVEL_DEBUG);
        } else {
            $vhost_data['ssl_enabled'] = 0;
            $app->log('Disable SSL for: '.$domain,LOGLEVEL_DEBUG);
            $app->log('SSL Disabled. '.$domain,LOGLEVEL_DEBUG);
        }
        if(@is_file($bundle_file)) $vhost_data['has_bundle_cert'] = 1;
        //if(@is_file($bundle_file)) $vhost_data['has_bundle_cert'] = 1;
        //$vhost_data['document_root'] = $data['new']['document_root'].'/web';
        $tpl->setVar($vhost_data);
        // Rewrite rules
        $rewrite_rules = array();
        if($data['new']['redirect_type'] != '') {
            if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
            /* Disabled path extension
            if($data['new']['redirect_type'] == 'no' && substr($data['new']['redirect_path'],0,4) != 'http') {
                $data['new']['redirect_path'] = $data['new']['document_root'].'/web'.realpath($data['new']['redirect_path']).'/';
            }
            */
            $rewrite_rules[] = array(    'rewrite_domain'     => $data['new']['domain'],
                    'rewrite_type'         => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
                    'rewrite_target'     => $data['new']['redirect_path']);
            switch($data['new']['subdomain']) {
                case 'www':
                    $rewrite_rules[] = array(    'rewrite_domain'     => 'www.'.$data['new']['domain'],
                            'rewrite_type'         => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
                            'rewrite_target'     => $data['new']['redirect_path']);
                    break;
                case '*':
                // TODO
                //$rewrite_rules[] = array(    'rewrite_domain'     => '*'.$alias['domain'],
                //                            'rewrite_type'         => $alias['redirect_type'],
                //                            'rewrite_target'     => $alias['redirect_path']);
                    break;
            }
        }
        // get alias domains (co-domains and subdomains)
        $aliases = $app->dbmaster->queryAllRecords('SELECT * FROM web_domain WHERE parent_domain_id = '.$data['new']['domain_id']." AND active = 'y'");
        $aliases = $app->db->queryAllRecords('SELECT * FROM web_domain WHERE parent_domain_id = '.$data['new']['domain_id']." AND active = 'y'");
        $server_alias = array();
        switch($data['new']['subdomain']) {
            case 'www':
@@ -154,7 +719,31 @@
                        break;
                }
                $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
                // Rewriting
                if($alias['redirect_type'] != '') {
                    if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
                    /* Disabled the path extension
                    if($data['new']['redirect_type'] == 'no' && substr($data['new']['redirect_path'],0,4) != 'http') {
                        $data['new']['redirect_path'] = $data['new']['document_root'].'/web'.realpath($data['new']['redirect_path']).'/';
                    }
                    */
                    $rewrite_rules[] = array(    'rewrite_domain'     => $alias['domain'],
                            'rewrite_type'         => ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
                            'rewrite_target'     => $alias['redirect_path']);
                    switch($alias['subdomain']) {
                        case 'www':
                            $rewrite_rules[] = array(    'rewrite_domain'     => 'www.'.$alias['domain'],
                                    'rewrite_type'         => ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
                                    'rewrite_target'     => $alias['redirect_path']);
                            break;
                        case '*':
                        // TODO
                        //$rewrite_rules[] = array(    'rewrite_domain'     => '*'.$alias['domain'],
                        //                            'rewrite_type'         => $alias['redirect_type'],
                        //                            'rewrite_target'     => $alias['redirect_path']);
                            break;
                    }
                }
            }
        }
@@ -163,9 +752,7 @@
            $server_alias_str = '';
            $n = 0;
            // begin a new ServerAlias line after 30 alias domains
            foreach($server_alias as $tmp_alias) {
                if($n % 30 == 0) $server_alias_str .= " ";
                $server_alias_str .= $tmp_alias;
            }
            unset($tmp_alias);
@@ -174,48 +761,117 @@
        } else {
            $tpl->setVar('alias','');
        }
        $vhost_file = escapeshellcmd($nginx_config['vhost_conf_dir'].'/'.$data['new']['domain'].'.vhost');
        if(count($rewrite_rules) > 0) {
            $tpl->setVar('rewrite_enabled',1);
        } else {
            $tpl->setVar('rewrite_enabled',0);
        }
        $tpl->setLoop('redirects',$rewrite_rules);
        //* Create basic http auth for website statistics
        $tpl->setVar('stats_auth_passwd_file', $data['new']['document_root']."/.htpasswd_stats");
        $vhost_file = escapeshellcmd($web_config['nginx_vhost_conf_dir'].'/'.$data['new']['domain'].'.vhost');
        //* Make a backup copy of vhost file
        copy($vhost_file,$vhost_file.'~');
        if(file_exists($vhost_file)) copy($vhost_file,$vhost_file.'~');
        
        //* Write vhost file
        file_put_contents($vhost_file,$tpl->grab());
        $app->log('Writing the vhost file: '.$vhost_file,LOGLEVEL_DEBUG);
        unset($tpl);
        // Set the symlink to enable the vhost
        $vhost_symlink = escapeshellcmd($nginx_config['vhost_conf_enabled_dir'].'/'.$data['new']['domain'].'.vhost');
        //* Set the symlink to enable the vhost
        //* First we check if there is a old type of symlink and remove it
        $vhost_symlink = escapeshellcmd($web_config['nginx_vhost_conf_enabled_dir'].'/'.$data['new']['domain'].'.vhost');
        if(is_link($vhost_symlink)) unlink($vhost_symlink);
        //* Remove old or changed symlinks
        if($data['new']['subdomain'] != $data['old']['subdomain'] or $data['new']['active'] == 'n') {
            $vhost_symlink = escapeshellcmd($web_config['nginx_vhost_conf_enabled_dir'].'/900-'.$data['new']['domain'].'.vhost');
            if(is_link($vhost_symlink)) {
                unlink($vhost_symlink);
                $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
            }
            $vhost_symlink = escapeshellcmd($web_config['nginx_vhost_conf_enabled_dir'].'/100-'.$data['new']['domain'].'.vhost');
            if(is_link($vhost_symlink)) {
                unlink($vhost_symlink);
                $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
            }
        }
        //* New symlink
        if($data['new']['subdomain'] == '*') {
            $vhost_symlink = escapeshellcmd($web_config['nginx_vhost_conf_enabled_dir'].'/900-'.$data['new']['domain'].'.vhost');
        } else {
            $vhost_symlink = escapeshellcmd($web_config['nginx_vhost_conf_enabled_dir'].'/100-'.$data['new']['domain'].'.vhost');
        }
        if($data['new']['active'] == 'y' && !is_link($vhost_symlink)) {
            symlink($vhost_file,$vhost_symlink);
            $app->log('Creating symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
        }
        // Remove the symlink, if site is inactive
        if($data['new']['active'] == 'n' && is_link($vhost_symlink)) {
            unlink($vhost_symlink);
            $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
        }
        if(!is_dir('/var/log/ispconfig/nginx/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/nginx/'.$data['new']['domain']);
        // remove old symlink and vhost file, if domain name of the site has changed
        if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
            $vhost_symlink = escapeshellcmd($nginx_config['vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
            unlink($vhost_symlink);
            $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
            $vhost_file = escapeshellcmd($nginx_config['vhost_conf_dir'].'/'.$data['old']['domain'].'.vhost');
            $vhost_symlink = escapeshellcmd($web_config['nginx_vhost_conf_enabled_dir'].'/900-'.$data['old']['domain'].'.vhost');
            if(is_link($vhost_symlink)) {
                unlink($vhost_symlink);
                $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
            }
            $vhost_symlink = escapeshellcmd($web_config['nginx_vhost_conf_enabled_dir'].'/100-'.$data['old']['domain'].'.vhost');
            if(is_link($vhost_symlink)) {
                unlink($vhost_symlink);
                $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
            }
            $vhost_file = escapeshellcmd($web_config['nginx_vhost_conf_dir'].'/'.$data['old']['domain'].'.vhost');
            unlink($vhost_file);
            $app->log('Removing file: '.$vhost_file,LOGLEVEL_DEBUG);
            if(is_dir('/var/log/ispconfig/nginx/'.$data['old']['domain'])) exec('rm -rf /var/log/ispconfig/nginx/'.$data['old']['domain']);
        }
        
        // request a httpd reload when all records have been processed
        $app->services->restartServiceDelayed('nginx','restart');
        // create password file for stats directory
        if(!is_file($data['new']['document_root'].'/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
            if(trim($data['new']['stats_password']) != '') {
                $htp_file = 'admin:'.trim($data['new']['stats_password']);
                file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file);
                chmod($data['new']['document_root'].'/.htpasswd_stats',0755);
                unset($htp_file);
            }
        }
        //* Create awstats configuration
        if($data['new']['stats_type'] == 'awstats' && $data['new']['type'] == 'vhost') {
            $this->awstats_update($data,$web_config);
        }
        if($web_config['check_apache_config'] == 'y') {
            //* Test if nginx starts with the new configuration file
            $nginx_online_status_before_restart = $this->_checkTcp('localhost',80);
            $app->log('nginx status is: '.$nginx_online_status_before_restart,LOGLEVEL_DEBUG);
            $app->services->restartService('httpd','restart');
            
            // wait a few seconds, before we test the apache status again
            sleep(2);
            //* Check if nginx restarted successfully if it was online before
            $nginx_online_status_after_restart = $this->_checkTcp('localhost',80);
            $app->log('nginx online status after restart is: '.$nginx_online_status_after_restart,LOGLEVEL_DEBUG);
            if($nginx_online_status_before_restart && !$nginx_online_status_after_restart) {
                $app->log('nginx did not restart after the configuration change for website '.$data['new']['domain'].' Reverting the configuration. Saved non-working config as '.$vhost_file.'.err',LOGLEVEL_WARN);
                copy($vhost_file,$vhost_file.'.err');
                copy($vhost_file.'~',$vhost_file);
                $app->services->restartService('httpd','restart');
            }
        } else {
            //* We do not check the nginx config after changes (is faster)
            if($nginx_chrooted) {
                $app->services->restartServiceDelayed('httpd','reload');
            } else {
                // request a httpd reload when all records have been processed
                $app->services->restartServiceDelayed('httpd','reload');
            }
        }
        // Remove the backup copy of the config file.
        if(@is_file($vhost_file.'~')) unlink($vhost_file.'~');
        
@@ -224,84 +880,186 @@
        $this->action = '';
    }
    // Handle the creation of SSL certificates
    function ssl($event_name,$data) {
        global $app, $conf;
        if(!is_dir($conf['nginx']['config_dir'].'/ssl')) exec('mkdir -p '.$conf['nginx']['config_dir'].'/ssl');
        $ssl_dir = $conf['nginx']['config_dir'].'/ssl';
        $domain = $data['new']['ssl_domain'];
        $key_file = $ssl_dir.'/'.$domain.'.key.org';
        $key_file2 = $ssl_dir.'/'.$domain.'.key';
        $csr_file = $ssl_dir.'/'.$domain.'.csr';
        $crt_file = $ssl_dir.'/'.$domain.'.crt';
        //* Save a SSL certificate to disk
        if($data["new"]["ssl_action"] == 'save') {
            $web = $app->masterdb->queryOneRecord("select wd.document_root, sp.ip_address from web_domain wd INNER JOIN server_ip sp USING(server_id) WHERE domain = '".$data['new']['domain']."'");
            $src_ssl_dir = $web["document_root"]."/ssl";
            //$domain = $data["new"]["ssl_domain"];
            //$csr_file = $ssl_dir.'/'.$domain.".csr";
            //$crt_file = $ssl_dir.'/'.$domain.".crt";
            //$bundle_file = $ssl_dir.'/'.$domain.".bundle";
            $this->_exec('rsync -v -e ssh root@'.$web['ip_address'].':~/$src_ssl_dir '.$ssl_dir);
            $app->log('Syncing SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
        }
        //* Delete a SSL certificate
        if($data['new']['ssl_action'] == 'del') {
            //$ssl_dir = $data['new']['document_root'].'/ssl';
            $domain = $data['new']['ssl_domain'];
            $csr_file = $ssl_dir.'/'.$domain.'.csr';
            $crt_file = $ssl_dir.'/'.$domain.'.crt';
            $bundle_file = $ssl_dir.'/'.$domain.'.bundle';
            unlink($csr_file);
            unlink($crt_file);
            unlink($bundle_file);
            $app->log('Deleting SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
        }
    }
    function delete($event_name,$data) {
        global $app, $conf;
        // load the server configuration options
        $app->uses('getconf');
        $nginx_config = $app->getconf->get_server_config($conf['server_id'], 'nginx');
        $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
        //* Check if this is a chrooted setup
        if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) {
            $apache_chrooted = true;
        } else {
            $apache_chrooted = false;
        }
        if($data['old']['type'] == 'vhost') {
        if($data['old']['type'] != 'vhost' && $data['old']['parent_domain_id'] > 0) {
            //* This is a alias domain or subdomain, so we have to update the website instead
            $parent_domain_id = intval($data['old']['parent_domain_id']);
            $tmp = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$parent_domain_id." AND active = 'y'");
            $data['new'] = $tmp;
            $data['old'] = $tmp;
            $this->action = 'update';
            // just run the update function
            $this->update($event_name,$data);
        } else {
            //* This is a website
            // Deleting the vhost file, symlink and the data directory
            $vhost_symlink = escapeshellcmd($nginx_config['vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
            $vhost_symlink = escapeshellcmd($web_config['nginx_vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
            unlink($vhost_symlink);
            $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
            $vhost_file = escapeshellcmd($nginx_config['vhost_conf_dir'].'/'.$data['old']['domain'].'.vhost');
            $vhost_file = escapeshellcmd($web_config['nginx_vhost_conf_dir'].'/'.$data['old']['domain'].'.vhost');
            unlink($vhost_file);
            $app->log('Removing vhost file: '.$vhost_file,LOGLEVEL_DEBUG);
            $docroot = escapeshellcmd($data['old']['document_root']);
            if($docroot != '' && !stristr($docroot,'..')) exec('rm -rf '.$docroot);
            //remove the php fastgi starter script if available
            if ($data['old']['php'] == 'fast-cgi') {
                $fastcgi_starter_path = str_replace('[system_user]',$data['old']['system_user'],$web_config['fastcgi_starter_path']);
                if (is_dir($fastcgi_starter_path)) {
                    exec('rm -rf '.$fastcgi_starter_path);
                }
            }
            //remove the php cgi starter script if available
            if ($data['old']['php'] == 'cgi') {
                // TODO: fetch the date from the server-settings
                $web_config['cgi_starter_path'] = $web_config['website_basedir'].'/php-cgi-scripts/[system_user]/';
                $cgi_starter_path = str_replace('[system_user]',$data['old']['system_user'],$web_config['cgi_starter_path']);
                if (is_dir($cgi_starter_path)) {
                    exec('rm -rf '.$cgi_starter_path);
                }
            }
            $app->log('Removing website: '.$docroot,LOGLEVEL_DEBUG);
            // Delete the symlinks for the sites
            $client = $app->db->queryOneRecord('SELECT client_id FROM sys_group WHERE sys_group.groupid = '.intval($data['old']['sys_groupid']));
            $client_id = intval($client['client_id']);
            unset($client);
            $tmp_symlinks_array = explode(':',$web_config['website_symlinks']);
            if(is_array($tmp_symlinks_array)) {
                foreach($tmp_symlinks_array as $tmp_symlink) {
                    $tmp_symlink = str_replace('[client_id]',$client_id,$tmp_symlink);
                    $tmp_symlink = str_replace('[website_domain]',$data['old']['domain'],$tmp_symlink);
                    // Remove trailing slash
                    if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
                    // create the symlinks, if not exist
                    if(is_link($tmp_symlink)) {
                        unlink($tmp_symlink);
                        $app->log('Removing symlink: '.$tmp_symlink,LOGLEVEL_DEBUG);
                    }
                }
            }
            // end removing symlinks
            // Delete the log file directory
            $vhost_logfile_dir = escapeshellcmd('/var/log/ispconfig/nginx/'.$data['old']['domain']);
            $vhost_logfile_dir = escapeshellcmd('/var/log/ispconfig/httpd/'.$data['old']['domain']);
            if($data['old']['domain'] != '' && !stristr($vhost_logfile_dir,'..')) exec('rm -rf '.$vhost_logfile_dir);
            $app->log('Removing website logfile directory: '.$vhost_logfile_dir,LOGLEVEL_DEBUG);
            //delete the web user
            $command = 'userdel';
            $command .= ' '.$data['old']['system_user'];
            exec($command);
            if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
            //* Remove the awstats configuration file
            if($data['old']['stats_type'] == 'awstats') {
                $this->awstats_delete($data,$web_config);
            }
        }
    }
    //* This function is called when a IP on the server is inserted, updated or deleted
    function server_ip($event_name,$data) {
        global $app, $conf;
        // load the server configuration options
        $app->uses('getconf');
        $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
        $app->load('tpl');
        $tpl = new tpl();
        $tpl->newTemplate('apache_ispconfig.conf.master');
        $records = $app->db->queryAllRecords('SELECT * FROM server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
        if(count($records) > 0) {
            $tpl->setLoop('ip_adresses',$records);
        }
        $vhost_file = escapeshellcmd($web_config['nginx_vhost_conf_dir'].'/ispconfig.conf');
        file_put_contents($vhost_file,$tpl->grab());
        $app->log('Writing the conf file: '.$vhost_file,LOGLEVEL_DEBUG);
        unset($tpl);
    }
    //* Update the awstats configuration file
    private function awstats_update ($data,$web_config) {
        global $app;
        $awstats_conf_dir = $web_config['awstats_conf_dir'];
        if(!@is_file($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf') || ($data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain'])) {
            if ( @is_file($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf') ) {
                unlink($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf');
            }
            $content = '';
            $content .= "Include \"".$awstats_conf_dir."/awstats.conf\"\n";
            $content .= "LogFile=\"/var/log/ispconfig/httpd/".$data['new']['domain']."/access.log\"\n";
            $content .= "SiteDomain=\"".$data['new']['domain']."\"\n";
            $content .= "HostAliases=\"www.".$data['new']['domain']."  localhost 127.0.0.1\"\n";
            file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf',$content);
            $app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf',LOGLEVEL_DEBUG);
        }
    }
    
    //* Delete the awstats configuration file
    private function awstats_delete ($data,$web_config) {
        global $app;
        $awstats_conf_dir = $web_config['awstats_conf_dir'];
        if ( @is_file($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf') ) {
            unlink($awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf');
            $app->log('Removed AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf',LOGLEVEL_DEBUG);
        }
    }
    function client_delete($event_name,$data) {
        global $app, $conf;
        $app->uses("getconf");
        $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
        $client_id = intval($data['old']['client_id']);
        if($client_id > 0) {
            $client_dir = $web_config['website_basedir'].'/clients/client'.$client_id;
            if(is_dir($client_dir) && !stristr($client_dir,'..')) {
                @rmdir($client_dir);
                $app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG);
            }
            $this->_exec('groupdel client'.$client_id);
            $app->log('Removed group client'.$client_id,LOGLEVEL_DEBUG);
        }
    }
    //* Wrapper for exec function for easier debugging
    private function _exec($command) {
        global $app;
@@ -309,60 +1067,19 @@
        exec($command);
    }
    
    function rewrite_insert($event_name,$data) {
        global $app, $conf;
    private function _checkTcp ($host,$port) {
        // just run the update function
        $this->update($event_name,$data);
    }
    function rewrite_update($event_name,$data) {
        global $app, $conf;
        $rules = $this->_getRewriteRules($app);
        $app->uses('getconf');
        $nginx_config = $app->getconf->get_server_config($conf['server_id'], 'nginx');
        $app->load('tpl');
        $tpl = new tpl();
        $tpl->newTemplate("nginx-rewrites.conf.master");
        if (!empty($rules))$tpl->setLoop('nginx_rewrite_rules',$rules);
        $rewrites_file = escapeshellcmd($nginx_config['vhost_conf_dir'].'/default.rewrites.conf');
        //* Make a backup copy of vhost file
        copy($rewrites_file,$rewrites_file.'~');
        //* Write vhost file
        file_put_contents($rewrites_file,$tpl->grab());
        $app->log('Writing the nginx rewrites file: '.$rewrites_file,LOGLEVEL_DEBUG);
        unset($tpl);
        $fp = @fsockopen ($host, $port, $errno, $errstr, 2);
        if ($fp) {
            fclose($fp);
            return true;
        } else {
            return false;
        }
    }
        // Set the symlink to enable the vhost
        $rewrite_symlink = escapeshellcmd($nginx_config['vhost_conf_enabled_dir'].'/default.rewrites.conf');
        if(!is_link($rewrite_symlink)) {
            symlink($rewrites_file,$rewrite_symlink);
            $app->log('Creating symlink for nginx rewrites: '.$rewrite_symlink.'->'.$rewrites_file,LOGLEVEL_DEBUG);
        }
    }
    function rewrite_delete($event_name,$data) {
        global $app, $conf;
        // just run the update function
        $this->rewrite_update($event_name,$data);
    }
    function _getRewriteRules($app)
    {
        $rules = array();
        $rules = $app->db->queryAllRecords("SELECT rewrite_url_src, rewrite_url_dst FROM proxy_reverse ORDER BY rewrite_id ASC");
        return $rules;
    }
} // end class
?>
?>
server/plugins-available/nginx_reverseproxy_plugin.inc.php
New file
@@ -0,0 +1,368 @@
<?php
class nginx_reverseproxy_plugin {
    var $plugin_name = 'nginx_reverseproxy_plugin';
    var $class_name = 'nginx_reverseproxy_plugin';
    // private variables
    var $action = '';
    //* This function is called during ispconfig installation to determine
    //  if a symlink shall be created for this plugin.
    function onInstall() {
        global $conf;
        if($conf['services']['proxy'] == true && $conf['nginx']['installed'] == true) {
            return true;
        } else {
            return false;
        }
    }
    /*
         This function is called when the plugin is loaded
    */
    function onLoad() {
        global $app;
        /*
        Register for the events
        */
        $app->plugins->registerEvent('web_domain_insert',$this->plugin_name,'ssl');
        $app->plugins->registerEvent('web_domain_update',$this->plugin_name,'ssl');
        $app->plugins->registerEvent('web_domain_delete',$this->plugin_name,'ssl');
        $app->plugins->registerEvent('web_domain_insert',$this->plugin_name,'insert');
        $app->plugins->registerEvent('web_domain_update',$this->plugin_name,'update');
        $app->plugins->registerEvent('web_domain_delete',$this->plugin_name,'delete');
    //    $app->plugins->registerEvent('proxy_reverse_insert',$this->plugin_name,'rewrite_insert');
    //    $app->plugins->registerEvent('proxy_reverse_update',$this->plugin_name,'rewrite_update');
    //    $app->plugins->registerEvent('proxy_reverse_delete',$this->plugin_name,'rewrite_delete');
    }
    function insert($event_name,$data) {
        global $app, $conf;
        // just run the update function
        $this->update($event_name,$data);
    }
    function update($event_name,$data) {
        global $app, $conf;
        if($this->action != 'insert') $this->action = 'update';
        if($data['new']['type'] != 'vhost' && $data['new']['parent_domain_id'] > 0) {
            $old_parent_domain_id = intval($data['old']['parent_domain_id']);
            $new_parent_domain_id = intval($data['new']['parent_domain_id']);
            // If the parent_domain_id has been chenged, we will have to update the old site as well.
            if($this->action == 'update' && $data['new']['parent_domain_id'] != $data['old']['parent_domain_id']) {
                $tmp = $app->dbmaster->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$old_parent_domain_id." AND active = 'y'");
                $data['new'] = $tmp;
                $data['old'] = $tmp;
                $this->action = 'update';
                $this->update($event_name,$data);
            }
            // This is not a vhost, so we need to update the parent record instead.
            $tmp = $app->dbmaster->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$new_parent_domain_id." AND active = 'y'");
            $data['new'] = $tmp;
            $data['old'] = $tmp;
            $this->action = 'update';
        }
        // load the server configuration options
        $app->uses('getconf');
        $nginx_config = $app->getconf->get_server_config($conf['server_id'], 'nginx');
        // Create group and user, if not exist
        $app->uses('system');
        //* Create the vhost config file
        $app->load('tpl');
        $tpl = new tpl();
        $tpl->newTemplate('nginx_reverseproxy_vhost.conf.master');
        $vhost_data = $data['new'];
        $vhost_data['config_dir'] = $config['nginx']['config_dir'];
        $vhost_data['ssl_domain'] = $data['new']['ssl_domain'];
        // Check if a SSL cert exists
        $ssl_dir = $config['nginx']['config_dir'].'/ssl';
        $domain = $data['new']['ssl_domain'];
        $key_file = $ssl_dir.'/'.$domain.'.key';
        $crt_file = $ssl_dir.'/'.$domain.'.crt';
        $bundle_file = $ssl_dir.'/'.$domain.'.bundle';
        $vhost_data['nginx_directives'] = preg_replace("/\[IP\]/", $vhost_data['ip_address'], $vhost_data['nginx_directives']);
        if($data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file)) {
            $vhost_data['ssl_enabled'] = 1;
            $app->log('Enable SSL for: '.$domain,LOGLEVEL_DEBUG);
        } else {
            $vhost_data['ssl_enabled'] = 0;
            $app->log('Disable SSL for: '.$domain,LOGLEVEL_DEBUG);
        }
        if(@is_file($bundle_file)) $vhost_data['has_bundle_cert'] = 1;
        $tpl->setVar($vhost_data);
        // get alias domains (co-domains and subdomains)
        $aliases = $app->dbmaster->queryAllRecords('SELECT * FROM web_domain WHERE parent_domain_id = '.$data['new']['domain_id']." AND active = 'y'");
        $server_alias = array();
        switch($data['new']['subdomain']) {
            case 'www':
                $server_alias[] .= 'www.'.$data['new']['domain'].' ';
                break;
            case '*':
                $server_alias[] .= '*.'.$data['new']['domain'].' ';
                break;
        }
        if(is_array($aliases)) {
            foreach($aliases as $alias) {
                switch($alias['subdomain']) {
                    case 'www':
                        $server_alias[] .= 'www.'.$alias['domain'].' '.$alias['domain'].' ';
                        break;
                    case '*':
                        $server_alias[] .= '*.'.$alias['domain'].' '.$alias['domain'].' ';
                        break;
                    default:
                        $server_alias[] .= $alias['domain'].' ';
                        break;
                }
                $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
            }
        }
        //* If we have some alias records
        if(count($server_alias) > 0) {
            $server_alias_str = '';
            $n = 0;
            // begin a new ServerAlias line after 30 alias domains
            foreach($server_alias as $tmp_alias) {
                if($n % 30 == 0) $server_alias_str .= " ";
                $server_alias_str .= $tmp_alias;
            }
            unset($tmp_alias);
            $tpl->setVar('alias',trim($server_alias_str));
        } else {
            $tpl->setVar('alias','');
        }
        $vhost_file = escapeshellcmd($nginx_config['vhost_conf_dir'].'/'.$data['new']['domain'].'.vhost');
        //* Make a backup copy of vhost file
        copy($vhost_file,$vhost_file.'~');
        //* Write vhost file
        file_put_contents($vhost_file,$tpl->grab());
        $app->log('Writing the vhost file: '.$vhost_file,LOGLEVEL_DEBUG);
        unset($tpl);
        // Set the symlink to enable the vhost
        $vhost_symlink = escapeshellcmd($nginx_config['vhost_conf_enabled_dir'].'/'.$data['new']['domain'].'.vhost');
        if($data['new']['active'] == 'y' && !is_link($vhost_symlink)) {
            symlink($vhost_file,$vhost_symlink);
            $app->log('Creating symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
        }
        // Remove the symlink, if site is inactive
        if($data['new']['active'] == 'n' && is_link($vhost_symlink)) {
            unlink($vhost_symlink);
            $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
        }
        if(!is_dir('/var/log/ispconfig/nginx/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/nginx/'.$data['new']['domain']);
        // remove old symlink and vhost file, if domain name of the site has changed
        if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
            $vhost_symlink = escapeshellcmd($nginx_config['vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
            unlink($vhost_symlink);
            $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
            $vhost_file = escapeshellcmd($nginx_config['vhost_conf_dir'].'/'.$data['old']['domain'].'.vhost');
            unlink($vhost_file);
            $app->log('Removing file: '.$vhost_file,LOGLEVEL_DEBUG);
            if(is_dir('/var/log/ispconfig/nginx/'.$data['old']['domain'])) exec('rm -rf /var/log/ispconfig/nginx/'.$data['old']['domain']);
        }
        // request a httpd reload when all records have been processed
        $app->services->restartServiceDelayed('nginx','restart');
        // Remove the backup copy of the config file.
        if(@is_file($vhost_file.'~')) unlink($vhost_file.'~');
        //* Unset action to clean it for next processed vhost.
        $this->action = '';
    }
    // Handle the creation of SSL certificates
    function ssl($event_name,$data) {
        global $app, $conf;
        if(!is_dir($conf['nginx']['config_dir'].'/ssl')) exec('mkdir -p '.$conf['nginx']['config_dir'].'/ssl');
        $ssl_dir = $conf['nginx']['config_dir'].'/ssl';
        $domain = $data['new']['ssl_domain'];
        $key_file = $ssl_dir.'/'.$domain.'.key.org';
        $key_file2 = $ssl_dir.'/'.$domain.'.key';
        $csr_file = $ssl_dir.'/'.$domain.'.csr';
        $crt_file = $ssl_dir.'/'.$domain.'.crt';
        //* Save a SSL certificate to disk
        if($data["new"]["ssl_action"] == 'save') {
            $web = $app->masterdb->queryOneRecord("select wd.document_root, sp.ip_address from web_domain wd INNER JOIN server_ip sp USING(server_id) WHERE domain = '".$data['new']['domain']."'");
            $src_ssl_dir = $web["document_root"]."/ssl";
            //$domain = $data["new"]["ssl_domain"];
            //$csr_file = $ssl_dir.'/'.$domain.".csr";
            //$crt_file = $ssl_dir.'/'.$domain.".crt";
            //$bundle_file = $ssl_dir.'/'.$domain.".bundle";
            $this->_exec('rsync -v -e ssh root@'.$web['ip_address'].':~/$src_ssl_dir '.$ssl_dir);
            $app->log('Syncing SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
        }
        //* Delete a SSL certificate
        if($data['new']['ssl_action'] == 'del') {
            //$ssl_dir = $data['new']['document_root'].'/ssl';
            $domain = $data['new']['ssl_domain'];
            $csr_file = $ssl_dir.'/'.$domain.'.csr';
            $crt_file = $ssl_dir.'/'.$domain.'.crt';
            $bundle_file = $ssl_dir.'/'.$domain.'.bundle';
            unlink($csr_file);
            unlink($crt_file);
            unlink($bundle_file);
            $app->log('Deleting SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
        }
    }
    function delete($event_name,$data) {
        global $app, $conf;
        // load the server configuration options
        $app->uses('getconf');
        $nginx_config = $app->getconf->get_server_config($conf['server_id'], 'nginx');
        if($data['old']['type'] == 'vhost') {
            //* This is a website
            // Deleting the vhost file, symlink and the data directory
            $vhost_symlink = escapeshellcmd($nginx_config['vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
            unlink($vhost_symlink);
            $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
            $vhost_file = escapeshellcmd($nginx_config['vhost_conf_dir'].'/'.$data['old']['domain'].'.vhost');
            unlink($vhost_file);
            $app->log('Removing vhost file: '.$vhost_file,LOGLEVEL_DEBUG);
            // Delete the log file directory
            $vhost_logfile_dir = escapeshellcmd('/var/log/ispconfig/nginx/'.$data['old']['domain']);
            if($data['old']['domain'] != '' && !stristr($vhost_logfile_dir,'..')) exec('rm -rf '.$vhost_logfile_dir);
            $app->log('Removing website logfile directory: '.$vhost_logfile_dir,LOGLEVEL_DEBUG);
        }
    }
    //* Wrapper for exec function for easier debugging
    private function _exec($command) {
        global $app;
        $app->log('exec: '.$command,LOGLEVEL_DEBUG);
        exec($command);
    }
    function rewrite_insert($event_name,$data) {
        global $app, $conf;
        // just run the update function
        $this->update($event_name,$data);
    }
    function rewrite_update($event_name,$data) {
        global $app, $conf;
        $rules = $this->_getRewriteRules($app);
        $app->uses('getconf');
        $nginx_config = $app->getconf->get_server_config($conf['server_id'], 'nginx');
        $app->load('tpl');
        $tpl = new tpl();
        $tpl->newTemplate("nginx_reverseproxy_rewrites.conf.master");
        if (!empty($rules))$tpl->setLoop('nginx_rewrite_rules',$rules);
        $rewrites_file = escapeshellcmd($nginx_config['vhost_conf_dir'].'/default.rewrites.conf');
        //* Make a backup copy of vhost file
        copy($rewrites_file,$rewrites_file.'~');
        //* Write vhost file
        file_put_contents($rewrites_file,$tpl->grab());
        $app->log('Writing the nginx rewrites file: '.$rewrites_file,LOGLEVEL_DEBUG);
        unset($tpl);
        // Set the symlink to enable the vhost
        $rewrite_symlink = escapeshellcmd($nginx_config['vhost_conf_enabled_dir'].'/default.rewrites.conf');
        if(!is_link($rewrite_symlink)) {
            symlink($rewrites_file,$rewrite_symlink);
            $app->log('Creating symlink for nginx rewrites: '.$rewrite_symlink.'->'.$rewrites_file,LOGLEVEL_DEBUG);
        }
    }
    function rewrite_delete($event_name,$data) {
        global $app, $conf;
        // just run the update function
        $this->rewrite_update($event_name,$data);
    }
    function _getRewriteRules($app)
    {
        $rules = array();
        $rules = $app->db->queryAllRecords("SELECT rewrite_url_src, rewrite_url_dst FROM proxy_reverse ORDER BY rewrite_id ASC");
        return $rules;
    }
} // end class
?>