From 457e378d1ee612ce6b47ef341c709e8d125c3adc Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Wed, 10 Jun 2015 14:59:38 +0200 Subject: [PATCH 01/34] Reverting HTMLform2 changes Signed-off-by: Roman Schmerold (BNoiZe) --- admin_admins.php | 97 +++- admin_cronjobs.php | 9 +- admin_customers.php | 95 +++- admin_ipsandports.php | 14 +- admin_phpsettings.php | 26 +- customer_mysql.php | 15 +- lib/classes/output/class.HTMLform2.php | 461 ------------------ .../admin/admin/formfield.admin_add.php | 232 +++++++++ .../admin/admin/formfield.admin_edit.php | 247 ++++++++++ .../cronjobs/formfield.cronjobs_edit.php | 54 ++ .../admin/customer/formfield.customer_add.php | 265 ++++++++++ .../customer/formfield.customer_edit.php | 287 +++++++++++ lib/formfields/admin/formfield.admin.php | 236 --------- lib/formfields/admin/formfield.cronjobs.php | 42 -- lib/formfields/admin/formfield.customer.php | 305 ------------ .../admin/formfield.ipsandports.php | 126 ----- lib/formfields/admin/formfield.phpconfig.php | 92 ---- .../ipsandports/formfield.ipsandports_add.php | 137 ++++++ .../formfield.ipsandports_edit.php | 146 ++++++ .../phpconfig/formfield.phpconfig_add.php | 92 ++++ .../phpconfig/formfield.phpconfig_edit.php | 95 ++++ templates/Sparkle/admin/admins/admins_add.tpl | 4 +- .../Sparkle/admin/admins/admins_edit.tpl | 2 +- .../Sparkle/admin/cronjobs/cronjob_edit.tpl | 4 +- .../Sparkle/admin/customers/customers_add.tpl | 4 +- .../admin/customers/customers_edit.tpl | 4 +- .../Sparkle/admin/domains/domains_import.tpl | 2 +- .../Sparkle/customer/mysql/mysqls_add.tpl | 4 +- .../Sparkle/customer/mysql/mysqls_edit.tpl | 4 +- templates/Sparkle/htmlform/checkbox.tpl | 1 - templates/Sparkle/htmlform/form_end.tpl | 8 - templates/Sparkle/htmlform/group_heading.tpl | 9 - templates/Sparkle/htmlform/input.tpl | 1 - templates/Sparkle/htmlform/inputul.tpl | 1 - templates/Sparkle/htmlform/select.tpl | 3 - templates/Sparkle/htmlform/skeleton.tpl | 4 - .../Sparkle/htmlform/skeleton_checkbox.tpl | 4 - templates/Sparkle/htmlform/static.tpl | 1 - templates/Sparkle/htmlform/textarea.tpl | 1 - 39 files changed, 1791 insertions(+), 1343 deletions(-) delete mode 100644 lib/classes/output/class.HTMLform2.php create mode 100644 lib/formfields/admin/admin/formfield.admin_add.php create mode 100644 lib/formfields/admin/admin/formfield.admin_edit.php create mode 100644 lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php create mode 100644 lib/formfields/admin/customer/formfield.customer_add.php create mode 100644 lib/formfields/admin/customer/formfield.customer_edit.php delete mode 100644 lib/formfields/admin/formfield.admin.php delete mode 100644 lib/formfields/admin/formfield.cronjobs.php delete mode 100644 lib/formfields/admin/formfield.customer.php delete mode 100644 lib/formfields/admin/formfield.ipsandports.php delete mode 100644 lib/formfields/admin/formfield.phpconfig.php create mode 100644 lib/formfields/admin/ipsandports/formfield.ipsandports_add.php create mode 100644 lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php create mode 100644 lib/formfields/admin/phpconfig/formfield.phpconfig_add.php create mode 100644 lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php delete mode 100644 templates/Sparkle/htmlform/checkbox.tpl delete mode 100644 templates/Sparkle/htmlform/form_end.tpl delete mode 100644 templates/Sparkle/htmlform/group_heading.tpl delete mode 100644 templates/Sparkle/htmlform/input.tpl delete mode 100644 templates/Sparkle/htmlform/inputul.tpl delete mode 100644 templates/Sparkle/htmlform/select.tpl delete mode 100644 templates/Sparkle/htmlform/skeleton.tpl delete mode 100644 templates/Sparkle/htmlform/skeleton_checkbox.tpl delete mode 100644 templates/Sparkle/htmlform/static.tpl delete mode 100644 templates/Sparkle/htmlform/textarea.tpl diff --git a/admin_admins.php b/admin_admins.php index d62520db..466581ff 100644 --- a/admin_admins.php +++ b/admin_admins.php @@ -440,6 +440,11 @@ if ($page == 'admins' } else { + $language_options = ''; + while (list($language_file, $language_name) = each($languages)) { + $language_options.= makeoption($language_name, $language_file, $userinfo['language'], true); + } + $ipaddress = makeoption($lng['admin']['allips'], "-1"); $ipsandports_stmt = Database::query(" SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `ip` ORDER BY `ip` ASC @@ -449,8 +454,24 @@ if ($page == 'admins' $ipaddress.= makeoption($row['ip'], $row['id']); } - $admin_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.admin.php'; - $admin_add_form = HTMLform2::genHTMLForm($admin_add_data); + $customers_ul = makecheckbox('customers_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $domains_ul = makecheckbox('domains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + + $admin_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/admin/formfield.admin_add.php'; + $admin_add_form = htmlform::genHTMLForm($admin_add_data); + + $title = $admin_add_data['admin_add']['title']; + $image = $admin_add_data['admin_add']['image']; eval("echo \"" . getTemplate("admins/admins_add") . "\";"); } @@ -759,6 +780,71 @@ if ($page == 'admins' $result['diskspace'] = round($result['diskspace'] / 1024, $dec_places); $result['email'] = $idna_convert->decode($result['email']); + $customers_ul = makecheckbox('customers_ul', $lng['customer']['unlimited'], '-1', false, $result['customers'], true, true); + if ($result['customers'] == '-1') { + $result['customers'] = ''; + } + + $diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true); + if ($result['diskspace'] == '-1') { + $result['diskspace'] = ''; + } + + $traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true); + if ($result['traffic'] == '-1') { + $result['traffic'] = ''; + } + + $domains_ul = makecheckbox('domains_ul', $lng['customer']['unlimited'], '-1', false, $result['domains'], true, true); + if ($result['domains'] == '-1') { + $result['domains'] = ''; + } + + $subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true); + if ($result['subdomains'] == '-1') { + $result['subdomains'] = ''; + } + + $emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true); + if ($result['emails'] == '-1') { + $result['emails'] = ''; + } + + $email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true); + if ($result['email_accounts'] == '-1') { + $result['email_accounts'] = ''; + } + + $email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true); + if ($result['email_forwarders'] == '-1') { + $result['email_forwarders'] = ''; + } + + $email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true); + if ($result['email_quota'] == '-1') { + $result['email_quota'] = ''; + } + + $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true); + if ($result['ftps'] == '-1') { + $result['ftps'] = ''; + } + + $tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, $result['tickets'], true, true); + if ($result['tickets'] == '-1') { + $result['tickets'] = ''; + } + + $mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true); + if ($result['mysqls'] == '-1') { + $result['mysqls'] = ''; + } + + $language_options = ''; + while (list($language_file, $language_name) = each($languages)) { + $language_options.= makeoption($language_name, $language_file, $result['def_language'], true); + } + $ipaddress = makeoption($lng['admin']['allips'], "-1", $result['ip']); $ipsandports_stmt = Database::query(" SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `ip` ORDER BY `ip`, `port` ASC @@ -770,8 +856,11 @@ if ($page == 'admins' $result = htmlentities_array($result); - $admin_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.admin.php'; - $admin_edit_form = HTMLform2::genHTMLForm($admin_edit_data, $result); + $admin_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/admin/formfield.admin_edit.php'; + $admin_edit_form = htmlform::genHTMLForm($admin_edit_data); + + $title = $admin_edit_data['admin_edit']['title']; + $image = $admin_edit_data['admin_edit']['image']; eval("echo \"" . getTemplate("admins/admins_edit") . "\";"); } diff --git a/admin_cronjobs.php b/admin_cronjobs.php index e40ee6f5..8cd17276 100644 --- a/admin_cronjobs.php +++ b/admin_cronjobs.php @@ -107,7 +107,7 @@ if ($page == 'cronjobs' || $page == 'overview') { // interval $interval_nfo = explode(' ', $result['interval']); - $result['interval_value'] = $interval_nfo[0]; + $interval_value = $interval_nfo[0]; $interval_interval = ''; $interval_interval .= makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]); @@ -122,8 +122,11 @@ if ($page == 'cronjobs' || $page == 'overview') { $change_cronfile = true; } - $cronjobs_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.cronjobs.php'; - $cronjobs_edit_form = HTMLform2::genHTMLForm($cronjobs_edit_data, $result); + $cronjobs_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php'; + $cronjobs_edit_form = htmlform::genHTMLForm($cronjobs_edit_data); + + $title = $cronjobs_edit_data['cronjobs_edit']['title']; + $image = $cronjobs_edit_data['cronjobs_edit']['image']; eval("echo \"" . getTemplate('cronjobs/cronjob_edit') . "\";"); } diff --git a/admin_customers.php b/admin_customers.php index 7ddb2245..0d360b1d 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -990,8 +990,32 @@ if ($page == 'customers' } } else { - $customer_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.customer.php'; - $customer_add_form = HTMLform2::genHTMLform($customer_add_data); + $language_options = ''; + + while (list($language_file, $language_name) = each($languages)) { + $language_options.= makeoption($language_name, $language_file, Settings::Get('panel.standardlanguage'), true); + } + + $diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + + $gender_options = makeoption($lng['gender']['undef'], 0, true, true, true); + $gender_options .= makeoption($lng['gender']['male'], 1, null, true, true); + $gender_options .= makeoption($lng['gender']['female'], 2, null, true, true); + + $customer_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/customer/formfield.customer_add.php'; + $customer_add_form = htmlform::genHTMLForm($customer_add_data); + + $title = $customer_add_data['customer_add']['title']; + $image = $customer_add_data['customer_add']['image']; eval("echo \"" . getTemplate("customers/customers_add") . "\";"); } @@ -1559,15 +1583,78 @@ if ($page == 'customers' } } else { + $language_options = ''; + + while (list($language_file, $language_name) = each($languages)) { + $language_options.= makeoption($language_name, $language_file, $result['def_language'], true); + } + $dec_places = Settings::Get('panel.decimal_places'); $result['traffic'] = round($result['traffic'] / (1024 * 1024), $dec_places); $result['diskspace'] = round($result['diskspace'] / 1024, $dec_places); $result['email'] = $idna_convert->decode($result['email']); + $diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true); + if ($result['diskspace'] == '-1') { + $result['diskspace'] = ''; + } + + $traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true); + if ($result['traffic'] == '-1') { + $result['traffic'] = ''; + } + + $subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true); + if ($result['subdomains'] == '-1') { + $result['subdomains'] = ''; + } + + $emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true); + if ($result['emails'] == '-1') { + $result['emails'] = ''; + } + + $email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true); + if ($result['email_accounts'] == '-1') { + $result['email_accounts'] = ''; + } + + $email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true); + if ($result['email_forwarders'] == '-1') { + $result['email_forwarders'] = ''; + } + + $email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true); + if ($result['email_quota'] == '-1') { + $result['email_quota'] = ''; + } + + $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true); + if ($result['ftps'] == '-1') { + $result['ftps'] = ''; + } + + $tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, $result['tickets'], true, true); + if ($result['tickets'] == '-1') { + $result['tickets'] = ''; + } + + $mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true); + if ($result['mysqls'] == '-1') { + $result['mysqls'] = ''; + } + $result = htmlentities_array($result); - $customer_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.customer.php'; - $customer_edit_form = HTMLform2::genHTMLform($customer_edit_data, $result); + $gender_options = makeoption($lng['gender']['undef'], 0, ($result['gender'] == '0' ? true : false), true, true); + $gender_options .= makeoption($lng['gender']['male'], 1, ($result['gender'] == '1' ? true : false), true, true); + $gender_options .= makeoption($lng['gender']['female'], 2, ($result['gender'] == '2' ? true : false), true, true); + + $customer_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/customer/formfield.customer_edit.php'; + $customer_edit_form = htmlform::genHTMLForm($customer_edit_data); + + $title = $customer_edit_data['customer_edit']['title']; + $image = $customer_edit_data['customer_edit']['image']; eval("echo \"" . getTemplate("customers/customers_edit") . "\";"); } diff --git a/admin_ipsandports.php b/admin_ipsandports.php index 0b9e3c23..4465bfb0 100644 --- a/admin_ipsandports.php +++ b/admin_ipsandports.php @@ -259,10 +259,11 @@ if ($page == 'ipsandports' } else { - $ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.ipsandports.php'; - $ipsandports_add_form = HTMLform2::genHTMLForm($ipsandports_add_data); + $ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php'; + $ipsandports_add_form = htmlform::genHTMLForm($ipsandports_add_data); - $title = $lng['admin']['ipsandports']['add']; + $title = $ipsandports_add_data['ipsandports_add']['title']; + $image = $ipsandports_add_data['ipsandports_add']['image']; eval("echo \"" . getTemplate("ipsandports/ipsandports_add") . "\";"); } @@ -419,10 +420,11 @@ if ($page == 'ipsandports' $result = htmlentities_array($result); - $ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.ipsandports.php'; - $ipsandports_edit_form = HTMLform2::genHTMLForm($ipsandports_edit_data, $result); + $ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php'; + $ipsandports_edit_form = htmlform::genHTMLForm($ipsandports_edit_data); - $title = $lng['admin']['ipsandports']['edit']; + $title = $ipsandports_edit_data['ipsandports_edit']['title']; + $image = $ipsandports_edit_data['ipsandports_edit']['image']; eval("echo \"" . getTemplate("ipsandports/ipsandports_edit") . "\";"); } diff --git a/admin_phpsettings.php b/admin_phpsettings.php index 348abd9f..5f10145c 100644 --- a/admin_phpsettings.php +++ b/admin_phpsettings.php @@ -121,9 +121,9 @@ if ($page == 'overview') { $fpm_reqslowtimeout = 0; } elseif (Settings::Get('phpfpm.enabled') == 1) { - $fpm_enableslowlog = isset($_POST['fpm_slowlog']) ? (int)$_POST['fpm_slowlog'] : 0; - $fpm_reqtermtimeout = validate($_POST['fpm_reqterm'], 'fpm_reqterm', '/^([0-9]+)(|s|m|h|d)$/'); - $fpm_reqslowtimeout = validate($_POST['fpm_reqslow'], 'fpm_reqslow', '/^([0-9]+)(|s|m|h|d)$/'); + $fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int)$_POST['phpfpm_enable_slowlog'] : 0; + $fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/'); + $fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/'); // disable fcgid stuff $binary = '/usr/bin/php-cgi'; $file_extensions = 'php'; @@ -171,10 +171,11 @@ if ($page == 'overview') { $result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1"); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); - $phpconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.phpconfig.php'; - $phpconfig_add_form = HTMLform2::genHTMLForm($phpconfig_add_data); + $phpconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php'; + $phpconfig_add_form = htmlform::genHTMLForm($phpconfig_add_data); - $title = $lng['admin']['phpsettings']['addsettings']; + $title = $phpconfig_add_data['phpconfig_add']['title']; + $image = $phpconfig_add_data['phpconfig_add']['image']; eval("echo \"" . getTemplate("phpconfig/overview_add") . "\";"); } @@ -270,9 +271,9 @@ if ($page == 'overview') { $fpm_reqslowtimeout = 0; } elseif (Settings::Get('phpfpm.enabled') == 1) { - $fpm_enableslowlog = isset($_POST['fpm_slowlog']) ? (int)$_POST['fpm_slowlog'] : 0; - $fpm_reqtermtimeout = validate($_POST['fpm_reqterm'], 'fpm_reqterm', '/^([0-9]+)(|s|m|h|d)$/'); - $fpm_reqslowtimeout = validate($_POST['fpm_reqslow'], 'fpm_reqslow', '/^([0-9]+)(|s|m|h|d)$/'); + $fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int)$_POST['phpfpm_enable_slowlog'] : 0; + $fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/'); + $fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/'); // disable fcgid stuff $binary = '/usr/bin/php-cgi'; $file_extensions = 'php'; @@ -319,10 +320,11 @@ if ($page == 'overview') { } else { - $phpconfig_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.phpconfig.php'; - $phpconfig_edit_form = HTMLform2::genHTMLForm($phpconfig_edit_data, $result); + $phpconfig_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php'; + $phpconfig_edit_form = htmlform::genHTMLForm($phpconfig_edit_data); - $title = $lng['admin']['phpsettings']['editsettings']; + $title = $phpconfig_edit_data['phpconfig_edit']['title']; + $image = $phpconfig_edit_data['phpconfig_edit']['image']; eval("echo \"" . getTemplate("phpconfig/overview_edit") . "\";"); } diff --git a/customer_mysql.php b/customer_mysql.php index c92639e0..39c642da 100644 --- a/customer_mysql.php +++ b/customer_mysql.php @@ -283,8 +283,11 @@ if ($page == 'overview') { } Database::needRoot(false); - $mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/formfield.mysql.php'; - $mysql_add_form = HTMLform2::genHTMLForm($mysql_add_data); + $mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_add.php'; + $mysql_add_form = htmlform::genHTMLForm($mysql_add_data); + + $title = $mysql_add_data['mysql_add']['title']; + $image = $mysql_add_data['mysql_add']['image']; eval("echo \"" . getTemplate('mysql/mysqls_add') . "\";"); } @@ -352,9 +355,11 @@ if ($page == 'overview') { $sql_root = Database::getSqlData(); Database::needRoot(false); - $result['mysql_servers'] = isset($sql_root['caption']) ? $sql_root['caption'] : ''; - $mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/formfield.mysql.php'; - $mysql_edit_form = HTMLform2::genHTMLForm($mysql_edit_data, $result); + $mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_edit.php'; + $mysql_edit_form = htmlform::genHTMLForm($mysql_edit_data); + + $title = $mysql_edit_data['mysql_edit']['title']; + $image = $mysql_edit_data['mysql_edit']['image']; eval("echo \"" . getTemplate('mysql/mysqls_edit') . "\";"); } diff --git a/lib/classes/output/class.HTMLform2.php b/lib/classes/output/class.HTMLform2.php deleted file mode 100644 index 41e26aa2..00000000 --- a/lib/classes/output/class.HTMLform2.php +++ /dev/null @@ -1,461 +0,0 @@ - (2015-) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Classes - * - */ - -class HTMLform2 { - // Internal var to store form - private static $_form = ''; - - /** - * genHTMLform function. - * - * @access public - * @static - * @param array $formdata (default: array()) - * @param array $data (default: array()) - * @return void - */ - public static function genHTMLform($formdata = array(), $data = false) { - global $lng, $theme; - self::$_form = ''; - - // Parse each group - foreach ($formdata as $groupdata) { - if (!isset($groupdata['visible']) || $groupdata['visible'] !== false) { - // Output Section Heading - if (isset($groupdata['title'])) { - $grouptitle = $groupdata['title']; - eval("self::\$_form .= \"" . getTemplate("htmlform/group_heading", "1") . "\";"); - } - - // Generate Group Fields - foreach($groupdata['fields'] as $fieldname => $fielddata) { - if (isset($fielddata['visible'])) { - if ($fielddata['visible'] == false) { - continue; - } elseif ($fielddata['visible'] === 'new' && is_array($data)) { - continue; - } elseif ($fielddata['visible'] === 'edit' && !is_array($data)) { - continue; - } - } - - // Set value if given - if (!empty($data)) { - $fielddata = self::_setValue($fieldname, $fielddata, $data); - } - - $field = self::_parseDataField($fieldname, $fielddata); - - $label = $fielddata['label'] . self::_getMandatoryFlag($fielddata); - if (isset($fielddata['desc']) && $fielddata['desc'] != "") { - $desc = $fielddata['desc']; - } else { - $desc = ''; - } - - switch($fielddata['type']) { - case 'checkbox': - eval("self::\$_form .= \"" . getTemplate("htmlform/skeleton_checkbox", "1") . "\";"); - break; - default: - eval("self::\$_form .= \"" . getTemplate("htmlform/skeleton", "1") . "\";"); - break; - } - - } - } - } - - eval("self::\$_form .= \"" . getTemplate("htmlform/form_end", "1") . "\";"); - - return self::$_form; - } - - private static function _setValue($fieldname, $fielddata, $data) { - if (isset($data[$fieldname])) { - switch($fielddata['type']) { - case 'checkbox': - $fielddata['attributes']['checked'] = ($data[$fieldname] == 1) ? true : false; - break; - case 'select': - $fielddata['selected'] = $data[$fieldname]; - break; - default: - $fielddata['value'] = $data[$fieldname]; - break; - } - } - - return $fielddata; - } - - private static function _parseDataField($fieldname, $fielddata) { - switch($fielddata['type']) { - case 'button': - case 'submit': - case 'reset': - return self::_button($fieldname, $fielddata); - break; - case 'text': - case 'password': - case 'hidden': - case 'file': - case 'email': - return self::_input($fieldname, $fielddata); - break; - case 'textul': - return self::_inputUl($fieldname, $fielddata); - break; - case 'radio': - return self::_inputRadio($fieldname, $fielddata); - break; - case 'checkbox': - return self::_inputCheckbox($fieldname, $fielddata); - break; - case 'static': - return self::_static($fieldname, $fielddata); - break; - case 'select': - return self::_select($fieldname, $fielddata); - break; - case 'textarea': - return self::_textarea($fieldname, $fielddata); - break; - } - } - - /** - * _parseAttributes function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata - * @return void - */ - private static function _parseAttributes($fieldname, $fielddata) { - $attributes = array(); - - // name - $attributes['name'] = $fieldname; - $attributes['id'] = $fieldname; - - // value - if ($fielddata['type'] != 'select') { - if (isset($_SESSION['requestData'][$fieldname])) { - $attributes['value'] = $_SESSION['requestData'][$fieldname]; - } elseif (isset($fielddata['value'])) { - $attributes['value'] = $fielddata['value']; - } - } - - if (isset($fielddata['attributes'])) { - if (isset($fielddata['attributes']['checked']) && $fielddata['attributes']['checked'] !== true) { - unset($fielddata['attributes']['checked']); - } - if (isset($fielddata['attributes']['selected']) && $fielddata['attributes']['selected'] !== true) { - unset($fielddata['attributes']['selected']); - } - if (isset($fielddata['attributes']['readonly']) && $fielddata['attributes']['readonly'] !== true) { - unset($fielddata['attributes']['readonly']); - } - return array_merge($attributes, $fielddata['attributes']); - } else { - return $attributes; - } - } - - /** - * _glueAttributes function. - * - * @access private - * @static - * @param array $attributes - * @return void - */ - private static function _glueAttributes($attributes) { - $glued = array(); - foreach($attributes as $name => $value) { - $glued[] = $name . "=\"" . $value . "\""; - } - return implode(" ", $glued); - } - - /** - * _getMandatoryFlag function. - * - * @access private - * @static - * @param array $fielddata - * @return void - */ - private static function _getMandatoryFlag($fielddata) { - if (isset($fielddata['mandatory'])) { - return ' *'; - } elseif (isset($fielddata['mandatory_ex'])) { - return ' **'; - } - return ''; - } - - /** - * _button function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @param string $type (default: 'button') - * @return void - */ - private static function _button($fieldname, $fielddata = array()) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - $attributes['type'] = $fielddata['type']; - $attributes = self::_glueAttributes($attributes); - - eval("\$return = \"" . getTemplate("htmlform/button", "1") . "\";"); - return ""; - } - - - /** - * _input function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @param string $type (default: "text") - * @return void - */ - private static function _input($fieldname, $fielddata = array()) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - $attributes['type'] = $fielddata['type']; - $attributes = self::_glueAttributes($attributes); - - eval("\$return = \"" . getTemplate("htmlform/input", "1") . "\";"); - return $return; - } - - /** - * _inputUl function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _inputUl($fieldname, $fielddata = array()) { - global $lng; - - // Input - $attributes_input = self::_parseAttributes($fieldname, $fielddata); - $attributes_input['type'] = "text"; - $attributes_input['value'] = ($fielddata['value'] == '-1') ? '' : $fielddata['value']; - $attributes_input = self::_glueAttributes($attributes_input); - - // Checkbox - $checkboxdata = array( - 'label' => $lng['customer']['unlimited'], - 'type' => 'checkbox', - 'value' => '-1', - 'attributes' => array( - 'checked' => ($fielddata['value'] == '-1') ? true : false - ) - ); - $attributes_checkbox = self::_parseAttributes($fieldname . "_ul", $checkboxdata); - $attributes_checkbox['type'] = $checkboxdata['type']; - $attributes_checkbox = self::_glueAttributes($attributes_checkbox); - $label_checkbox = $checkboxdata['label']; - - eval("\$return = \"" . getTemplate("htmlform/inputul", "1") . "\";"); - - return $return; - } - - /** - * _inputRadio function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _inputRadio($fieldname, $fielddata = array()) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - $attributes['type'] = $fielddata['type']; - $attributes = self::_glueAttributes($attributes); - - // ToDo - - eval("\$return = \"" . getTemplate("htmlform/radio", "1") . "\";"); - return $return; - } - - /** - * _inputCheckbox function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _inputCheckbox($fieldname, $fielddata = array(), $labelHidden = true) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - $attributes['type'] = $fielddata['type']; - $attributes = self::_glueAttributes($attributes); - - $label = $fielddata['label']; - eval("\$return = \"" . getTemplate("htmlform/checkbox", "1") . "\";"); - return $return; - } - - /** - * _static function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _static($fieldname, $fielddata = array()) { - $value = $fielddata['value']; - eval("\$return = \"" . getTemplate("htmlform/static", "1") . "\";"); - return $return; - } - - /** - * _select function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _select($fieldname, $fielddata = array()) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - $attributes = self::_glueAttributes($attributes); - - if (isset($fielddata['generate'])) { - switch($fielddata['generate']) { - case 'genders': - $fielddata['values'] = self::_generateGenders($fielddata['selected']); - break; - case 'languages': - $fielddata['values'] = self::_generateLanguages($fielddata['selected']); - break; - } - } - - $values = ""; - if (is_array($fielddata['values'])) { - foreach($fielddata['values'] as $value) { - $selected = ""; - if ((isset($value['selected']) && $value['selected'] == true) || (isset($fielddata['value']) && $value['value'] == $fielddata['value'])) { - $selected = " selected"; - } - $values .= ""; - } - } else { - $values = $fielddata['values']; - } - eval("\$return = \"" . getTemplate("htmlform/select", "1") . "\";"); - - if (isset($fielddata['attributes']['multiple']) && $fielddata['attributes']['multiple'] == true) { - $return = str_replace("name=\"$fieldname\"", "name=\"{$fieldname}[]\"", $return); - } - return $return; - } - - /** - * _textarea function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _textarea($fieldname, $fielddata = array()) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - unset($attributes['value']); - $attributes = self::_glueAttributes($attributes); - - $value = isset($fielddata['value']) ? $fielddata['value'] : ""; - eval("\$return = \"" . getTemplate("htmlform/textarea", "1") . "\";"); - return $return; - } - - private static function _generateGenders($selected = "") { - global $lng; - - $genders = array( - array( - "value" => 0, - "label" => $lng['gender']['undef'], - ), - array( - "value" => 1, - "label" => $lng['gender']['male'] - ), - array( - "value" => 2, - "label" => $lng['gender']['female'] - ) - ); - - // Check if something is selected - if ($selected != "") { - foreach ($genders as $key => $value) { - if ($value['value'] == $selected) { - $genders[$key]['selected'] = true; - continue; - } - } - } - - return $genders; - } - - private static function _generateLanguages($selected = "") { - global $languages; - $retlanguages = array(); - while (list($language_file, $language_name) = each($languages)) { - $newlng = array( - "value" => $language_file, - "label" => $language_name - ); - - if ($language_file == $selected) { - $newlng['selected'] = true; - } - - $retlanguages[] = $newlng; - - //$language_options.= makeoption($language_name, $language_file, Settings::Get('panel.standardlanguage'), true); - } - - return $retlanguages; - } - -} diff --git a/lib/formfields/admin/admin/formfield.admin_add.php b/lib/formfields/admin/admin/formfield.admin_add.php new file mode 100644 index 00000000..a89a6f9e --- /dev/null +++ b/lib/formfields/admin/admin/formfield.admin_add.php @@ -0,0 +1,232 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'admin_add' => array( + 'title' => $lng['admin']['admin_add'], + 'image' => 'icons/user_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['accountdata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'loginname' => array( + 'label' => $lng['login']['username'], + 'type' => 'text', + 'mandatory' => true + ), + 'admin_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password', + 'mandatory' => true, + 'autocomplete' => 'off' + ), + 'admin_password_suggestion' => array( + 'label' => $lng['customer']['generated_pwd'], + 'type' => 'text', + 'visible' => (Settings::Get('panel.password_regex') == ''), + 'value' => generatePassword(), + ), + 'def_language' => array( + 'label' => $lng['login']['language'], + 'type' => 'select', + 'select_var' => $language_options + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['contactdata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'name' => array( + 'label' => $lng['customer']['name'], + 'type' => 'text', + 'mandatory' => true + ), + 'email' => array( + 'label' => $lng['customer']['email'], + 'type' => 'text', + 'mandatory' => true + ), + 'custom_notes' => array( + 'style' => 'align-top', + 'label' => $lng['usersettings']['custom_notes']['title'], + 'desc' => $lng['usersettings']['custom_notes']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12 + ), + 'custom_notes_show' => array( + 'label' => $lng['usersettings']['custom_notes']['show'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['servicedata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'ipaddress' => array( + 'label' => $lng['serversettings']['ipaddress']['title'], + 'type' => 'select', + 'select_var' => $ipaddress + ), + 'change_serversettings' => array( + 'label' => $lng['admin']['change_serversettings'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'customers' => array( + 'label' => $lng['admin']['customers'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $customers_ul + ), + 'customers_see_all' => array( + 'label' => $lng['admin']['customers_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'domains' => array( + 'label' => $lng['admin']['domains'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $domains_ul + ), + 'domains_see_all' => array( + 'label' => $lng['admin']['domains_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'caneditphpsettings' => array( + 'label' => $lng['admin']['caneditphpsettings'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'diskspace' => array( + 'label' => $lng['customer']['diskspace'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 6, + 'mandatory' => true, + 'ul_field' => $diskspace_ul + ), + 'traffic' => array( + 'label' => $lng['customer']['traffic'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 4, + 'mandatory' => true, + 'ul_field' => $traffic_ul + ), + 'subdomains' => array( + 'label' => $lng['customer']['subdomains'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $subdomains_ul + ), + 'emails' => array( + 'label' => $lng['customer']['emails'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $emails_ul + ), + 'email_accounts' => array( + 'label' => $lng['customer']['accounts'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_accounts_ul + ), + 'email_forwarders' => array( + 'label' => $lng['customer']['forwarders'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_forwarders_ul + ), + 'email_quota' => array( + 'label' => $lng['customer']['email_quota'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), + 'mandatory' => true, + 'ul_field' => $email_quota_ul + ), + 'ftps' => array( + 'label' => $lng['customer']['ftps'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'ul_field' => $ftps_ul + ), + 'tickets' => array( + 'label' => $lng['customer']['tickets'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), + 'ul_field' => $tickets_ul + ), + 'tickets_see_all' => array( + 'label' => $lng['admin']['tickets_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'mysqls' => array( + 'label' => $lng['customer']['mysqls'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $mysqls_ul + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/admin/formfield.admin_edit.php b/lib/formfields/admin/admin/formfield.admin_edit.php new file mode 100644 index 00000000..4a06a81e --- /dev/null +++ b/lib/formfields/admin/admin/formfield.admin_edit.php @@ -0,0 +1,247 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'admin_edit' => array( + 'title' => $lng['admin']['admin_edit'], + 'image' => 'icons/user_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['accountdata'], + 'image' => 'icons/user_edit.png', + 'fields' => array( + 'loginname' => array( + 'label' => $lng['login']['username'], + 'type' => 'label', + 'value' => $result['loginname'] + ), + 'deactivated' => array( + 'label' => $lng['admin']['deactivated_user'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['deactivated']), + 'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true) + ), + 'admin_password' => array( + 'label' => $lng['login']['password'].' ('.$lng['panel']['emptyfornochanges'].')', + 'type' => 'password', + 'autocomplete' => 'off', + 'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true) + ), + 'admin_password_suggestion' => array( + 'label' => $lng['customer']['generated_pwd'], + 'type' => 'text', + 'visible' => (Settings::Get('panel.password_regex') == ''), + 'value' => generatePassword(), + 'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true) + ), + 'def_language' => array( + 'label' => $lng['login']['language'], + 'type' => 'select', + 'select_var' => $language_options, + 'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true) + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['contactdata'], + 'image' => 'icons/user_edit.png', + 'fields' => array( + 'name' => array( + 'label' => $lng['customer']['name'], + 'type' => 'text', + 'mandatory' => true, + 'value' => $result['name'] + ), + 'email' => array( + 'label' => $lng['customer']['email'], + 'type' => 'text', + 'mandatory' => true, + 'value' => $result['email'] + ), + 'custom_notes' => array( + 'style' => 'align-top', + 'label' => $lng['usersettings']['custom_notes']['title'], + 'desc' => $lng['usersettings']['custom_notes']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12, + 'value' => $result['custom_notes'] + ), + 'custom_notes_show' => array( + 'label' => $lng['usersettings']['custom_notes']['show'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['custom_notes_show']) + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['servicedata'], + 'image' => 'icons/user_add.png', + 'visible' => ($result['adminid'] != $userinfo['userid'] ? true : false), + 'fields' => array( + 'ipaddress' => array( + 'label' => $lng['serversettings']['ipaddress']['title'], + 'type' => 'select', + 'select_var' => $ipaddress + ), + 'change_serversettings' => array( + 'label' => $lng['admin']['change_serversettings'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['change_serversettings']) + ), + 'customers' => array( + 'label' => $lng['admin']['customers'], + 'type' => 'textul', + 'value' => $result['customers'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $customers_ul + ), + 'customers_see_all' => array( + 'label' => $lng['admin']['customers_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['customers_see_all']) + ), + 'domains' => array( + 'label' => $lng['admin']['domains'], + 'type' => 'textul', + 'value' => $result['domains'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $domains_ul + ), + 'domains_see_all' => array( + 'label' => $lng['admin']['domains_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['domains_see_all']) + ), + 'caneditphpsettings' => array( + 'label' => $lng['admin']['caneditphpsettings'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['caneditphpsettings']) + ), + 'diskspace' => array( + 'label' => $lng['customer']['diskspace'], + 'type' => 'textul', + 'value' => $result['diskspace'], + 'maxlength' => 6, + 'mandatory' => true, + 'ul_field' => $diskspace_ul + ), + 'traffic' => array( + 'label' => $lng['customer']['traffic'], + 'type' => 'textul', + 'value' => $result['traffic'], + 'maxlength' => 4, + 'mandatory' => true, + 'ul_field' => $traffic_ul + ), + 'subdomains' => array( + 'label' => $lng['customer']['subdomains'], + 'type' => 'textul', + 'value' => $result['subdomains'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $subdomains_ul + ), + 'emails' => array( + 'label' => $lng['customer']['emails'], + 'type' => 'textul', + 'value' => $result['emails'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $emails_ul + ), + 'email_accounts' => array( + 'label' => $lng['customer']['accounts'], + 'type' => 'textul', + 'value' => $result['email_accounts'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_accounts_ul + ), + 'email_forwarders' => array( + 'label' => $lng['customer']['forwarders'], + 'type' => 'textul', + 'value' => $result['email_forwarders'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_forwarders_ul + ), + 'email_quota' => array( + 'label' => $lng['customer']['email_quota'], + 'type' => 'textul', + 'value' => $result['email_quota'], + 'maxlength' => 9, + 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), + 'mandatory' => true, + 'ul_field' => $email_quota_ul + ), + 'ftps' => array( + 'label' => $lng['customer']['ftps'], + 'type' => 'textul', + 'value' => $result['ftps'], + 'maxlength' => 9, + 'ul_field' => $ftps_ul + ), + 'tickets' => array( + 'label' => $lng['customer']['tickets'], + 'type' => 'textul', + 'value' => $result['tickets'], + 'maxlength' => 9, + 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), + 'ul_field' => $tickets_ul + ), + 'tickets_see_all' => array( + 'label' => $lng['admin']['tickets_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['tickets_see_all']) + ), + 'mysqls' => array( + 'label' => $lng['customer']['mysqls'], + 'type' => 'textul', + 'value' => $result['mysqls'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $mysqls_ul + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php b/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php new file mode 100644 index 00000000..7c71dbc0 --- /dev/null +++ b/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php @@ -0,0 +1,54 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'cronjobs_edit' => array( + 'title' => $lng['admin']['cronjob_edit'], + 'image' => 'icons/clock_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['cronjob']['cronjobsettings'], + 'image' => 'icons/clock_edit.png', + 'fields' => array( + 'cronfile' => array( + 'label' => 'Cronjob', + 'type' => ($change_cronfile == 1 ? 'text' : 'label'), + 'value' => $result['cronfile'] + ), + 'isactive' => array( + 'label' => $lng['admin']['activated'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['isactive']) + ), + 'interval_value' => array( + 'label' => $lng['cronjob']['cronjobintervalv'], + 'type' => 'text', + 'value' => $interval_value + ), + 'interval_interval' => array( + 'label' => $lng['cronjob']['cronjobinterval'], + 'type' => 'select', + 'select_var' => $interval_interval + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/customer/formfield.customer_add.php b/lib/formfields/admin/customer/formfield.customer_add.php new file mode 100644 index 00000000..54a7e863 --- /dev/null +++ b/lib/formfields/admin/customer/formfield.customer_add.php @@ -0,0 +1,265 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'customer_add' => array( + 'title' => $lng['admin']['customer_add'], + 'image' => 'icons/user_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['accountdata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'new_loginname' => array( + 'label' => $lng['login']['username'], + 'type' => 'text' + ), + 'createstdsubdomain' => array( + 'label' => $lng['admin']['stdsubdomain_add'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'store_defaultindex' => array( + 'label' => $lng['admin']['store_defaultindex'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'new_customer_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password', + 'autocomplete' => 'off' + ), + 'new_customer_password_suggestion' => array( + 'label' => $lng['customer']['generated_pwd'], + 'type' => 'text', + 'visible' => (Settings::Get('panel.password_regex') == ''), + 'value' => generatePassword(), + ), + 'sendpassword' => array( + 'label' => $lng['admin']['sendpassword'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'def_language' => array( + 'label' => $lng['login']['language'], + 'type' => 'select', + 'select_var' => $language_options + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['contactdata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'name' => array( + 'label' => $lng['customer']['name'], + 'type' => 'text', + 'mandatory_ex' => true + ), + 'firstname' => array( + 'label' => $lng['customer']['firstname'], + 'type' => 'text', + 'mandatory_ex' => true + ), + 'gender' => array( + 'label' => $lng['gender']['title'], + 'type' => 'select', + 'select_var' => $gender_options + ), + 'company' => array( + 'label' => $lng['customer']['company'], + 'type' => 'text', + 'mandatory_ex' => true + ), + 'street' => array( + 'label' => $lng['customer']['street'], + 'type' => 'text' + ), + 'zipcode' => array( + 'label' => $lng['customer']['zipcode'], + 'type' => 'text' + ), + 'city' => array( + 'label' => $lng['customer']['city'], + 'type' => 'text' + ), + 'phone' => array( + 'label' => $lng['customer']['phone'], + 'type' => 'text' + ), + 'fax' => array( + 'label' => $lng['customer']['fax'], + 'type' => 'text' + ), + 'email' => array( + 'label' => $lng['customer']['email'], + 'type' => 'text', + 'mandatory' => true + ), + 'customernumber' => array( + 'label' => $lng['customer']['customernumber'], + 'type' => 'text' + ), + 'custom_notes' => array( + 'style' => 'align-top', + 'label' => $lng['usersettings']['custom_notes']['title'], + 'desc' => $lng['usersettings']['custom_notes']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12 + ), + 'custom_notes_show' => array( + 'label' => $lng['usersettings']['custom_notes']['show'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['servicedata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'diskspace' => array( + 'label' => $lng['customer']['diskspace'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 6, + 'mandatory' => true, + 'ul_field' => $diskspace_ul + ), + 'traffic' => array( + 'label' => $lng['customer']['traffic'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 4, + 'mandatory' => true, + 'ul_field' => $traffic_ul + ), + 'subdomains' => array( + 'label' => $lng['customer']['subdomains'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $subdomains_ul + ), + 'emails' => array( + 'label' => $lng['customer']['emails'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $emails_ul + ), + 'email_accounts' => array( + 'label' => $lng['customer']['accounts'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_accounts_ul + ), + 'email_forwarders' => array( + 'label' => $lng['customer']['forwarders'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_forwarders_ul + ), + 'email_quota' => array( + 'label' => $lng['customer']['email_quota'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), + 'mandatory' => true, + 'ul_field' => $email_quota_ul + ), + 'email_imap' => array( + 'label' => $lng['customer']['email_imap'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1'), + 'mandatory' => true + ), + 'email_pop3' => array( + 'label' => $lng['customer']['email_pop3'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1'), + 'mandatory' => true + ), + 'ftps' => array( + 'label' => $lng['customer']['ftps'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'ul_field' => $ftps_ul + ), + 'tickets' => array( + 'label' => $lng['customer']['tickets'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), + 'ul_field' => $tickets_ul + ), + 'mysqls' => array( + 'label' => $lng['customer']['mysqls'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $mysqls_ul + ), + 'phpenabled' => array( + 'label' => $lng['admin']['phpenabled'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'perlenabled' => array( + 'label' => $lng['admin']['perlenabled'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ) + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/customer/formfield.customer_edit.php b/lib/formfields/admin/customer/formfield.customer_edit.php new file mode 100644 index 00000000..b7e23476 --- /dev/null +++ b/lib/formfields/admin/customer/formfield.customer_edit.php @@ -0,0 +1,287 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'customer_edit' => array( + 'title' => $lng['admin']['customer_edit'], + 'image' => 'icons/user_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['accountdata'], + 'image' => 'icons/user_edit.png', + 'fields' => array( + 'loginname' => array( + 'label' => $lng['login']['username'], + 'type' => 'label', + 'value' => $result['loginname'] + ), + 'documentroot' => array( + 'label' => $lng['customer']['documentroot'], + 'type' => 'label', + 'value' => $result['documentroot'] + ), + 'createstdsubdomain' => array( + 'label' => $lng['admin']['stdsubdomain_add'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array(($result['standardsubdomain'] != '0') ? '1' : '0') + ), + 'deactivated' => array( + 'label' => $lng['admin']['deactivated_user'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['deactivated']) + ), + 'new_customer_password' => array( + 'label' => $lng['login']['password'].' ('.$lng['panel']['emptyfornochanges'].')', + 'type' => 'password', + 'autocomplete' => 'off' + ), + 'new_customer_password_suggestion' => array( + 'label' => $lng['customer']['generated_pwd'], + 'type' => 'text', + 'visible' => (Settings::Get('panel.password_regex') == ''), + 'value' => generatePassword(), + ), + 'def_language' => array( + 'label' => $lng['login']['language'], + 'type' => 'select', + 'select_var' => $language_options + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['contactdata'], + 'image' => 'icons/user_edit.png', + 'fields' => array( + 'name' => array( + 'label' => $lng['customer']['name'], + 'type' => 'text', + 'mandatory_ex' => true, + 'value' => $result['name'] + ), + 'firstname' => array( + 'label' => $lng['customer']['firstname'], + 'type' => 'text', + 'mandatory_ex' => true, + 'value' => $result['firstname'] + ), + 'gender' => array( + 'label' => $lng['gender']['title'], + 'type' => 'select', + 'select_var' => $gender_options + ), + 'company' => array( + 'label' => $lng['customer']['company'], + 'type' => 'text', + 'mandatory_ex' => true, + 'value' => $result['company'] + ), + 'street' => array( + 'label' => $lng['customer']['street'], + 'type' => 'text', + 'value' => $result['street'] + ), + 'zipcode' => array( + 'label' => $lng['customer']['zipcode'], + 'type' => 'text', + 'value' => $result['zipcode'] + ), + 'city' => array( + 'label' => $lng['customer']['city'], + 'type' => 'text', + 'value' => $result['city'] + ), + 'phone' => array( + 'label' => $lng['customer']['phone'], + 'type' => 'text', + 'value' => $result['phone'] + ), + 'fax' => array( + 'label' => $lng['customer']['fax'], + 'type' => 'text', + 'value' => $result['fax'] + ), + 'email' => array( + 'label' => $lng['customer']['email'], + 'type' => 'text', + 'mandatory' => true, + 'value' => $result['email'] + ), + 'customernumber' => array( + 'label' => $lng['customer']['customernumber'], + 'type' => 'text', + 'value' => $result['customernumber'] + ), + 'custom_notes' => array( + 'style' => 'align-top', + 'label' => $lng['usersettings']['custom_notes']['title'], + 'desc' => $lng['usersettings']['custom_notes']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12, + 'value' => $result['custom_notes'] + ), + 'custom_notes_show' => array( + 'label' => $lng['usersettings']['custom_notes']['show'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['custom_notes_show']) + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['servicedata'], + 'image' => 'icons/user_edit.png', + 'fields' => array( + 'diskspace' => array( + 'label' => $lng['customer']['diskspace'], + 'type' => 'textul', + 'value' => $result['diskspace'], + 'maxlength' => 6, + 'mandatory' => true, + 'ul_field' => $diskspace_ul + ), + 'traffic' => array( + 'label' => $lng['customer']['traffic'], + 'type' => 'textul', + 'value' => $result['traffic'], + 'maxlength' => 4, + 'mandatory' => true, + 'ul_field' => $traffic_ul + ), + 'subdomains' => array( + 'label' => $lng['customer']['subdomains'], + 'type' => 'textul', + 'value' => $result['subdomains'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $subdomains_ul + ), + 'emails' => array( + 'label' => $lng['customer']['emails'], + 'type' => 'textul', + 'value' => $result['emails'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $emails_ul + ), + 'email_accounts' => array( + 'label' => $lng['customer']['accounts'], + 'type' => 'textul', + 'value' => $result['email_accounts'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_accounts_ul + ), + 'email_forwarders' => array( + 'label' => $lng['customer']['forwarders'], + 'type' => 'textul', + 'value' => $result['email_forwarders'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_forwarders_ul + ), + 'email_quota' => array( + 'label' => $lng['customer']['email_quota'], + 'type' => 'textul', + 'value' => $result['email_quota'], + 'maxlength' => 9, + 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), + 'mandatory' => true, + 'ul_field' => $email_quota_ul + ), + 'email_imap' => array( + 'label' => $lng['customer']['email_imap'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['imap']), + 'mandatory' => true + ), + 'email_pop3' => array( + 'label' => $lng['customer']['email_pop3'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['pop3']), + 'mandatory' => true + ), + 'ftps' => array( + 'label' => $lng['customer']['ftps'], + 'type' => 'textul', + 'value' => $result['ftps'], + 'maxlength' => 9, + 'ul_field' => $ftps_ul + ), + 'tickets' => array( + 'label' => $lng['customer']['tickets'], + 'type' => 'textul', + 'value' => $result['tickets'], + 'maxlength' => 9, + 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), + 'ul_field' => $tickets_ul + ), + 'mysqls' => array( + 'label' => $lng['customer']['mysqls'], + 'type' => 'textul', + 'value' => $result['mysqls'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $mysqls_ul + ), + 'phpenabled' => array( + 'label' => $lng['admin']['phpenabled'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['phpenabled']) + ), + 'perlenabled' => array( + 'label' => $lng['admin']['perlenabled'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['perlenabled']) + ) + ) + ), + 'section_d' => array( + 'title' => $lng['admin']['movetoadmin'], + 'image' => 'icons/user_edit.png', + 'visible' => ($admin_select_cnt > 1), + 'fields' => array( + 'move_to_admin' => array( + 'label' => $lng['admin']['movecustomertoadmin'], + 'type' => 'select', + 'select_var' => $admin_select + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/formfield.admin.php b/lib/formfields/admin/formfield.admin.php deleted file mode 100644 index 0b847ac3..00000000 --- a/lib/formfields/admin/formfield.admin.php +++ /dev/null @@ -1,236 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'accountdata' => array( - 'title' => $lng['admin']['accountdata'], - 'fields' => array( - 'loginname' => array( - 'label' => $lng['login']['username'], - 'type' => (isset($result['loginname'])) ? 'static' : 'text', - 'mandatory' => true, - ), - 'deactivated' => array( - 'label' => $lng['admin']['deactivated_user'], - 'type' => 'checkbox', - 'value' => '1', - 'sublabel' => $lng['panel']['yes'], - 'visible' => (!isset($result['adminid']) || (isset($result['adminid']) && $result['adminid'] != $userinfo['userid'])), - ), - 'admin_password' => array( - 'label' => $lng['login']['password'], - 'type' => 'password', - 'mandatory' => true, - 'autocomplete' => 'off' - ), - 'admin_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], - 'type' => 'text', - 'visible' => (Settings::Get('panel.password_regex') == ''), - 'value' => generatePassword(), - 'attributes' => array( - 'readonly' => true - ) - ), - 'def_language' => array( - 'label' => $lng['login']['language'], - 'type' => 'select', - 'generate' => 'languages', - 'selected' => Settings::Get('panel.standardlanguage') - ) - ) - ), - 'contactdata' => array( - 'title' => $lng['admin']['contactdata'], - 'fields' => array( - 'name' => array( - 'label' => $lng['customer']['name'], - 'type' => 'text', - 'mandatory' => true - ), - 'email' => array( - 'label' => $lng['customer']['email'], - 'type' => 'email', - 'mandatory' => true - ), - 'custom_notes' => array( - 'label' => $lng['usersettings']['custom_notes']['title'], - 'desc' => $lng['usersettings']['custom_notes']['description'], - 'type' => 'textarea', - 'attributes' => array( - 'cols' => 60, - 'rows' => 12 - ) - ), - 'custom_notes_show' => array( - 'label' => $lng['usersettings']['custom_notes']['show'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ) - ) - ), - 'servicedata' => array( - 'title' => $lng['admin']['servicedata'], - 'visible' => (!isset($result['adminid']) || (isset($result['adminid']) && $result['adminid'] != $userinfo['userid'])), - 'fields' => array( - 'ipaddress' => array( - 'label' => $lng['serversettings']['ipaddress']['title'], - 'type' => 'select', - 'values' => $ipaddress - ), - 'change_serversettings' => array( - 'label' => $lng['admin']['change_serversettings'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => 1 - ), - 'customers' => array( - 'label' => $lng['admin']['customers'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'customers_see_all' => array( - 'label' => $lng['admin']['customers_see_all'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ), - 'domains' => array( - 'label' => $lng['admin']['domains'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'domains_see_all' => array( - 'label' => $lng['admin']['domains_see_all'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ), - 'caneditphpsettings' => array( - 'label' => $lng['admin']['caneditphpsettings'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ), - 'diskspace' => array( - 'label' => $lng['customer']['diskspace'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 6 - ) - ), - 'traffic' => array( - 'label' => $lng['customer']['traffic'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 4 - ) - ), - 'subdomains' => array( - 'label' => $lng['customer']['subdomains'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'emails' => array( - 'label' => $lng['customer']['emails'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'email_accounts' => array( - 'label' => $lng['customer']['accounts'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'email_forwarders' => array( - 'label' => $lng['customer']['forwarders'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'email_quota' => array( - 'label' => $lng['customer']['email_quota'], - 'type' => 'textul', - 'value' => 0, - 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'ftps' => array( - 'label' => $lng['customer']['ftps'], - 'type' => 'textul', - 'value' => 0, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'tickets' => array( - 'label' => $lng['customer']['tickets'], - 'type' => 'textul', - 'value' => 0, - 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'tickets_see_all' => array( - 'label' => $lng['admin']['tickets_see_all'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ), - 'mysqls' => array( - 'label' => $lng['customer']['mysqls'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ) - ) - ) -); diff --git a/lib/formfields/admin/formfield.cronjobs.php b/lib/formfields/admin/formfield.cronjobs.php deleted file mode 100644 index ae8219c0..00000000 --- a/lib/formfields/admin/formfield.cronjobs.php +++ /dev/null @@ -1,42 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'section_a' => array( - 'fields' => array( - 'cronfile' => array( - 'label' => 'Cronjob', - 'type' => ($change_cronfile == 1 ? 'text' : 'static'), - ), - 'isactive' => array( - 'label' => $lng['admin']['activated'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => 1, - ), - 'interval_value' => array( - 'label' => $lng['cronjob']['cronjobintervalv'], - 'type' => 'text' - ), - 'interval_interval' => array( - 'label' => $lng['cronjob']['cronjobinterval'], - 'type' => 'select', - 'values' => $interval_interval - ) - ) - ) -); diff --git a/lib/formfields/admin/formfield.customer.php b/lib/formfields/admin/formfield.customer.php deleted file mode 100644 index a7053e9b..00000000 --- a/lib/formfields/admin/formfield.customer.php +++ /dev/null @@ -1,305 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'accountdata' => array( - 'title' => $lng['admin']['accountdata'], - 'fields' => array( - 'new_loginname' => array( - 'label' => $lng['login']['username'], - 'type' => 'text', - 'visible' => 'new' - ), - 'loginname' => array( - 'label' => $lng['login']['username'], - 'type' => 'static', - 'visible' => 'edit' - ), - 'documentroot' => array( - 'label' => $lng['customer']['documentroot'], - 'type' => 'static', - 'visible' => 'edit' - ), - 'createstdsubdomain' => array( - 'label' => $lng['admin']['stdsubdomain_add'].'?', - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'store_defaultindex' => array( - 'label' => $lng['admin']['store_defaultindex'].'?', - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'visible' => 'new', - 'attributes' => array( - 'checked' => true - ) - ), - 'deactivated' => array( - 'label' => $lng['admin']['deactivated_user'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'visible' => 'edit' - ), - 'new_customer_password' => array( - 'label' => $lng['login']['password'], - 'type' => 'password', - 'attributes' => array( - 'autocomplete' => 'off' - ) - ), - 'new_customer_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], - 'type' => 'text', - 'visible' => (Settings::Get('panel.password_regex') == ''), - 'value' => generatePassword(), - 'attributes' => array( - 'readonly' => true - ) - ), - 'sendpassword' => array( - 'label' => $lng['admin']['sendpassword'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'visible' => 'new', - 'attributes' => array( - 'checked' => true - ) - ), - 'def_language' => array( - 'label' => $lng['login']['language'], - 'type' => 'select', - 'generate' => 'languages', - 'selected' => Settings::Get('panel.standardlanguage'), - ) - ) - ), - 'contactdata' => array( - 'title' => $lng['admin']['contactdata'], - 'fields' => array( - 'gender' => array( - 'label' => $lng['gender']['title'], - 'type' => 'select', - 'generate' => 'genders', - 'selected' => '0' - ), - 'name' => array( - 'label' => $lng['customer']['name'], - 'type' => 'text', - 'mandatory_ex' => true - ), - 'firstname' => array( - 'label' => $lng['customer']['firstname'], - 'type' => 'text', - 'mandatory_ex' => true - ), - 'company' => array( - 'label' => $lng['customer']['company'], - 'type' => 'text', - 'mandatory_ex' => true - ), - 'street' => array( - 'label' => $lng['customer']['street'], - 'type' => 'text' - ), - 'zipcode' => array( - 'label' => $lng['customer']['zipcode'], - 'type' => 'text' - ), - 'city' => array( - 'label' => $lng['customer']['city'], - 'type' => 'text' - ), - 'phone' => array( - 'label' => $lng['customer']['phone'], - 'type' => 'text' - ), - 'fax' => array( - 'label' => $lng['customer']['fax'], - 'type' => 'text' - ), - 'email' => array( - 'label' => $lng['customer']['email'], - 'type' => 'email', - 'mandatory' => true - ), - 'customernumber' => array( - 'label' => $lng['customer']['customernumber'], - 'type' => 'text' - ), - 'custom_notes' => array( - 'label' => $lng['usersettings']['custom_notes']['title'], - 'desc' => $lng['usersettings']['custom_notes']['description'], - 'type' => 'textarea', - 'attributes' => array( - 'cols' => 60, - 'rows' => 12 - ) - ), - 'custom_notes_show' => array( - 'label' => $lng['usersettings']['custom_notes']['show'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ) - ) - ), - 'servicedata' => array( - 'title' => $lng['admin']['servicedata'], - 'fields' => array( - 'diskspace' => array( - 'label' => $lng['customer']['diskspace'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 6, - ) - ), - 'traffic' => array( - 'label' => $lng['customer']['traffic'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 4, - ) - ), - 'subdomains' => array( - 'label' => $lng['customer']['subdomains'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'emails' => array( - 'label' => $lng['customer']['emails'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'email_accounts' => array( - 'label' => $lng['customer']['accounts'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'email_forwarders' => array( - 'label' => $lng['customer']['forwarders'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'email_quota' => array( - 'label' => $lng['customer']['email_quota'], - 'type' => 'textul', - 'value' => 0, - 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'email_imap' => array( - 'label' => $lng['customer']['email_imap'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'email_pop3' => array( - 'label' => $lng['customer']['email_pop3'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'ftps' => array( - 'label' => $lng['customer']['ftps'], - 'type' => 'textul', - 'value' => 0, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'tickets' => array( - 'label' => $lng['customer']['tickets'], - 'type' => 'textul', - 'value' => 0, - 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'mysqls' => array( - 'label' => $lng['customer']['mysqls'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'phpenabled' => array( - 'label' => $lng['admin']['phpenabled'].'?', - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'perlenabled' => array( - 'label' => $lng['admin']['perlenabled'].'?', - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - ) - ) - ), - 'movetoadmin' => array( - 'title' => $lng['admin']['movetoadmin'], - 'visible' => (isset($admin_select_cnt) && $admin_select_cnt > 1 && isset($result['loginname'])), - 'fields' => array( - 'move_to_admin' => array( - 'label' => $lng['admin']['movecustomertoadmin'], - 'type' => 'select', - 'values' => (isset($admin_select)) ? $admin_select : null - ) - ) - ) -); diff --git a/lib/formfields/admin/formfield.ipsandports.php b/lib/formfields/admin/formfield.ipsandports.php deleted file mode 100644 index fd09f42e..00000000 --- a/lib/formfields/admin/formfield.ipsandports.php +++ /dev/null @@ -1,126 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'section_a' => array( - 'title' => $lng['admin']['ipsandports']['ipandport'], - 'fields' => array( - 'ip' => array( - 'label' => $lng['admin']['ipsandports']['ip'], - 'type' => 'text' - ), - 'port' => array( - 'label' => $lng['admin']['ipsandports']['port'], - 'type' => 'text', - 'size' => 5 - ) - ) - ), - 'section_b' => array( - 'title' => $lng['admin']['ipsandports']['webserverdefaultconfig'], - 'fields' => array( - 'listen_statement' => array( - 'label' => $lng['admin']['ipsandports']['create_listen_statement'], - 'type' => 'checkbox', - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'namevirtualhost_statement' => array( - 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], - 'type' => 'checkbox', - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'vhostcontainer' => array( - 'label' => $lng['admin']['ipsandports']['create_vhostcontainer'], - 'type' => 'checkbox', - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'docroot' => array( - 'label' => $lng['admin']['ipsandports']['docroot']['title'], - 'desc' => $lng['admin']['ipsandports']['docroot']['description'], - 'type' => 'text' - ), - 'specialsettings' => array( - 'label' => $lng['admin']['ownvhostsettings'], - 'desc' => $lng['serversettings']['default_vhostconf']['description'], - 'type' => 'textarea', - 'attributes' => array( - 'cols' => 60, - 'rows' => 12 - ) - ), - 'vhostcontainer_servername_statement' => array( - 'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'], - 'type' => 'checkbox', - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ) - ) - ), - 'section_c' => array( - 'title' => $lng['admin']['ipsandports']['webserverdomainconfig'], - 'fields' => array( - 'default_vhostconf_domain' => array( - 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], - 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'], - 'type' => 'textarea', - 'attributes' => array( - 'cols' => 60, - 'rows' => 12 - ) - ) - ) - ), - 'section_d' => array( - 'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'], - 'visible' => (Settings::Get('system.use_ssl') == 1 ? true : false), - 'fields' => array( - 'ssl' => array( - 'label' => $lng['admin']['ipsandports']['enable_ssl'], - 'type' => 'checkbox', - 'value' => '1' - ), - 'ssl_cert_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_cert_file'], - 'type' => 'text' - ), - 'ssl_key_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_key_file'], - 'type' => 'text' - ), - 'ssl_ca_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_ca_file'], - 'type' => 'text' - ), - 'ssl_cert_chainfile' => array( - 'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['title'], - 'desc' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['description'], - 'type' => 'text' - ) - ) - ) -); diff --git a/lib/formfields/admin/formfield.phpconfig.php b/lib/formfields/admin/formfield.phpconfig.php deleted file mode 100644 index 86f7e5cc..00000000 --- a/lib/formfields/admin/formfield.phpconfig.php +++ /dev/null @@ -1,92 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'section_a' => array( - 'title' => $lng['admin']['phpsettings']['addsettings'], - 'fields' => array( - 'description' => array( - 'label' => $lng['admin']['phpsettings']['description'], - 'type' => 'text', - 'attributes' => array( - 'maxlength' => 50 - ) - ), - 'binary' => array( - 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['binary'], - 'type' => 'text', - 'value' => '/usr/bin/php-cgi', - 'attributes' => array( - 'maxlength' => 255 - ) - ), - 'file_extensions' => array( - 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['file_extensions'], - 'desc' => $lng['admin']['phpsettings']['file_extensions_note'], - 'type' => 'text', - 'value' => 'php', - 'attributes' => array( - 'maxlength' => 255 - ) - ), - 'mod_fcgid_starter' => array( - 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['mod_fcgid_starter']['title'], - 'type' => 'text' - ), - 'mod_fcgid_maxrequests' => array( - 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], - 'type' => 'text' - ), - 'fpm_slowlog' => array( - 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['enable_slowlog'], - 'type' => 'checkbox', - 'value' => '1' - ), - 'fpm_reqterm' => array( - 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['request_terminate_timeout'], - 'type' => 'text', - 'value' => '60s', - 'attributes' => array( - 'maxlength' => 10 - ) - ), - 'fpm_reqslow' => array( - 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'], - 'type' => 'text', - 'maxlength' => 10, - 'value' => '5s' - ), - 'phpsettings' => array( - 'style' => 'align-top', - 'label' => $lng['admin']['phpsettings']['phpinisettings'], - 'type' => 'textarea', - 'value' => $result['phpsettings'], - 'attributes' => array( - 'cols' => 80, - 'rows' => 20 - ) - ) - ) - ) -); diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php new file mode 100644 index 00000000..289a30d4 --- /dev/null +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php @@ -0,0 +1,137 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'ipsandports_add' => array( + 'title' => $lng['admin']['ipsandports']['add'], + 'image' => 'icons/ipsports_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['ipsandports']['ipandport'], + 'image' => 'icons/ipsports_add.png', + 'fields' => array( + 'ip' => array( + 'label' => $lng['admin']['ipsandports']['ip'], + 'type' => 'text' + ), + 'port' => array( + 'label' => $lng['admin']['ipsandports']['port'], + 'type' => 'text', + 'size' => 5 + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['ipsandports']['webserverdefaultconfig'], + 'image' => 'icons/ipsports_add.png', + 'fields' => array( + 'listen_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_listen_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'namevirtualhost_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'vhostcontainer' => array( + 'label' => $lng['admin']['ipsandports']['create_vhostcontainer'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'docroot' => array( + 'label' => $lng['admin']['ipsandports']['docroot']['title'], + 'desc' => $lng['admin']['ipsandports']['docroot']['description'], + 'type' => 'text' + ), + 'specialsettings' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['ownvhostsettings'], + 'desc' => $lng['serversettings']['default_vhostconf']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12 + ), + 'vhostcontainer_servername_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['ipsandports']['webserverdomainconfig'], + 'image' => 'icons/ipsports_add.png', + 'fields' => array( + 'default_vhostconf_domain' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], + 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12 + ) + ) + ), + 'section_d' => array( + 'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'], + 'image' => 'icons/ipsports_add.png', + 'visible' => (Settings::Get('system.use_ssl') == 1 ? true : false), + 'fields' => array( + 'ssl' => array( + 'label' => $lng['admin']['ipsandports']['enable_ssl'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'ssl_cert_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_cert_file'], + 'type' => 'text' + ), + 'ssl_key_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_key_file'], + 'type' => 'text' + ), + 'ssl_ca_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_ca_file'], + 'type' => 'text' + ), + 'ssl_cert_chainfile' => array( + 'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['title'], + 'desc' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['description'], + 'type' => 'text' + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php new file mode 100644 index 00000000..49dd8bf4 --- /dev/null +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php @@ -0,0 +1,146 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'ipsandports_edit' => array( + 'title' => $lng['admin']['ipsandports']['edit'], + 'image' => 'icons/ipsports_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['ipsandports']['ipandport'], + 'image' => 'icons/ipsports_add.png', + 'fields' => array( + 'ip' => array( + 'label' => $lng['admin']['ipsandports']['ip'], + 'type' => 'text', + 'value' => $result['ip'] + ), + 'port' => array( + 'label' => $lng['admin']['ipsandports']['port'], + 'type' => 'text', + 'value' => $result['port'], + 'size' => 5 + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['ipsandports']['webserverdefaultconfig'], + 'image' => 'icons/ipsports_edit.png', + 'fields' => array( + 'listen_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_listen_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['listen_statement']) + ), + 'namevirtualhost_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['namevirtualhost_statement']) + ), + 'vhostcontainer' => array( + 'label' => $lng['admin']['ipsandports']['create_vhostcontainer'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['vhostcontainer']) + ), + 'docroot' => array( + 'label' => $lng['admin']['ipsandports']['docroot']['title'], + 'desc' => $lng['admin']['ipsandports']['docroot']['description'], + 'type' => 'text', + 'value' => $result['docroot'] + ), + 'specialsettings' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['ownvhostsettings'], + 'desc' => $lng['serversettings']['default_vhostconf']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12, + 'value' => $result['specialsettings'] + ), + 'vhostcontainer_servername_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['vhostcontainer_servername_statement']) + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['ipsandports']['webserverdomainconfig'], + 'image' => 'icons/ipsports_edit.png', + 'fields' => array( + 'default_vhostconf_domain' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], + 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12, + 'value' => $result['default_vhostconf_domain'] + ) + ) + ), + 'section_d' => array( + 'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'], + 'image' => 'icons/ipsports_edit.png', + 'visible' => (Settings::Get('system.use_ssl') == 1 ? true : false), + 'fields' => array( + 'ssl' => array( + 'label' => $lng['admin']['ipsandports']['enable_ssl'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['ssl']) + ), + 'ssl_cert_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_cert_file'], + 'type' => 'text', + 'value' => $result['ssl_cert_file'] + ), + 'ssl_key_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_key_file'], + 'type' => 'text', + 'value' => $result['ssl_key_file'] + ), + 'ssl_ca_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_ca_file'], + 'type' => 'text', + 'value' => $result['ssl_ca_file'] + ), + 'ssl_cert_chainfile' => array( + 'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['title'], + 'desc' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['description'], + 'type' => 'text', + 'value' => $result['ssl_cert_chainfile'] + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php b/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php new file mode 100644 index 00000000..bbad9529 --- /dev/null +++ b/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php @@ -0,0 +1,92 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'phpconfig_add' => array( + 'title' => $lng['admin']['phpsettings']['addsettings'], + 'image' => 'icons/phpsettings_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['phpsettings']['addsettings'], + 'image' => 'icons/phpsettings_add.png', + 'fields' => array( + 'description' => array( + 'label' => $lng['admin']['phpsettings']['description'], + 'type' => 'text', + 'maxlength' => 50 + ), + 'binary' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['binary'], + 'type' => 'text', + 'maxlength' => 255, + 'value' => '/usr/bin/php-cgi' + ), + 'file_extensions' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['file_extensions'], + 'desc' => $lng['admin']['phpsettings']['file_extensions_note'], + 'type' => 'text', + 'maxlength' => 255, + 'value' => 'php' + ), + 'mod_fcgid_starter' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['mod_fcgid_starter']['title'], + 'type' => 'text' + ), + 'mod_fcgid_maxrequests' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], + 'type' => 'text' + ), + 'phpfpm_enable_slowlog' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['enable_slowlog'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'phpfpm_reqtermtimeout' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['request_terminate_timeout'], + 'type' => 'text', + 'maxlength' => 10, + 'value' => '60s' + ), + 'phpfpm_reqslowtimeout' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'], + 'type' => 'text', + 'maxlength' => 10, + 'value' => '5s' + ), + 'phpsettings' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['phpsettings']['phpinisettings'], + 'type' => 'textarea', + 'cols' => 80, + 'rows' => 20, + 'value' => $result['phpsettings'] + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php b/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php new file mode 100644 index 00000000..83dbbd44 --- /dev/null +++ b/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php @@ -0,0 +1,95 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'phpconfig_edit' => array( + 'title' => $lng['admin']['phpsettings']['editsettings'], + 'image' => 'icons/phpsettings_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['phpsettings']['editsettings'], + 'image' => 'icons/phpsettings_edit.png', + 'fields' => array( + 'description' => array( + 'label' => $lng['admin']['phpsettings']['description'], + 'type' => 'text', + 'maxlength' => 50, + 'value' => $result['description'] + ), + 'binary' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['binary'], + 'type' => 'text', + 'maxlength' => 255, + 'value' => $result['binary'] + ), + 'file_extensions' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['file_extensions'], + 'desc' => $lng['admin']['phpsettings']['file_extensions_note'], + 'type' => 'text', + 'maxlength' => 255, + 'value' => $result['file_extensions'] + ), + 'mod_fcgid_starter' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['mod_fcgid_starter']['title'], + 'type' => 'text', + 'value' => ((int)$result['mod_fcgid_starter'] != - 1 ? $result['mod_fcgid_starter'] : '') + ), + 'mod_fcgid_maxrequests' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], + 'type' => 'text', + 'value' => ((int)$result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '') + ), + 'phpfpm_enable_slowlog' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['enable_slowlog'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['fpm_slowlog']) + ), + 'phpfpm_reqtermtimeout' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['request_terminate_timeout'], + 'type' => 'text', + 'maxlength' => 10, + 'value' => $result['fpm_reqterm'] + ), + 'phpfpm_reqslowtimeout' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'], + 'type' => 'text', + 'maxlength' => 10, + 'value' => $result['fpm_reqslow'] + ), + 'phpsettings' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['phpsettings']['phpinisettings'], + 'type' => 'textarea', + 'cols' => 80, + 'rows' => 20, + 'value' => $result['phpsettings'] + ) + ) + ) + ) + ) +); diff --git a/templates/Sparkle/admin/admins/admins_add.tpl b/templates/Sparkle/admin/admins/admins_add.tpl index 8b4257ed..cd03236c 100644 --- a/templates/Sparkle/admin/admins/admins_add.tpl +++ b/templates/Sparkle/admin/admins/admins_add.tpl @@ -2,8 +2,8 @@ $header

-   - {$lng['admin']['admin_add']} + {$title}  + {$title}

diff --git a/templates/Sparkle/admin/admins/admins_edit.tpl b/templates/Sparkle/admin/admins/admins_edit.tpl index d170bbe5..9b58bd70 100644 --- a/templates/Sparkle/admin/admins/admins_edit.tpl +++ b/templates/Sparkle/admin/admins/admins_edit.tpl @@ -2,7 +2,7 @@ $header

-  {$lng['admin']['admin_edit']} + {$title} {$title}

diff --git a/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl b/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl index 79d573ed..ed0fa55c 100644 --- a/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl +++ b/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl @@ -2,8 +2,8 @@ $header

-   - {$lng['admin']['cronjob_edit']} + {$title}  + {$title}

diff --git a/templates/Sparkle/admin/customers/customers_add.tpl b/templates/Sparkle/admin/customers/customers_add.tpl index affa9b24..ffabf7d9 100644 --- a/templates/Sparkle/admin/customers/customers_add.tpl +++ b/templates/Sparkle/admin/customers/customers_add.tpl @@ -2,8 +2,8 @@ $header

- {$lng['admin']['customer_add']}  - {$lng['admin']['customer_add']} + {$title}  + {$title}

diff --git a/templates/Sparkle/admin/customers/customers_edit.tpl b/templates/Sparkle/admin/customers/customers_edit.tpl index 0826e57d..f9d751ec 100644 --- a/templates/Sparkle/admin/customers/customers_edit.tpl +++ b/templates/Sparkle/admin/customers/customers_edit.tpl @@ -2,8 +2,8 @@ $header

-   - {$lng['admin']['customer_edit']} + {$title}  + {$title}

diff --git a/templates/Sparkle/admin/domains/domains_import.tpl b/templates/Sparkle/admin/domains/domains_import.tpl index fb653c5e..6d24d003 100644 --- a/templates/Sparkle/admin/domains/domains_import.tpl +++ b/templates/Sparkle/admin/domains/domains_import.tpl @@ -3,7 +3,7 @@ $header

{$title}  - {$lng['domains']['domain_import']} + {$title}

diff --git a/templates/Sparkle/customer/mysql/mysqls_add.tpl b/templates/Sparkle/customer/mysql/mysqls_add.tpl index a147c78a..3fa467f7 100644 --- a/templates/Sparkle/customer/mysql/mysqls_add.tpl +++ b/templates/Sparkle/customer/mysql/mysqls_add.tpl @@ -2,8 +2,8 @@ $header

-   - {$lng['mysql']['database_create']} + {$title}  + {$title}

diff --git a/templates/Sparkle/customer/mysql/mysqls_edit.tpl b/templates/Sparkle/customer/mysql/mysqls_edit.tpl index 732f931d..7beacda2 100644 --- a/templates/Sparkle/customer/mysql/mysqls_edit.tpl +++ b/templates/Sparkle/customer/mysql/mysqls_edit.tpl @@ -2,8 +2,8 @@ $header

-   - {$lng['mysql']['database_edit']} + {$title}  + {$title}

diff --git a/templates/Sparkle/htmlform/checkbox.tpl b/templates/Sparkle/htmlform/checkbox.tpl deleted file mode 100644 index ca710a8d..00000000 --- a/templates/Sparkle/htmlform/checkbox.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/templates/Sparkle/htmlform/form_end.tpl b/templates/Sparkle/htmlform/form_end.tpl deleted file mode 100644 index 263ce363..00000000 --- a/templates/Sparkle/htmlform/form_end.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/templates/Sparkle/htmlform/group_heading.tpl b/templates/Sparkle/htmlform/group_heading.tpl deleted file mode 100644 index 8336b673..00000000 --- a/templates/Sparkle/htmlform/group_heading.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - {$grouptitle} - - - - - - diff --git a/templates/Sparkle/htmlform/input.tpl b/templates/Sparkle/htmlform/input.tpl deleted file mode 100644 index 90a84b93..00000000 --- a/templates/Sparkle/htmlform/input.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/templates/Sparkle/htmlform/inputul.tpl b/templates/Sparkle/htmlform/inputul.tpl deleted file mode 100644 index 89b8130a..00000000 --- a/templates/Sparkle/htmlform/inputul.tpl +++ /dev/null @@ -1 +0,0 @@ -  diff --git a/templates/Sparkle/htmlform/select.tpl b/templates/Sparkle/htmlform/select.tpl deleted file mode 100644 index 0225e3e5..00000000 --- a/templates/Sparkle/htmlform/select.tpl +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/templates/Sparkle/htmlform/skeleton.tpl b/templates/Sparkle/htmlform/skeleton.tpl deleted file mode 100644 index cc6b167f..00000000 --- a/templates/Sparkle/htmlform/skeleton.tpl +++ /dev/null @@ -1,4 +0,0 @@ - -
{$desc} - {$field} - diff --git a/templates/Sparkle/htmlform/skeleton_checkbox.tpl b/templates/Sparkle/htmlform/skeleton_checkbox.tpl deleted file mode 100644 index cc6b167f..00000000 --- a/templates/Sparkle/htmlform/skeleton_checkbox.tpl +++ /dev/null @@ -1,4 +0,0 @@ - -
{$desc} - {$field} - diff --git a/templates/Sparkle/htmlform/static.tpl b/templates/Sparkle/htmlform/static.tpl deleted file mode 100644 index 3d5dc446..00000000 --- a/templates/Sparkle/htmlform/static.tpl +++ /dev/null @@ -1 +0,0 @@ -{$value} diff --git a/templates/Sparkle/htmlform/textarea.tpl b/templates/Sparkle/htmlform/textarea.tpl deleted file mode 100644 index 3e1509a8..00000000 --- a/templates/Sparkle/htmlform/textarea.tpl +++ /dev/null @@ -1 +0,0 @@ - From cd1e03c033a6505c64b162c7dde481c6a11c2cbd Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 10 Jun 2015 15:31:15 +0200 Subject: [PATCH 02/34] fix openbasedir-path when using mod_php, fixes #1507 Signed-off-by: Michael Kaufmann (d00p) --- scripts/jobs/cron_tasks.inc.http.10.apache.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 9d6887b9..d186ff5f 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -392,8 +392,16 @@ class apache { if ($domain['phpenabled'] == '1') { // This vHost has PHP enabled and we are using the regular mod_php - if ($domain['openbasedir'] == '1') { - $_phpappendopenbasedir = appendOpenBasedirPath($domain['customerroot'], true); + if ($domain['openbasedir'] == '1') + { + if ($domain['openbasedir_path'] == '1' || strstr($domain['documentroot'], ":") !== false) + { + $_phpappendopenbasedir = appendOpenBasedirPath($domain['customerroot'], true); + } + else + { + $_phpappendopenbasedir = appendOpenBasedirPath($domain['documentroot'], true); + } $_custom_openbasedir = explode(':', Settings::Get('system.phpappendopenbasedir')); foreach ($_custom_openbasedir as $cobd) { From 340f3bcf8ceaaaae06ac5524421b904de33c24fd Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Wed, 10 Jun 2015 15:41:51 +0200 Subject: [PATCH 03/34] Add missing LSB tags, thanks to Wuzaa, fixes #1492 Signed-off-by: Roman Schmerold (BNoiZe) --- lib/configfiles/precise.xml | 10 ++++++++++ lib/configfiles/trusty.xml | 10 ++++++++++ lib/configfiles/wheezy.xml | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml index 77cc03c1..363d6329 100644 --- a/lib/configfiles/precise.xml +++ b/lib/configfiles/precise.xml @@ -239,6 +239,16 @@ fastcgi_param REDIRECT_STATUS 200; Date: Thu, 11 Jun 2015 20:59:41 +0200 Subject: [PATCH 04/34] adjust fastcgi conf for php-fpm when using apache-2.4 Signed-off-by: Michael Kaufmann (d00p) --- lib/configfiles/gentoo.xml | 20 ++++++++++++++++++-- lib/configfiles/trusty.xml | 20 ++++++++++++++++++-- lib/configfiles/wheezy.xml | 20 ++++++++++++++++++-- 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index db0f1b24..6f3deb08 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -68,8 +68,24 @@ - //service[@type='http']/daemon[@name='apache'][@version='2.2'] - + //service[@type='http']/general/commands + + {{settings.phpfpm.enabled}} + + + FastCgiIpcDir + + + Require all granted + Require env REDIRECT_STATUS + + +]]> + + + + diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml index 7ba14f11..adb32a00 100644 --- a/lib/configfiles/trusty.xml +++ b/lib/configfiles/trusty.xml @@ -68,8 +68,24 @@ - //service[@type='http']/daemon[@name='apache'][@version='2.2'] - + + //service[@type='http']/general/commands + + {{settings.phpfpm.enabled}} + + + FastCgiIpcDir + + + Require all granted + Require env REDIRECT_STATUS + + +]]> + + + diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml index 040f37fc..1a929fb7 100644 --- a/lib/configfiles/wheezy.xml +++ b/lib/configfiles/wheezy.xml @@ -68,8 +68,24 @@ - //service[@type='http']/daemon[@name='apache'][@version='2.2'] - + + //service[@type='http']/general/commands + + {{settings.phpfpm.enabled}} + + + FastCgiIpcDir + + + Require all granted + Require env REDIRECT_STATUS + + +]]> + + + From a1337df44f463f1a7c6a60ba40cfe2b92f794784 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 11 Jun 2015 21:00:45 +0200 Subject: [PATCH 05/34] do not show error-trace / sensitive data when db-server is down or login credentials are wrong Signed-off-by: Michael Kaufmann (d00p) --- lib/classes/database/class.Database.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/classes/database/class.Database.php b/lib/classes/database/class.Database.php index 7a5ccc81..7c39ecfb 100644 --- a/lib/classes/database/class.Database.php +++ b/lib/classes/database/class.Database.php @@ -365,6 +365,11 @@ class Database { $error_trace = str_replace($sql['password'], 'DB_UNPRIV_PWD', $error_trace); $error_trace = str_replace($sql_root[0]['password'], 'DB_ROOT_PWD', $error_trace); + if ($error->getCode() == 2003) { + $error_message = "Unable to connect to database. Either the mysql-server is not running or your user/password is wrong."; + $error_trace = ""; + } + // clean up sensitive data unset($sql); unset($sql_root); From 95475f7b520a266e7e7c4e5d767ef0e231efa800 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 8 Jul 2015 16:01:55 +0200 Subject: [PATCH 06/34] change default ssl-cipher-list; minor changes in config-xmls, fixes #1541 Signed-off-by: Michael Kaufmann (d00p) --- actions/admin/settings/131.ssl.php | 2 +- install/froxlor.sql | 2 +- lib/configfiles/gentoo.xml | 4 +- lib/configfiles/rhel_centos.xml | 2 +- lib/configfiles/wheezy.xml | 381 ----------------------------- lng/english.lng.php | 2 +- lng/german.lng.php | 2 +- 7 files changed, 7 insertions(+), 388 deletions(-) diff --git a/actions/admin/settings/131.ssl.php b/actions/admin/settings/131.ssl.php index 06895c9d..016de801 100644 --- a/actions/admin/settings/131.ssl.php +++ b/actions/admin/settings/131.ssl.php @@ -37,7 +37,7 @@ return array( 'varname' => 'ssl_cipher_list', 'type' => 'string', 'string_emptyallowed' => false, - 'default' => 'ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH', + 'default' => 'ECDH+AESGCM:ECDH+AES256:!aNULL:!MD5:!DSS:!DH:!AES128', 'save_method' => 'storeSettingField', ), 'system_ssl_cert_file' => array( diff --git a/install/froxlor.sql b/install/froxlor.sql index b0a8c805..bbbb2b81 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -486,7 +486,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'mod_fcgid_defaultini_ownvhost', '2'), ('system', 'awstats_icons', '/usr/share/awstats/icon/'), ('system', 'ssl_cert_chainfile', ''), - ('system', 'ssl_cipher_list', 'ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH'), + ('system', 'ssl_cipher_list', 'ECDH+AESGCM:ECDH+AES256:!aNULL:!MD5:!DSS:!DH:!AES128'), ('system', 'nginx_php_backend', '127.0.0.1:8888'), ('system', 'perl_server', 'unix:/var/run/nginx/cgiwrap-dispatch.sock'), ('system', 'phpreload_command', ''), diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index 6f3deb08..d70e79ac 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -2692,8 +2692,8 @@ SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6} #TLSLog /var/log/proftpd-tls.log #TLSProtocol SSLv23 #TLSTimeoutHandshake 120 -# Really important for WinClients -#TLSOptions NoCertRequest +# Really important for WinClients and some clients +#TLSOptions NoCertRequest NoSessionReuseRequired #TLSRSACertificateFile /etc/ssl/server/.crt #TLSRSACertificateKeyFile /etc/ssl/server/.key # Authenticate client that want to use FTP over TLS? diff --git a/lib/configfiles/rhel_centos.xml b/lib/configfiles/rhel_centos.xml index 1ac18c30..b5131138 100644 --- a/lib/configfiles/rhel_centos.xml +++ b/lib/configfiles/rhel_centos.xml @@ -2120,7 +2120,7 @@ ControlsLog /var/log/proftpd/controls.log TLSRSACertificateFile /etc/pki/tls/certs/proftpd.pem TLSRSACertificateKeyFile /etc/pki/tls/certs/proftpd.pem TLSCipherSuite ALL:!ADH:!DES - TLSOptions NoCertRequest + TLSOptions NoCertRequest NoSessionReuseRequired TLSVerifyClient off #TLSRenegotiate ctrl 3600 data 512000 required off timeout 300 TLSLog /var/log/proftpd/tls.log diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml index 1a929fb7..640cf702 100644 --- a/lib/configfiles/wheezy.xml +++ b/lib/configfiles/wheezy.xml @@ -2862,387 +2862,6 @@ auth_mechanisms = plain login #!include auth-deny.conf.ext #!include auth-master.conf.ext -#!include auth-system.conf.ext -!include auth-sql.conf.ext -#!include auth-ldap.conf.ext -#!include auth-passwdfile.conf.ext -#!include auth-checkpassword.conf.ext -#!include auth-vpopmail.conf.ext -#!include auth-static.conf.ext -]]> - - - - to select which instance is used (an alternative -# to -c ). The instance name is also added to Dovecot processes -# in ps output. -#instance_name = dovecot - -# Greeting message for clients. -#login_greeting = Dovecot ready. - -# Space separated list of trusted network ranges. Connections from these -# IPs are allowed to override their IP addresses and ports (for logging and -# for authentication checks). disable_plaintext_auth is also ignored for -# these networks. Typically you'd specify your IMAP proxy servers here. -#login_trusted_networks = - -# Sepace separated list of login access check sockets (e.g. tcpwrap) -#login_access_sockets = - -# With proxy_maybe=yes if proxy destination matches any of these IPs, don't do -# proxying. This isn't necessary normally, but may be useful if the destination -# IP is e.g. a load balancer's IP. -#auth_proxy_self = - -# Show more verbose process titles (in ps). Currently shows user name and -# IP address. Useful for seeing who are actually using the IMAP processes -# (eg. shared mailboxes or if same uid is used for multiple accounts). -#verbose_proctitle = no - -# Should all processes be killed when Dovecot master process shuts down. -# Setting this to "no" means that Dovecot can be upgraded without -# forcing existing client connections to close (although that could also be -# a problem if the upgrade is e.g. because of a security fix). -#shutdown_clients = yes - -# If non-zero, run mail commands via this many connections to doveadm server, -# instead of running them directly in the same process. -#doveadm_worker_count = 0 -# UNIX socket or host:port used for connecting to doveadm server -#doveadm_socket_path = doveadm-server - -# Space separated list of environment variables that are preserved on Dovecot -# startup and passed down to all of its child processes. You can also give -# key=value pairs to always set specific settings. -#import_environment = TZ - -## -## Dictionary server settings -## - -# Dictionary can be used to store key=value lists. This is used by several -# plugins. The dictionary can be accessed either directly or though a -# dictionary server. The following dict block maps dictionary names to URIs -# when the server is used. These can then be referenced using URIs in format -# "proxy::". - -dict { - #quota = mysql:/etc/dovecot/dovecot-dict-sql.conf.ext - #expire = sqlite:/etc/dovecot/dovecot-dict-sql.conf.ext -} - -# Most of the actual configuration gets included below. The filenames are -# first sorted by their ASCII value and parsed in that order. The 00-prefixes -# in filenames are intended to make it easier to understand the ordering. -!include conf.d/*.conf - -# A config file can also tried to be included without giving an error if -# it's not found: -!include_try local.conf -]]> - - - - dbname= user= password= - -# Default password scheme. -# -# List of supported schemes is in -# http://wiki2.dovecot.org/Authentication/PasswordSchemes -# -default_pass_scheme = CRYPT - -# passdb query to retrieve the password. It can return fields: -# password - The user's password. This field must be returned. -# user - user@domain from the database. Needed with case-insensitive lookups. -# username and domain - An alternative way to represent the "user" field. -# -# The "user" field is often necessary with case-insensitive lookups to avoid -# e.g. "name" and "nAme" logins creating two different mail directories. If -# your user and domain names are in separate fields, you can return "username" -# and "domain" fields instead of "user". -# -# The query can also return other fields which have a special meaning, see -# http://wiki2.dovecot.org/PasswordDatabase/ExtraFields -# -# Commonly used available substitutions (see http://wiki2.dovecot.org/Variables -# for full list): -# %u = entire user@domain -# %n = user part of user@domain -# %d = domain part of user@domain -# -# Note that these can be used only as input to SQL query. If the query outputs -# any of these substitutions, they're not touched. Otherwise it would be -# difficult to have eg. usernames containing '%' characters. -# -# Example: -# password_query = SELECT userid AS user, pw AS password \ -# FROM users WHERE userid = '%u' AND active = 'Y' -# -#password_query = \ -# SELECT username, domain, password \ -# FROM users WHERE username = '%n' AND domain = '%d' - -# userdb query to retrieve the user information. It can return fields: -# uid - System UID (overrides mail_uid setting) -# gid - System GID (overrides mail_gid setting) -# home - Home directory -# mail - Mail location (overrides mail_location setting) -# -# None of these are strictly required. If you use a single UID and GID, and -# home or mail directory fits to a template string, you could use userdb static -# instead. For a list of all fields that can be returned, see -# http://wiki2.dovecot.org/UserDatabase/ExtraFields -# -# Examples: -# user_query = SELECT home, uid, gid FROM users WHERE userid = '%u' -# user_query = SELECT dir AS home, user AS uid, group AS gid FROM users where userid = '%u' -# user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u' -# -#user_query = \ -# SELECT home, uid, gid \ -# FROM users WHERE username = '%n' AND domain = '%d' -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') - -# If you wish to avoid two SQL lookups (passdb + userdb), you can use -# userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll -# also have to return userdb fields in password_query prefixed with "userdb_" -# string. For example: -#password_query = \ -# SELECT userid AS user, password, \ -# home AS userdb_home, uid AS userdb_uid, gid AS userdb_gid \ -# FROM users WHERE userid = '%u' -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve') - -# Query to get a list of all usernames. -#iterate_query = SELECT username AS user FROM users -]]> - - - - to characters. For example "#@/@" means -# that '#' and '/' characters are translated to '@'. -#auth_username_translation = - -# Username formatting before it's looked up from databases. You can use -# the standard variables here, eg. %Lu would lowercase the username, %n would -# drop away the domain if it was given, or "%n-AT-%d" would change the '@' into -# "-AT-". This translation is done after auth_username_translation changes. -#auth_username_format = %Lu - -# If you want to allow master users to log in by specifying the master -# username within the normal username string (ie. not using SASL mechanism's -# support for it), you can specify the separator character here. The format -# is then . UW-IMAP uses "*" as the -# separator, so that could be a good choice. -#auth_master_user_separator = - -# Username to use for users logging in with ANONYMOUS SASL mechanism -#auth_anonymous_username = anonymous - -# Maximum number of dovecot-auth worker processes. They're used to execute -# blocking passdb and userdb queries (eg. MySQL and PAM). They're -# automatically created and destroyed as needed. -#auth_worker_max_count = 30 - -# Host name to use in GSSAPI principal names. The default is to use the -# name returned by gethostname(). Use "$ALL" (with quotes) to allow all keytab -# entries. -#auth_gssapi_hostname = - -# Kerberos keytab to use for the GSSAPI mechanism. Will use the system -# default (usually /etc/krb5.keytab) if not specified. You may need to change -# the auth service to run as root to be able to read this file. -#auth_krb5_keytab = - -# Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and -# ntlm_auth helper. -#auth_use_winbind = no - -# Path for Samba's ntlm_auth helper binary. -#auth_winbind_helper_path = /usr/bin/ntlm_auth - -# Time to delay before replying to failed authentications. -#auth_failure_delay = 2 secs - -# Require a valid SSL client certificate or the authentication fails. -#auth_ssl_require_client_cert = no - -# Take the username from client's SSL certificate, using -# X509_NAME_get_text_by_NID() which returns the subject's DN's -# CommonName. -#auth_ssl_username_from_cert = no - -# Space separated list of wanted authentication mechanisms: -# plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey -# gss-spnego -# NOTE: See also disable_plaintext_auth setting. -auth_mechanisms = plain login - -## -## Password and user databases -## - -# -# Password database is used to verify user's password (and nothing more). -# You can have multiple passdbs and userdbs. This is useful if you want to -# allow both system users (/etc/passwd) and virtual users to login without -# duplicating the system users into virtual database. -# -# -# -# User database specifies where mails are located and what user/group IDs -# own them. For single-UID configuration use "static" userdb. -# -# - -#!include auth-deny.conf.ext -#!include auth-master.conf.ext - #!include auth-system.conf.ext !include auth-sql.conf.ext #!include auth-ldap.conf.ext diff --git a/lng/english.lng.php b/lng/english.lng.php index fab1c54a..f698bb46 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1727,7 +1727,7 @@ $lng['domains']['serveraliasoption_www'] = 'WWW (www.domain.tld)'; $lng['domains']['serveraliasoption_none'] = 'No alias'; $lng['error']['givendirnotallowed'] = 'The given directory in field %s is not allowed.'; $lng['serversettings']['ssl']['ssl_cipher_list']['title'] = 'Configure the allowed SSL ciphers'; -$lng['serversettings']['ssl']['ssl_cipher_list']['description'] = 'This is a list of ciphers that you want (or don\'t want) to use when talking SSL. For a list of ciphers and how to include/exclude them, see sections "CIPHER LIST FORMAT" and "CIPHER STRINGS" on the man-page for ciphers.

Default value is:
ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH
'; +$lng['serversettings']['ssl']['ssl_cipher_list']['description'] = 'This is a list of ciphers that you want (or don\'t want) to use when talking SSL. For a list of ciphers and how to include/exclude them, see sections "CIPHER LIST FORMAT" and "CIPHER STRINGS" on the man-page for ciphers.

Default value is:
ECDH+AESGCM:ECDH+AES256:!aNULL:!MD5:!DSS:!DH:!AES128
'; // Added in Froxlor 0.9.31 $lng['panel']['dashboard'] = 'Dashboard'; diff --git a/lng/german.lng.php b/lng/german.lng.php index bd5e8027..80e8d5e6 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1454,7 +1454,7 @@ $lng['domains']['serveraliasoption_www'] = 'www (www.domain.tld)'; $lng['domains']['serveraliasoption_none'] = 'Kein Alias'; $lng['error']['givendirnotallowed'] = 'Das angegebene Verzeichnis im Feld %s ist nicht erlaubt.'; $lng['serversettings']['ssl']['ssl_cipher_list']['title'] = 'Erlaubte SSL Ciphers festlegen'; -$lng['serversettings']['ssl']['ssl_cipher_list']['description'] = 'Dies ist eine Liste von Ciphers die genutzt werden sollen (oder auch nicht genutzt werden sollen) wenn eine SSL Verbindung besteht. Eine Liste aller Ciphers und wie diese hinzugefรผgt/ausgeschlossen werden ist in den Abschnitten "CIPHER LIST FORMAT" und "CIPHER STRINGS" in der man-page fรผr Ciphers zu finden.

Standard-Wert ist:
ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH
'; +$lng['serversettings']['ssl']['ssl_cipher_list']['description'] = 'Dies ist eine Liste von Ciphers die genutzt werden sollen (oder auch nicht genutzt werden sollen) wenn eine SSL Verbindung besteht. Eine Liste aller Ciphers und wie diese hinzugefรผgt/ausgeschlossen werden ist in den Abschnitten "CIPHER LIST FORMAT" und "CIPHER STRINGS" in der man-page fรผr Ciphers zu finden.

Standard-Wert ist:
ECDH+AESGCM:ECDH+AES256:!aNULL:!MD5:!DSS:!DH:!AES128
'; // Added in Froxlor 0.9.31 $lng['panel']['dashboard'] = 'Dashboard'; From f4f131571534142cfcf9f98a85d863b12964d3eb Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 28 Jul 2015 08:23:10 +0200 Subject: [PATCH 07/34] fix undefined-indeces when search-result contained only subdomains in customer-domains Signed-off-by: Michael Kaufmann (d00p) --- customer_domains.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/customer_domains.php b/customer_domains.php index 8b139832..58ea32b1 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -102,6 +102,11 @@ if ($page == 'overview') { if ($row['parentdomainid'] == 0) { $domain_sort_array[$sortkey][$sortkey] = $row; } else { + // when searching and the results are subdomains only, we need to get + // the parent domain to this subdomain + if (!isset($domain_id_array[$row['parentdomainid']])) { + $domain_id_array[$row['parentdomainid']] = "[parent-domain]"; + } $domain_sort_array[$domain_id_array[$row['parentdomainid']]][$sortkey] = $row; } } @@ -117,13 +122,16 @@ if ($page == 'overview') { $i = 0; foreach ($domain_sort_array as $sortkey => $domain_array) { if ($paging->checkDisplay($i)) { - $row = htmlentities_array($domain_array[$sortkey]); - if (Settings::Get('system.awstats_enabled') == '1') { - $statsapp = 'awstats'; - } else { - $statsapp = 'webalizer'; + + if (isset($domain_array[$sortkey])) { + $row = htmlentities_array($domain_array[$sortkey]); + if (Settings::Get('system.awstats_enabled') == '1') { + $statsapp = 'awstats'; + } else { + $statsapp = 'webalizer'; + } + eval("\$domains.=\"" . getTemplate("domains/domains_delimiter") . "\";"); } - eval("\$domains.=\"" . getTemplate("domains/domains_delimiter") . "\";"); if ($paging->sortfield == 'd.domain' && $paging->sortorder == 'asc') { ksort($domain_array); From fce9de7372d248f45876d44b4e9045014ab458b3 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 28 Jul 2015 13:20:11 +0200 Subject: [PATCH 08/34] remove superfluous call to 'getDomainRedirectCode' as its been called before; allow changing of redirect-code when domain has 'ssl-redirect' = 1 --- customer_domains.php | 2 ++ scripts/jobs/cron_tasks.inc.http.10.apache.php | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/customer_domains.php b/customer_domains.php index 58ea32b1..416f3e4b 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -307,6 +307,7 @@ if ($page == 'overview') { // ssl ip/port assigned to the domain if (domainHasSslIpPort($domain_check['id']) == true) { $ssl_redirect = '1'; + $_doredirect = true; } else { standard_error('sslredirectonlypossiblewithsslipport'); } @@ -548,6 +549,7 @@ if ($page == 'overview') { // ssl ip/port assigned to the domain if (domainHasSslIpPort($id) == true) { $ssl_redirect = '1'; + $_doredirect = true; } else { standard_error('sslredirectonlypossiblewithsslipport'); } diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index d186ff5f..9bc36c44 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -788,7 +788,6 @@ class apache { $vhost_content .= ' RewriteRule ^/(.*) '. $corrected_docroot.'$1 ' . $modrew_red . "\n"; $vhost_content .= ' ' . "\n"; - $code = getDomainRedirectCode($domain['id']); $vhost_content .= ' Redirect '.$code.' / ' . $this->idnaConvert->encode($domain['documentroot']) . "\n"; } else { From a1d38dc05ff0479533064b2af885b2fa4db4013f Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 28 Jul 2015 15:11:55 +0200 Subject: [PATCH 09/34] solve sub-sub-domain-problem by dynamically assigning vhost-number in vhost-filename (the deeper the lower the number thus being included earlier), fixes #1535 Signed-off-by: Michael Kaufmann (d00p) --- scripts/jobs/cron_tasks.inc.http.10.apache.php | 13 +++++++------ scripts/jobs/cron_tasks.inc.http.20.lighttpd.php | 7 ++++--- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 7 ++++--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 9bc36c44..2da45b2c 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -618,14 +618,15 @@ class apache { && ((int)$domain['ismainbutsubto'] == 0 || domainMainToSubExists($domain['ismainbutsubto']) == false) ) { - $vhost_no = '22'; + $vhost_no = '35'; } elseif ((int)$domain['parentdomainid'] == 0 && isCustomerStdSubdomain((int)$domain['id']) == false && (int)$domain['ismainbutsubto'] > 0 ) { - $vhost_no = '21'; + $vhost_no = '30'; } else { - $vhost_no = '20'; + // number of dots in a domain specifies it's position (and depth of subdomain) starting at 29 going downwards on higher depth + $vhost_no = (string)(30 - substr_count($domain['domain'], ".") + 1); } if ($ssl_vhost === true) { @@ -1126,9 +1127,9 @@ class apache { $vhosts_file = ''; // sort by filename so the order is: - // 1. subdomains 20 - // 2. subdomains as main-domains 21 - // 3. main-domains 22 + // 1. subdomains x-29 + // 2. subdomains as main-domains 30 + // 3. main-domains 35 // #437 ksort($this->virtualhosts_data); diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index f1cf1038..f02e7503 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -299,7 +299,7 @@ class lighttpd { $_pos = strrpos($_tmp_path, '/'); $_inc_path = substr($_tmp_path, $_pos+1); - // subdomain + // maindomain if ((int)$domain['parentdomainid'] == 0 && isCustomerStdSubdomain((int)$domain['id']) == false && ((int)$domain['ismainbutsubto'] == 0 @@ -314,9 +314,10 @@ class lighttpd { ) { $vhost_no = '51'; } - // main domain + // subdomains else { - $vhost_no = '52'; + // number of dots in a domain specifies it's position (and depth of subdomain) starting at 89 going downwards on higher depth + $vhost_no = (string)(90 - substr_count($domain['domain'], ".") + 1); } if ($ssl == '1') { diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index 758e504a..b2c1d69c 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -289,14 +289,15 @@ class nginx { && ((int)$domain['ismainbutsubto'] == 0 || domainMainToSubExists($domain['ismainbutsubto']) == false) ) { - $vhost_no = '22'; + $vhost_no = '35'; } elseif ((int)$domain['parentdomainid'] == 0 && isCustomerStdSubdomain((int)$domain['id']) == false && (int)$domain['ismainbutsubto'] > 0 ) { - $vhost_no = '21'; + $vhost_no = '30'; } else { - $vhost_no = '20'; + // number of dots in a domain specifies it's position (and depth of subdomain) starting at 29 going downwards on higher depth + $vhost_no = (string)(30 - substr_count($domain['domain'], ".") + 1); } if ($ssl_vhost === true) { From de4a953bb71fb50890b0a01eb8e582fe78a7e54a Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 28 Jul 2015 15:41:31 +0200 Subject: [PATCH 10/34] check for existence of ssl-related files for ip/port vhost in order to avoid the webserver to be unable to restart when the cronjob runs; fixes #1485 Signed-off-by: Michael Kaufmann (d00p) --- .../jobs/cron_tasks.inc.http.10.apache.php | 60 +++++++++++++------ .../jobs/cron_tasks.inc.http.20.lighttpd.php | 32 +++++++--- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 50 +++++++++++----- 3 files changed, 101 insertions(+), 41 deletions(-) diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 2da45b2c..ce59690d 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -337,26 +337,52 @@ class apache { } if ($row_ipsandports['ssl_cert_file'] != '') { - $this->virtualhosts_data[$vhosts_filename] .= ' SSLEngine On' . "\n"; - $this->virtualhosts_data[$vhosts_filename] .= ' SSLProtocol ALL -SSLv2 -SSLv3' . "\n"; - // this makes it more secure, thx to Marcel (08/2013) - $this->virtualhosts_data[$vhosts_filename] .= ' SSLHonorCipherOrder On' . "\n"; - $this->virtualhosts_data[$vhosts_filename] .= ' SSLCipherSuite ' . Settings::Get('system.ssl_cipher_list') . "\n"; - $this->virtualhosts_data[$vhosts_filename] .= ' SSLVerifyDepth 10' . "\n"; - $this->virtualhosts_data[$vhosts_filename] .= ' SSLCertificateFile ' . makeCorrectFile($row_ipsandports['ssl_cert_file']) . "\n"; - if ($row_ipsandports['ssl_key_file'] != '') { - $this->virtualhosts_data[$vhosts_filename] .= ' SSLCertificateKeyFile ' . makeCorrectFile($row_ipsandports['ssl_key_file']) . "\n"; - } + // check for existence, #1485 + if (!file_exists($row_ipsandports['ssl_cert_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $ipport . ' :: certificate file "'.$row_ipsandports['ssl_cert_file'].'" does not exist! Cannot create ssl-directives'); + echo $ipport . ' :: certificate file "'.$row_ipsandports['ssl_cert_file'].'" does not exist! Cannot create SSL-directives'."\n"; + } else { - if ($row_ipsandports['ssl_ca_file'] != '') { - $this->virtualhosts_data[$vhosts_filename] .= ' SSLCACertificateFile ' . makeCorrectFile($row_ipsandports['ssl_ca_file']) . "\n"; - } + $this->virtualhosts_data[$vhosts_filename] .= ' SSLEngine On' . "\n"; + $this->virtualhosts_data[$vhosts_filename] .= ' SSLProtocol ALL -SSLv2 -SSLv3' . "\n"; + // this makes it more secure, thx to Marcel (08/2013) + $this->virtualhosts_data[$vhosts_filename] .= ' SSLHonorCipherOrder On' . "\n"; + $this->virtualhosts_data[$vhosts_filename] .= ' SSLCipherSuite ' . Settings::Get('system.ssl_cipher_list') . "\n"; + $this->virtualhosts_data[$vhosts_filename] .= ' SSLVerifyDepth 10' . "\n"; + $this->virtualhosts_data[$vhosts_filename] .= ' SSLCertificateFile ' . makeCorrectFile($row_ipsandports['ssl_cert_file']) . "\n"; - // #418 - if ($row_ipsandports['ssl_cert_chainfile'] != '') { - $this->virtualhosts_data[$vhosts_filename] .= ' SSLCertificateChainFile ' . makeCorrectFile($row_ipsandports['ssl_cert_chainfile']) . "\n"; - } + if ($row_ipsandports['ssl_key_file'] != '') { + // check for existence, #1485 + if (!file_exists($row_ipsandports['ssl_key_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $ipport . ' :: certificate key file "'.$row_ipsandports['ssl_key_file'].'" does not exist! Cannot create ssl-directives'); + echo $ipport . ' :: certificate key file "'.$row_ipsandports['ssl_key_file'].'" does not exist! SSL-directives might not be working'."\n"; + } else { + $this->virtualhosts_data[$vhosts_filename] .= ' SSLCertificateKeyFile ' . makeCorrectFile($row_ipsandports['ssl_key_file']) . "\n"; + } + } + + if ($row_ipsandports['ssl_ca_file'] != '') { + // check for existence, #1485 + if (!file_exists($row_ipsandports['ssl_ca_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $ipport . ' :: certificate CA file "'.$row_ipsandports['ssl_ca_file'].'" does not exist! Cannot create ssl-directives'); + echo $ipport . ' :: certificate CA file "'.$row_ipsandports['ssl_ca_file'].'" does not exist! SSL-directives might not be working'."\n"; + } else { + $this->virtualhosts_data[$vhosts_filename] .= ' SSLCACertificateFile ' . makeCorrectFile($row_ipsandports['ssl_ca_file']) . "\n"; + } + } + + // #418 + if ($row_ipsandports['ssl_cert_chainfile'] != '') { + // check for existence, #1485 + if (!file_exists($row_ipsandports['ssl_cert_chainfile'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $ipport . ' :: certificate chain file "'.$row_ipsandports['ssl_cert_chainfile'].'" does not exist! Cannot create ssl-directives'); + echo $ipport . ' :: certificate chain file "'.$row_ipsandports['ssl_cert_chainfile'].'" does not exist! SSL-directives might not be working'."\n"; + } else { + $this->virtualhosts_data[$vhosts_filename] .= ' SSLCertificateChainFile ' . makeCorrectFile($row_ipsandports['ssl_cert_chainfile']) . "\n"; + } + } + } } } diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index f02e7503..787ee383 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -161,15 +161,28 @@ class lighttpd { } if ($row_ipsandports['ssl_cert_file'] != '') { - $this->lighttpd_data[$vhost_filename].= 'ssl.engine = "enable"' . "\n"; - $this->lighttpd_data[$vhost_filename].= 'ssl.use-sslv2 = "disable"' . "\n"; - $this->lighttpd_data[$vhost_filename].= 'ssl.cipher-list = "' . Settings::Get('system.ssl_cipher_list') . '"' . "\n"; - $this->lighttpd_data[$vhost_filename].= 'ssl.honor-cipher-order = "enable"' . "\n"; - $this->lighttpd_data[$vhost_filename].= 'ssl.pemfile = "' . makeCorrectFile($row_ipsandports['ssl_cert_file']) . '"' . "\n"; - - if ($row_ipsandports['ssl_ca_file'] != '') { - $this->lighttpd_data[$vhost_filename].= 'ssl.ca-file = "' . makeCorrectFile($row_ipsandports['ssl_ca_file']) . '"' . "\n"; - } + + // check for existence, #1485 + if (!file_exists($row_ipsandports['ssl_cert_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $ip.':'.$port . ' :: certificate file "'.$row_ipsandports['ssl_cert_file'].'" does not exist! Cannot create ssl-directives'); + echo $ip.':'.$port . ' :: certificate file "'.$row_ipsandports['ssl_cert_file'].'" does not exist! Cannot create SSL-directives'."\n"; + } else { + $this->lighttpd_data[$vhost_filename].= 'ssl.engine = "enable"' . "\n"; + $this->lighttpd_data[$vhost_filename].= 'ssl.use-sslv2 = "disable"' . "\n"; + $this->lighttpd_data[$vhost_filename].= 'ssl.cipher-list = "' . Settings::Get('system.ssl_cipher_list') . '"' . "\n"; + $this->lighttpd_data[$vhost_filename].= 'ssl.honor-cipher-order = "enable"' . "\n"; + $this->lighttpd_data[$vhost_filename].= 'ssl.pemfile = "' . makeCorrectFile($row_ipsandports['ssl_cert_file']) . '"' . "\n"; + + if ($row_ipsandports['ssl_ca_file'] != '') { + // check for existence, #1485 + if (!file_exists($row_ipsandports['ssl_ca_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $ip.':'.$port . ' :: certificate CA file "'.$row_ipsandports['ssl_ca_file'].'" does not exist! Cannot create ssl-directives'); + echo $ip.':'.port . ' :: certificate CA file "'.$row_ipsandports['ssl_ca_file'].'" does not exist! SSL-directives might not be working'."\n"; + } else { + $this->lighttpd_data[$vhost_filename].= 'ssl.ca-file = "' . makeCorrectFile($row_ipsandports['ssl_ca_file']) . '"' . "\n"; + } + } + } } } @@ -477,6 +490,7 @@ class lighttpd { } if ($domain['ssl_cert_file'] != '') { + $ssl_settings.= 'ssl.engine = "enable"' . "\n"; $ssl_settings.= 'ssl.use-sslv2 = "disable"' . "\n"; $ssl_settings.= 'ssl.cipher-list = "' . Settings::Get('system.ssl_cipher_list') . '"' . "\n"; diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index b2c1d69c..012c7abf 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -151,7 +151,7 @@ class nginx { if ($row_ipsandports['ssl_ca_file'] == '') { $row_ipsandports['ssl_ca_file'] = Settings::Get('system.ssl_ca_file'); } - if ($row_ipsandports['ssl_cert_file'] != '') { + if ($row_ipsandports['ssl_cert_file'] != '' && file_exists($row_ipsandports['ssl_cert_file'])) { $ssl_vhost = true; } } @@ -194,6 +194,7 @@ class nginx { * SSL config options */ if ($row_ipsandports['ssl'] == '1') { + $row_ipsandports['domain'] = Settings::Get('system.hostname'); $this->nginx_data[$vhost_filename].=$this->composeSslSettings($row_ipsandports); } @@ -531,20 +532,39 @@ class nginx { } if ($domain['ssl_cert_file'] != '') { - // obsolete: ssl on now belongs to the listen block as 'ssl' at the end - //$sslsettings .= "\t" . 'ssl on;' . "\n"; - $sslsettings .= "\t" . 'ssl_protocols TLSv1 TLSv1.1 TLSv1.2;' . "\n"; - $sslsettings .= "\t" . 'ssl_ciphers ' . Settings::Get('system.ssl_cipher_list') . ';' . "\n"; - $sslsettings .= "\t" . 'ssl_prefer_server_ciphers on;' . "\n"; - $sslsettings .= "\t" . 'ssl_certificate ' . makeCorrectFile($domain['ssl_cert_file']) . ';' . "\n"; - - if ($domain['ssl_key_file'] != '') { - $sslsettings .= "\t" . 'ssl_certificate_key ' .makeCorrectFile($domain['ssl_key_file']) . ';' . "\n"; - } - - if ($domain['ssl_ca_file'] != '') { - $sslsettings.= "\t" . 'ssl_client_certificate ' . makeCorrectFile($domain['ssl_ca_file']) . ';' . "\n"; - } + + // check for existence, #1485 + if (!file_exists($domain['ssl_cert_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $domain['domain'] . ' :: certificate file "'.$domain['ssl_cert_file'].'" does not exist! Cannot create ssl-directives'); + echo $domain['domain'] . ' :: certificate file "'.$domain['ssl_cert_file'].'" does not exist! Cannot create SSL-directives'."\n"; + } else { + // obsolete: ssl on now belongs to the listen block as 'ssl' at the end + //$sslsettings .= "\t" . 'ssl on;' . "\n"; + $sslsettings .= "\t" . 'ssl_protocols TLSv1 TLSv1.1 TLSv1.2;' . "\n"; + $sslsettings .= "\t" . 'ssl_ciphers ' . Settings::Get('system.ssl_cipher_list') . ';' . "\n"; + $sslsettings .= "\t" . 'ssl_prefer_server_ciphers on;' . "\n"; + $sslsettings .= "\t" . 'ssl_certificate ' . makeCorrectFile($domain['ssl_cert_file']) . ';' . "\n"; + + if ($domain['ssl_key_file'] != '') { + // check for existence, #1485 + if (!file_exists($row_ipsandports['ssl_key_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $ipport . ' :: certificate key file "'.$domain['ssl_key_file'].'" does not exist! Cannot create ssl-directives'); + echo $ipport . ' :: certificate key file "'.$domain['ssl_key_file'].'" does not exist! SSL-directives might not be working'."\n"; + } else { + $sslsettings .= "\t" . 'ssl_certificate_key ' .makeCorrectFile($domain['ssl_key_file']) . ';' . "\n"; + } + } + + if ($domain['ssl_ca_file'] != '') { + // check for existence, #1485 + if (!file_exists($row_ipsandports['ssl_ca_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $domain['domain'] . ' :: certificate CA file "'.$domain['ssl_ca_file'].'" does not exist! Cannot create ssl-directives'); + echo $domain['domain'] . ' :: certificate CA file "'.$domain['ssl_ca_file'].'" does not exist! SSL-directives might not be working'."\n"; + } else { + $sslsettings.= "\t" . 'ssl_client_certificate ' . makeCorrectFile($domain['ssl_ca_file']) . ';' . "\n"; + } + } + } } return $sslsettings; From 7cd6651895db504d25161e536d39e2e3956d0d94 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 29 Jul 2015 13:11:38 +0200 Subject: [PATCH 11/34] replace passwords even before logging, not just for display Signed-off-by: Michael Kaufmann (d00p) --- lib/classes/database/class.Database.php | 60 ++++++++++++------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/lib/classes/database/class.Database.php b/lib/classes/database/class.Database.php index 7c39ecfb..85ed594b 100644 --- a/lib/classes/database/class.Database.php +++ b/lib/classes/database/class.Database.php @@ -312,6 +312,32 @@ class Database { private static function _showerror($error, $showerror = true) { global $userinfo, $theme, $linker; + // include userdata.inc.php + require FROXLOR_INSTALL_DIR."/lib/userdata.inc.php"; + + // le format + if (isset($sql['root_user']) + && isset($sql['root_password']) + && (!isset($sql_root) || !is_array($sql_root)) + ) { + $sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'socket' => (isset($sql['socket']) ? $sql['socket'] : null), 'user' => $sql['root_user'], 'password' => $sql['root_password'])); + } + + // hide username/password in messages + $error_message = $error->getMessage(); + $error_trace = $error->getTraceAsString(); + // error-message + $error_message = str_replace($sql['password'], 'DB_UNPRIV_PWD', $error_message); + $error_message = str_replace($sql_root[0]['password'], 'DB_ROOT_PWD', $error_message); + // error-trace + $error_trace = str_replace($sql['password'], 'DB_UNPRIV_PWD', $error_trace); + $error_trace = str_replace($sql_root[0]['password'], 'DB_ROOT_PWD', $error_trace); + + if ($error->getCode() == 2003) { + $error_message = "Unable to connect to database. Either the mysql-server is not running or your user/password is wrong."; + $error_trace = ""; + } + /** * log to a file, so we can actually ask people for the error * (no one seems to find the stuff in the syslog) @@ -322,8 +348,8 @@ class Database { } $sl_file = makeCorrectFile($sl_dir."/sql-error.log"); $sqllog = @fopen($sl_file, 'a'); - @fwrite($sqllog, date('d.m.Y H:i', time())." --- ".str_replace("\n", " ", $error->getMessage())."\n"); - @fwrite($sqllog, date('d.m.Y H:i', time())." --- DEBUG: \n".$error->getTraceAsString()."\n"); + @fwrite($sqllog, date('d.m.Y H:i', time())." --- ".str_replace("\n", " ", $error_message)."\n"); + @fwrite($sqllog, date('d.m.Y H:i', time())." --- DEBUG: \n".$error_trace."\n"); @fclose($sqllog); /** @@ -333,43 +359,17 @@ class Database { $err_file = makeCorrectFile($sl_dir."/".$errid."_sql-error.log"); $errlog = @fopen($err_file, 'w'); @fwrite($errlog, "|CODE ".$error->getCode()."\n"); - @fwrite($errlog, "|MSG ".$error->getMessage()."\n"); + @fwrite($errlog, "|MSG ".$error_message."\n"); @fwrite($errlog, "|FILE ".$error->getFile()."\n"); @fwrite($errlog, "|LINE ".$error->getLine()."\n"); - @fwrite($errlog, "|TRACE\n".$error->getTraceAsString()."\n"); + @fwrite($errlog, "|TRACE\n".$error_trace."\n"); @fclose($errlog); if ($showerror) { - // include userdata.inc.php - require FROXLOR_INSTALL_DIR."/lib/userdata.inc.php"; - // fallback $theme = 'Sparkle'; - // le format - if (isset($sql['root_user']) - && isset($sql['root_password']) - && (!isset($sql_root) || !is_array($sql_root)) - ) { - $sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'socket' => (isset($sql['socket']) ? $sql['socket'] : null), 'user' => $sql['root_user'], 'password' => $sql['root_password'])); - } - - // hide username/password in messages - $error_message = $error->getMessage(); - $error_trace = $error->getTraceAsString(); - // error-message - $error_message = str_replace($sql['password'], 'DB_UNPRIV_PWD', $error_message); - $error_message = str_replace($sql_root[0]['password'], 'DB_ROOT_PWD', $error_message); - // error-trace - $error_trace = str_replace($sql['password'], 'DB_UNPRIV_PWD', $error_trace); - $error_trace = str_replace($sql_root[0]['password'], 'DB_ROOT_PWD', $error_trace); - - if ($error->getCode() == 2003) { - $error_message = "Unable to connect to database. Either the mysql-server is not running or your user/password is wrong."; - $error_trace = ""; - } - // clean up sensitive data unset($sql); unset($sql_root); From b0325983a132432747fa3829fc71e2be3a8aaff3 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 29 Jul 2015 13:19:32 +0200 Subject: [PATCH 12/34] log db errors to syslog and remove tmp-error-logs for reporting in cronrun Signed-off-by: Michael Kaufmann (d00p) --- lib/classes/database/class.Database.php | 11 +++++------ lib/classes/webserver/class.ConfigIO.php | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/classes/database/class.Database.php b/lib/classes/database/class.Database.php index 85ed594b..12c459ca 100644 --- a/lib/classes/database/class.Database.php +++ b/lib/classes/database/class.Database.php @@ -346,11 +346,10 @@ class Database { if (!file_exists($sl_dir)) { @mkdir($sl_dir, 0755); } - $sl_file = makeCorrectFile($sl_dir."/sql-error.log"); - $sqllog = @fopen($sl_file, 'a'); - @fwrite($sqllog, date('d.m.Y H:i', time())." --- ".str_replace("\n", " ", $error_message)."\n"); - @fwrite($sqllog, date('d.m.Y H:i', time())." --- DEBUG: \n".$error_trace."\n"); - @fclose($sqllog); + openlog("froxlor", LOG_PID | LOG_PERROR, LOG_LOCAL0); + syslog(LOG_WARNING, str_replace("\n", " ", $error_message)); + syslog(LOG_WARNING, str_replace("\n", " ", "--- DEBUG: ".$error_trace)); + closelog(); /** * log error for reporting @@ -400,7 +399,7 @@ class Database { die($err_hint); } } - die("We are sorry, but a MySQL - error occurred. The administrator may find more information in in the sql-error.log in the logs/ directory"); + die("We are sorry, but a MySQL - error occurred. The administrator may find more information in the syslog"); } } } diff --git a/lib/classes/webserver/class.ConfigIO.php b/lib/classes/webserver/class.ConfigIO.php index 1a7f4ecd..a5c14942 100644 --- a/lib/classes/webserver/class.ConfigIO.php +++ b/lib/classes/webserver/class.ConfigIO.php @@ -33,6 +33,10 @@ class ConfigIO { * @return null */ public function cleanUp() { + + // old error logs + $this->_cleanErrLogs(); + // awstats files $this->_cleanAwstatsFiles(); @@ -52,6 +56,17 @@ class ConfigIO { $this->_cleanCustomerSslCerts(); } + private function _cleanErrLogs() { + + $err_dir = makeCorrectDir(FROXLOR_INSTALL_DIR."/logs/"); + if (@is_dir($err_dir)) { + // now get rid of old stuff + //(but append /*.log so we don't delete the directory) + $err_dir.='/*.log'; + safe_exec('rm -rf '. makeCorrectFile($err_dir)); + } + } + /** * remove customer-specified auto-generated ssl-certificates * (they are being regenerated) From 8b6f708b7c8e6055d9924caa5de3e5d516328dc3 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 28 Jul 2015 08:22:00 +0200 Subject: [PATCH 13/34] remove unused (old) php-configfile-files Signed-off-by: Michael Kaufmann (d00p) --- lib/configfiles/gentoo.inc.php | 436 ------------------------------ lib/configfiles/precise.inc.php | 421 ----------------------------- lib/configfiles/rhel7.inc.php | 169 ------------ lib/configfiles/trusty.inc.php | 416 ----------------------------- lib/configfiles/wheezy.inc.php | 457 -------------------------------- 5 files changed, 1899 deletions(-) delete mode 100644 lib/configfiles/gentoo.inc.php delete mode 100644 lib/configfiles/precise.inc.php delete mode 100644 lib/configfiles/rhel7.inc.php delete mode 100644 lib/configfiles/trusty.inc.php delete mode 100644 lib/configfiles/wheezy.inc.php diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php deleted file mode 100644 index ef253fed..00000000 --- a/lib/configfiles/gentoo.inc.php +++ /dev/null @@ -1,436 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Configfiles - * - */ - -// Try to guess user/group from settings' email UID/GID -$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid')); -$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid')); - -/* If one of them are not set, call it 'vmail' and suggest creating user/group - * in scripts. */ -if ($vmail_user === false) { - $vmail_username="vmail"; -} else { - $vmail_username=$vmail_user['name']; -} -if ($vmail_group === false) { - $vmail_groupname="vmail"; -} else { - $vmail_groupname=$vmail_group['name']; -} - -return array( - 'gentoo' => array( - 'label' => 'Gentoo', - 'services' => array( - 'http' => array( - 'label' => $lng['admin']['configfiles']['http'], - 'daemons' => array( - 'apache2' => array( - 'label' => 'Apache2 Webserver', - 'commands' => array( - $configcommand['vhost'], - 'chown root:0 ' . Settings::Get('system.apacheconf_vhost'), - 'chmod 0600 ' . Settings::Get('system.apacheconf_vhost'), - $configcommand['diroptions'], - 'chown root:0 ' . Settings::Get('system.apacheconf_diroptions'), - 'chmod 0600 ' . Settings::Get('system.apacheconf_diroptions'), - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir') - ), - 'files' => ((int)Settings::Get('phpfpm.enabled') == 1) ? - array( - 'etc_apache2_modules.d_70_fastcgi.conf' => '/etc/apache2/modules.d/70_fastcgi.conf' - ) - : - null, - 'restart' => array( - 'rc-update add apache2 default', - '/etc/init.d/apache2 restart' - ) - ), - 'lighttpd' => array( - 'label' => 'Lighttpd Webserver', - 'commands_1' => array( - 'emerge -av lighttpd' - ), - 'files' => array( - 'etc_lighttpd.conf' => '/etc/lighttpd/lighttpd.conf' - ), - 'commands_2' => array( - $configcommand['vhost'], - $configcommand['diroptions'], - $configcommand['v_inclighty'], - $configcommand['d_inclighty'], - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'rc-update add lighttpd default' - ), - 'restart' => array( - '/etc/init.d/lighttpd restart' - ) - ), - 'nginx' => array( - 'label' => 'Nginx Webserver', - 'commands_1' => array( - 'emerge nginx', - ), - 'files' => array( - 'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf', - 'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi' - ), - 'commands_2' => array( - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod u+x /etc/init.d/php-fcgi', - 'rc-update add nginx default' - ), - 'restart' => array( - '/etc/init.d/nginx restart' - ) - ), - ) - ), - 'dns' => array( - 'label' => $lng['admin']['configfiles']['dns'], - 'daemons' => array( - 'bind' => array( - 'label' => 'Bind9 Nameserver', - 'files' => array( - 'etc_bind_default.zone' => '/etc/bind/default.zone' - ), - 'commands' => array( - 'echo "include \"' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf\";" >> /etc/bind/named.conf', - 'touch ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chown named:0 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chmod 0600 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'rc-update add named default' - ), - 'restart' => array( - '/etc/init.d/named restart' - ) - ), - ) - ), - 'smtp' => array( - 'label' => $lng['admin']['configfiles']['smtp'], - 'daemons' => array( - 'postfix_courier' => array( - 'label' => 'Postfix/Courier', - 'commands_1' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'echo "mail-mta/postfix -dovecot-sasl sasl" >> /etc/portage/package.use', - 'emerge -av postfix', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'chmod 0750 ' . Settings::Get('system.vmail_homedir'), - 'mv /etc/postfix/main.cf /etc/postfix/main.cf.gentoo', - 'touch /etc/postfix/main.cf', - 'touch /etc/sasl2/smtpd.conf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:root /etc/sasl2/smtpd.conf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0600 /etc/sasl2/smtpd.conf', - 'for suffix in {alias,mailbox,uid,gid}_maps mailbox_domains sender_permissions; do', - ' touch /etc/postfix/mysql-virtual_${suffix}.cf', - ' chown root:postfix /etc/postfix/mysql-virtual_${suffix}.cf', - ' chmod 0640 /etc/postfix/mysql-virtual_${suffix}.cf', - 'done' - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf', - 'etc_postfix_mysql-virtual_uid_maps.cf' => '/etc/postfix/mysql-virtual_uid_maps.cf', - 'etc_postfix_mysql-virtual_gid_maps.cf' => '/etc/postfix/mysql-virtual_gid_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' - ), - 'commands_2' => array( - 'rc-update add postfix default' - ), - 'restart' => array( - '/etc/init.d/postfix restart' - ) - ), - 'postfix_dovecot' => array( - 'label' => 'Postfix/Dovecot', - 'commands_1' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'echo "mail-mta/postfix dovecot-sasl -sasl" >> /etc/portage/package.use', - 'emerge -av postfix', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'chmod 0750 ' . Settings::Get('system.vmail_homedir'), - 'mv /etc/postfix/main.cf /etc/postfix/main.cf.gentoo', - 'mv /etc/postfix/master.cf /etc/postfix/master.cf.gentoo', - 'touch /etc/postfix/{main,master}.cf', - 'chown root:root /etc/postfix/{main,master}.cf', - 'chmod 0644 /etc/postfix/{main,master}.cf', - 'for suffix in {alias,mailbox,uid,gid}_maps mailbox_domains sender_permissions; do', - ' touch /etc/postfix/mysql-virtual_${suffix}.cf', - ' chown root:postfix /etc/postfix/mysql-virtual_${suffix}.cf', - ' chmod 0640 /etc/postfix/mysql-virtual_${suffix}.cf', - 'done' - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_master.cf' => '/etc/postfix/master.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf', - 'etc_postfix_mysql-virtual_uid_maps.cf' => '/etc/postfix/mysql-virtual_uid_maps.cf', - 'etc_postfix_mysql-virtual_gid_maps.cf' => '/etc/postfix/mysql-virtual_gid_maps.cf' - ), - 'commands_2' => array( - 'rc-update add postfix default' - ), - 'restart' => array( - '/etc/init.d/postfix restart' - ) - ), - 'postfix_mxaccess' => array( - 'label' => 'Postfix MX-Access (anti spam)', - 'files' => array( - 'etc_postfix_mx_access' => '/etc/postfix/mx_access', - 'etc_postfix_main.cf' => '/etc/postfix/main.cf' - ), - 'commands_1' => array( - 'postmap /etc/postfix/mx_access' - ), - 'restart' => array( - 'newaliases', - '/etc/init.d/postfix restart' - ) - ), - 'dkim' => array( - 'label' => 'DomainKey filter', - 'commands_1' => array( - 'emerge dkim-milter', - 'emerge --config mail-filter/dkim-milter', - 'mkdir -p /etc/postfix/dkim' - ), - 'files' => array( - 'dkim-filter.conf' => '/etc/mail/dkim-filter/dkim-filter.conf' - ), - 'commands_2' => array( - 'echo "smtpd_milters = inet:localhost:8891 -milter_macro_daemon_name = SIGNING -milter_default_action = accept" >> /etc/postfix/main.cf', - 'rc-update add dkim-filter default' - ), - 'restart' => array( - '/etc/init.d/postfix restart' - ) - ) - ) - ), - 'mail' => array( - 'label' => $lng['admin']['configfiles']['mail'], - 'daemons' => array( - 'courier' => array( - 'label' => 'Courier-IMAP (POP3/IMAP)', - 'commands_1' => array( - 'rm /etc/courier/authlib/authdaemonrc', - 'rm /etc/courier/authlib/authmysqlrc', - 'rm /etc/courier-imap/pop3d', - 'rm /etc/courier-imap/imapd', - 'rm /etc/courier-imap/pop3d-ssl', - 'rm /etc/courier-imap/imapd-ssl', - 'touch /etc/courier/authlib/authdaemonrc', - 'touch /etc/courier/authlib/authmysqlrc', - 'touch /etc/courier-imap/pop3d', - 'touch /etc/courier-imap/imapd', - 'touch /etc/courier-imap/pop3d-ssl', - 'touch /etc/courier-imap/imapd-ssl' - ), - 'files' => array( - 'etc_courier_authlib_authdaemonrc' => '/etc/courier/authlib/authdaemonrc', - 'etc_courier_authlib_authmysqlrc' => '/etc/courier/authlib/authmysqlrc', - 'etc_courier-imap_pop3d' => '/etc/courier-imap/pop3d', - 'etc_courier-imap_imapd' => '/etc/courier-imap/imapd', - 'etc_courier-imap_pop3d-ssl' => '/etc/courier-imap/pop3d-ssl', - 'etc_courier-imap_imapd-ssl' => '/etc/courier-imap/imapd-ssl' - ), - 'commands_2' => array( - 'chown root:0 /etc/courier/authlib/authdaemonrc', - 'chown root:0 /etc/courier/authlib/authmysqlrc', - 'chown root:0 /etc/courier-imap/pop3d', - 'chown root:0 /etc/courier-imap/imapd', - 'chown root:0 /etc/courier-imap/pop3d-ssl', - 'chown root:0 /etc/courier-imap/imapd-ssl', - 'chmod 0600 /etc/courier/authlib/authdaemonrc', - 'chmod 0600 /etc/courier/authlib/authmysqlrc', - 'chmod 0600 /etc/courier-imap/pop3d', - 'chmod 0600 /etc/courier-imap/imapd', - 'chmod 0600 /etc/courier-imap/pop3d-ssl', - 'chmod 0600 /etc/courier-imap/imapd-ssl', - 'rc-update add courier-authlib default', - 'rc-update add courier-pop3d default', - 'rc-update add courier-imapd default' - ), - 'restart' => array( - '/etc/init.d/courier-authlib restart', - '/etc/init.d/courier-pop3d restart', - '/etc/init.d/courier-imapd restart' - ) - ), - 'dovecot' => array( - 'label' => 'Dovecot', - 'commands_1' => array( - 'echo "net-mail/dovecot mysql" >> /etc/portage/package.use', - 'emerge -av dovecot', - 'mv /etc/dovecot/dovecot.conf /etc/dovecot/dovecot.conf.gentoo', - 'mv /etc/dovecot/dovecot-sql.conf /etc/dovecot/dovecot-sql.conf.gentoo', - 'touch /etc/dovecot/dovecot.conf', - 'touch /etc/dovecot/dovecot-sql.conf', - ), - 'files' => array( - 'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf', - 'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf' - ), - 'commands_2' => array( - 'chmod 0640 /etc/dovecot/dovecot-sql.conf', - 'rc-update add dovecot default' - ), - 'restart' => array( - '/etc/init.d/dovecot restart' - ) - ) - ) - ), - 'ftp' => array( - 'label' => $lng['admin']['configfiles']['ftp'], - 'daemons' => array( - 'proftpd' => array( - 'label' => 'ProFTPd', - 'commands_1' => array( - 'echo "net-ftp/proftpd mysql" >> /etc/portage/package.use', - 'emerge -av proftpd', - 'touch /etc/proftpd/proftpd.conf' - ), - 'files' => array( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'commands_2' => array( - 'chown root:0 /etc/proftpd/proftpd.conf', - 'chmod 0600 /etc/proftpd/proftpd.conf', - 'rc-update add proftpd default' - ), - 'restart' => array( - '/etc/init.d/proftpd restart' - ) - ), - 'pureftpd' => array( - 'label' => 'PureFTPD', - 'commands_1' => array( - 'emerge pure-ftpd' - ), - 'files' => array( - 'etc_conf.d_pure-ftpd' => '/etc/conf.d/pure-ftpd', - 'etc_pureftpd-mysql.conf' => '/etc/pureftpd-mysql.conf' - ), - 'commands_2' => array( - 'chown root:0 /etc/conf.d/pure-ftpd', - 'chmod 0644 /etc/conf.d/pure-ftpd', - 'chown root:0 /etc/pureftpd-mysql.conf', - 'chmod 0600 /etc/pureftpd-mysql.conf', - 'rc-update add pure-ftpd default' - ), - 'restart' => array( - '/etc/init.d/pure-ftpd restart' - ) - ) - ) - ), - 'etc' => array( - 'label' => $lng['admin']['configfiles']['etc'], - 'daemons' => array( - 'cron' => array( - 'label' => 'Crond (cronscript)', - 'commands_1' => array( - 'touch /etc/cron.d/froxlor', - 'chown root:0 /etc/cron.d/froxlor', - 'chmod 0640 /etc/cron.d/froxlor' - ), - 'files' => array( - 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' - ), - 'restart' => array( - Settings::Get('system.crondreload') - ) - ), - 'awstats' => array( - 'label' => 'Awstats', - 'commands' => array( - 'emerge awstats', - 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself', - 'rm /etc/cron.d/awstats' - ), - ), - 'libnss' => array( - 'label' => 'libnss (system login with mysql)', - 'commands_1' => array( - 'emerge -av libnss-mysql' - ), - 'files' => array( - 'etc_libnss-mysql.cfg' => '/etc/libnss-mysql.cfg', - 'etc_libnss-mysql-root.cfg' => '/etc/libnss-mysql-root.cfg', - 'etc_nsswitch.conf' => '/etc/nsswitch.conf', - ), - 'commands_2' => array( - 'chmod 600 /etc/libnss-mysql.cfg /etc/libnss-mysql-root.cfg', - 'rc-update add nscd default' - ), - 'restart' => array( - '/etc/init.d/nscd restart' - ) - ), - 'logrotate' => array( - 'label' => 'Logrotate', - 'commands_1' => array( - 'emerge -av app-admin/logrotate', - 'touch /etc/logrotate.d/froxlor', - 'chmod 644 /etc/logrotate.d/froxlor' - ), - 'files' => array( - 'etc_logrotated_froxlor' => '/etc/logrotate.d/froxlor' - ), - 'commands_2' => array( - '# emerge automatically adds a daily cronjob for logrotate', - '# you do not have to do anything else :)' - ) - ) - ) - ) - ) - ) -); diff --git a/lib/configfiles/precise.inc.php b/lib/configfiles/precise.inc.php deleted file mode 100644 index 176f271b..00000000 --- a/lib/configfiles/precise.inc.php +++ /dev/null @@ -1,421 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Configfiles - * - */ - -// Try to guess user/group from settings' email UID/GID -$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid')); -$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid')); - -/* If one of them are not set, call it 'vmail' and suggest creating user/group - * in scripts. */ -if ($vmail_user === false) { - $vmail_username="vmail"; -} else { - $vmail_username=$vmail_user['name']; -} -if ($vmail_group === false) { - $vmail_groupname="vmail"; -} else { - $vmail_groupname=$vmail_group['name']; -} - -return array( - 'ubuntu_precise' => array( - 'label' => 'Ubuntu 12.04 (Precise)', - 'services' => array( - 'http' => array( - 'label' => $lng['admin']['configfiles']['http'], - 'daemons' => array( - 'apache2' => array( - 'label' => 'Apache 2', - 'commands' => array( - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'a2dismod userdir' - ), - 'files' => ((int)Settings::Get('phpfpm.enabled') == 1) ? - array( - 'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf' - ) - : - null, - 'restart' => array( - '/etc/init.d/apache2 restart' - ), - ), - 'lighttpd' => array( - 'label' => 'Lighttpd Webserver', - 'commands_1' => array( - 'apt-get install lighttpd', - ), - 'files' => array( - 'etc_lighttpd.conf' => '/etc/lighttpd/lighttpd.conf', - ), - 'commands_2' => array( - $configcommand['vhost'], - $configcommand['diroptions'], - $configcommand['v_inclighty'], - $configcommand['d_inclighty'], - 'lighty-disable-mod cgi', - 'lighty-disable-mod fastcgi', - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir') - ), - 'restart' => array( - '/etc/init.d/lighttpd restart' - ), - ), - 'nginx' => array( - 'label' => 'Nginx Webserver', - 'commands_1' => array( - 'apt-get install nginx php5-cgi', - ), - 'files' => array( - 'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf', - 'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi' - ), - 'commands_2' => array( - 'rm /etc/nginx/sites-enabled/default', - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod u+x /etc/init.d/php-fcgi' - ), - 'restart' => array( - '/etc/init.d/php-fcgi start', - '/etc/init.d/nginx restart' - ) - ), - ), - ), - 'dns' => array( - 'label' => $lng['admin']['configfiles']['dns'], - 'daemons' => array( - 'bind' => array( - 'label' => 'Bind9', - 'commands' => array( - 'apt-get install bind9', - 'echo "include \"' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf\";" >> /etc/bind/named.conf', - 'touch ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chown root:bind ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chmod 0644 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' - ), - 'restart' => array( - '/etc/init.d/bind9 restart' - ) - ), - 'powerdns' => array( - 'label' => 'PowerDNS', - 'files' => array( - 'etc_powerdns_pdns.conf' => '/etc/powerdns/pdns.conf', - 'etc_powerdns_pdns-froxlor.conf' => '/etc/powerdns/pdns_froxlor.conf', - ), - 'restart' => array( - '/etc/init.d/pdns restart' - ) - ), - ) - ), - 'smtp' => array( - 'label' => $lng['admin']['configfiles']['smtp'], - 'daemons' => array( - 'postfix_courier' => array( - 'label' => 'Postfix/Courier', - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql', - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'touch /etc/postfix/sasl/smtpd.conf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/sasl/smtpd.conf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0600 /etc/postfix/sasl/smtpd.conf', - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf', - 'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf' - ), - 'restart' => array( - 'newaliases', - '/etc/init.d/postfix restart' - ) - ), - 'dkim' => array( - 'label' => 'DomainKey filter', - 'commands_1' => array( - 'apt-get install dkim-filter', - 'mkdir -p /etc/postfix/dkim' - ), - 'files' => array( - 'dkim-filter.conf' => '/etc/dkim-filter.conf' - ), - 'commands_2' => array( - 'echo "milter_default_action = accept" >> /etc/postfix/main.cf', - 'echo "milter_protocol = 2" >> /etc/postfix/main.cf', - 'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf', - 'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf' - ), - 'restart' => array( - '/etc/init.d/dkim-filter restart', - '/etc/init.d/postfix restart' - ) - ), - 'postfix_dovecot' => array( - 'label' => 'Postfix/Dovecot', - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'apt-get install postfix postfix-mysql', - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:root /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0644 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_master.cf' => '/etc/postfix/master.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'restart' => array( - '/etc/init.d/postfix restart', - 'newaliases' - ) - ), - 'postfix_mxaccess' => array( - 'label' => 'Postfix MX-Access (anti spam)', - 'files' => array( - 'etc_postfix_mx_access' => '/etc/postfix/mx_access', - 'etc_postfix_main.cf' => '/etc/postfix/main.cf' - ), - 'commands_1' => array( - 'postmap /etc/postfix/mx_access' - ), - 'restart' => array( - '/etc/init.d/postfix restart' - ) - ), - 'exim4' => array( - 'label' => 'Exim4', - 'commands_1' => array( - 'dpkg-reconfigure exim4-config', - '# choose "no configuration at this time" and "splitted configuration files" in the dialog' - ), - 'files' => array( - 'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul', - 'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config', - 'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options', - 'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config', - 'etc_exim4_conf.d_transport_30_froxlor-config' => '/etc/exim4/conf.d/transport/30_froxlor-config' - ), - 'commands_2' => array( - 'chmod o-rx /var/lib/exim4', - 'chmod o-rx /etc/exim4/conf.d/main/10_froxlor-config_options' - ), - 'restart' => array( - '/etc/init.d/exim4 restart' - ) - ) - ) - ), - 'mail' => array( - 'label' => $lng['admin']['configfiles']['mail'], - 'daemons' => array( - 'courier' => array( - 'label' => 'Courier', - 'commands' => array( - 'apt-get install courier-pop courier-imap courier-authlib-mysql' - ), - 'files' => array( - 'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc', - 'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc' - ), - 'restart' => array( - '/etc/init.d/courier-authdaemon restart', - '/etc/init.d/courier-pop restart' - ) - ), - 'dovecot' => array( - 'label' => 'Dovecot', - 'commands_1' => array( - 'apt-get install dovecot-imapd dovecot-pop3d dovecot-postfix dovecot-mysql dovecot-managesieved dovecot-sieve mail-stack-delivery' - ), - 'files' => array( - - 'etc_dovecot_conf.d_01_mail_stack_delivery.conf' => '/etc/dovecot/conf.d/01-mail-stack-delivery.conf', - 'etc_dovecot_conf.d_10_auth.conf' => '/etc/dovecot/conf.d/10-auth.conf', - 'etc_dovecot_conf.d_auth-sql.conf.ext' => '/etc/dovecot/conf.d/auth-sql.conf.ext', - 'etc_dovecot_dovecot-sql.conf.ext' => '/etc/dovecot/dovecot-sql.conf.ext' - ), - 'commands_2' => array( - 'chmod 0640 /etc/dovecot/dovecot-sql.conf.ext' - ), - 'restart' => array( - '/etc/init.d/dovecot restart' - ) - ) - ) - ), - 'ftp' => array( - 'label' => $lng['admin']['configfiles']['ftp'], - 'daemons' => array( - 'proftpd' => array( - 'label' => 'ProFTPd', - 'commands' => array( - 'apt-get install proftpd-basic proftpd-mod-mysql' - ), - 'files' => array( - 'etc_proftpd_sql.conf' => '/etc/proftpd/sql.conf', - 'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf', - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'restart' => array( - '/etc/init.d/proftpd restart' - ) - ), - 'pure-ftpd' => array( - 'label' => 'Pure FTPd', - 'commands_1' => array( - 'apt-get install pure-ftpd-common pure-ftpd-mysql' - ), - 'files' => array( - 'etc_pure-ftpd_conf_MinUID' => '/etc/pure-ftpd/conf/MinUID', - 'etc_pure-ftpd_conf_MySQLConfigFile' => '/etc/pure-ftpd/conf/MySQLConfigFile', - 'etc_pure-ftpd_conf_NoAnonymous' => '/etc/pure-ftpd/conf/NoAnonymous', - 'etc_pure-ftpd_conf_MaxIdleTime' => '/etc/pure-ftpd/conf/MaxIdleTime', - 'etc_pure-ftpd_conf_ChrootEveryone' => '/etc/pure-ftpd/conf/ChrootEveryone', - 'etc_pure-ftpd_conf_PAMAuthentication' => '/etc/pure-ftpd/conf/PAMAuthentication', - 'etc_pure-ftpd_db_mysql.conf' => '/etc/pure-ftpd/db/mysql.conf', - 'etc_pure-ftpd_conf_CustomerProof' => '/etc/pure-ftpd/conf/CustomerProof', - 'etc_pure-ftpd_conf_Bind' => '/etc/pure-ftpd/conf/Bind', - 'etc_default_pure-ftpd-common' => '/etc/default/pure-ftpd-common' - ), - 'commands_2' => array( - 'chmod 0640 /etc/pure-ftpd/db/mysql.conf' - ), - 'restart' => array( - '/etc/init.d/pure-ftpd-mysql restart' - ) - ), - ) - ), - 'etc' => array( - 'label' => $lng['admin']['configfiles']['etc'], - 'daemons' => array( - 'cron' => array( - 'label' => 'Crond (cronscript)', - 'files' => array( - 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' - ), - 'restart' => array( - Settings::Get('system.crondreload') - ) - ), - 'awstats' => array( - 'label' => 'Awstats', - 'commands' => array( - 'apt-get install awstats', - 'cp /usr/share/awstats/tools/awstats_buildstaticpages.pl '.makeCorrectDir(Settings::Get('system.awstats_path')), - 'mv '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.conf').' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself', - 'rm /etc/cron.d/awstats' - ), - ), - 'libnss' => array( - 'label' => 'libnss-bg (system login with mysql)', - 'commands' => array( - 'apt-get install libnss-mysql-bg nscd', - 'chmod 600 /etc/libnss-mysql.cfg /etc/libnss-mysql-root.cfg' - ), - 'files' => array( - 'etc_libnss-mysql.cfg' => '/etc/libnss-mysql.cfg', - 'etc_libnss-mysql-root.cfg' => '/etc/libnss-mysql-root.cfg', - 'etc_nsswitch.conf' => '/etc/nsswitch.conf', - ), - 'restart' => array( - '/etc/init.d/nscd restart' - ) - ), - 'logrotate' => array( - 'label' => 'Logrotate', - 'commands_1' => array( - 'apt-get install logrotate', - 'touch /etc/logrotate.d/froxlor', - 'chmod 644 /etc/logrotate.d/froxlor' - ), - 'files' => array( - 'etc_logrotated_froxlor' => '/etc/logrotate.d/froxlor' - ), - 'commands_2' => array( - '# apt automatically adds a daily cronjob for logrotate', - '# you do not have to do anything else :)' - ) - ) - ) - ) - ) - ) -); diff --git a/lib/configfiles/rhel7.inc.php b/lib/configfiles/rhel7.inc.php deleted file mode 100644 index 9c6f5c4b..00000000 --- a/lib/configfiles/rhel7.inc.php +++ /dev/null @@ -1,169 +0,0 @@ - (2014-) - * @author Froxlor team (2014-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Configfiles - * - */ - -// Try to guess user/group from settings' email UID/GID -$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid')); -$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid')); - -/* If one of them are not set, call it 'vmail' and suggest creating user/group - * in scripts. */ -if ($vmail_user === false) { - $vmail_username="vmail"; -} else { - $vmail_username=$vmail_user['name']; -} -if ($vmail_group === false) { - $vmail_groupname="vmail"; -} else { - $vmail_groupname=$vmail_group['name']; -} - -return array( - 'rhel7' => array( - 'label' => 'RHEL / CentOS 7', - 'services' => array( - 'http' => array( - 'label' => $lng['admin']['configfiles']['http'], - 'daemons' => array( - 'apache' => array( - 'label' => 'Apache 2.4', - 'commands' => array( - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '' - ), - 'restart' => array( - 'systemctl reload-or-restart httpd.service' - ) - ), - ), - ), - 'smtp' => array( - 'label' => $lng['admin']['configfiles']['smtp'], - 'daemons' => array( - 'postfix' => array( - 'label' => 'Postfix 2.10', - 'commands_install' => array( - 'yum install postfix', - 'systemctl enable postfix.service', - ), - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/mysql-*.cf', - 'chmod 0600 /etc/postfix/mysql-*.cf', - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_master.cf' => '/etc/postfix/master.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'restart' => array( - 'newaliases', - 'systemctl reload-or-restart postfix.service' - ) - ), - ) - ), - 'mail' => array( - 'label' => $lng['admin']['configfiles']['mail'], - 'daemons' => array( - 'dovecot' => array( - 'label' => 'Dovecot 2.2', - 'commands_install' => array( - 'yum install dovecot dovecot-mysql dovecot-pigeonhole', - 'systemctl enable dovecot.service', - ), - 'commands' => array( - 'touch /etc/dovecot/dovecot-sql.conf.ext', - 'chmod 0600 /etc/dovecot/dovecot-sql.conf.ext', - ), - 'files' => array( - 'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf', - 'etc_dovecot_dovecot-sql.conf.ext' => '/etc/dovecot/dovecot-sql.conf.ext', - 'etc_dovecot_conf.d_10-auth.conf' => '/etc/dovecot/conf.d/10-auth.conf', - 'etc_dovecot_conf.d_10-logging.conf' => '/etc/dovecot/conf.d/10-logging.conf', - 'etc_dovecot_conf.d_10-mail.conf' => '/etc/dovecot/conf.d/10-mail.conf', - 'etc_dovecot_conf.d_10-master.conf' => '/etc/dovecot/conf.d/10-master.conf', - 'etc_dovecot_conf.d_10-ssl.conf' => '/etc/dovecot/conf.d/10-ssl.conf', - 'etc_dovecot_conf.d_15-lda.conf' => '/etc/dovecot/conf.d/15-lda.conf', - 'etc_dovecot_conf.d_15-mailboxes.conf' => '/etc/dovecot/conf.d/15-mailboxes.conf', - 'etc_dovecot_conf.d_20-imap.conf' => '/etc/dovecot/conf.d/20-imap.conf', - 'etc_dovecot_conf.d_20-lmtp.conf' => '/etc/dovecot/conf.d/20-lmtp.conf', - 'etc_dovecot_conf.d_20-managesieve.conf' => '/etc/dovecot/conf.d/20-managesieve.conf', - 'etc_dovecot_conf.d_20-pop3.conf' => '/etc/dovecot/conf.d/20-pop3.conf', - 'etc_dovecot_conf.d_90-sieve.conf' => '/etc/dovecot/conf.d/90-sieve.conf', - ), - 'restart' => array( - 'systemctl reload-or-restart dovecot.service', - ) - ), - ) - ), - 'ftp' => array( - 'label' => $lng['admin']['configfiles']['ftp'], - 'daemons' => array( - 'proftpd' => array( - 'label' => 'ProFTPd 1.3', - 'commands_install' => array( - 'yum install proftpd proftpd-mysql', - 'systemctl enable proftpd.service', - ), - 'files' => array( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'restart' => array( - 'systemctl reload-or-restart proftpd.service' - ) - ), - ) - ), - 'etc' => array( - 'label' => $lng['admin']['configfiles']['etc'], - 'daemons' => array( - 'cron' => array( - 'label' => 'Crond (cronscript)', - 'files' => array( - 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' - ), - 'restart' => array( - 'systemctl reload-or-restart crond.service' - ) - ), - 'awstats' => array( - 'label' => 'Awstats', - 'commands' => array( - 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself' - ) - ) - ) - ) - ) - ) -); diff --git a/lib/configfiles/trusty.inc.php b/lib/configfiles/trusty.inc.php deleted file mode 100644 index 6b84f909..00000000 --- a/lib/configfiles/trusty.inc.php +++ /dev/null @@ -1,416 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Configfiles - * - */ - -// Try to guess user/group from settings' email UID/GID -$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid')); -$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid')); - -/* If one of them are not set, call it 'vmail' and suggest creating user/group - * in scripts. */ -if ($vmail_user === false) { - $vmail_username="vmail"; -} else { - $vmail_username=$vmail_user['name']; -} -if ($vmail_group === false) { - $vmail_groupname="vmail"; -} else { - $vmail_groupname=$vmail_group['name']; -} - -return array( - 'ubuntu_trusty' => array( - 'label' => 'Ubuntu 14.04 (Trusty)', - 'services' => array( - 'http' => array( - 'label' => $lng['admin']['configfiles']['http'], - 'daemons' => array( - 'apache2' => array( - 'label' => 'Apache 2', - 'commands' => array( - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'a2dismod userdir' - ), - 'files' => ((int)Settings::Get('phpfpm.enabled') == 1) ? - array( - 'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf' - ) - : - null, - 'restart' => array( - 'service apache2 restart' - ), - ), - 'lighttpd' => array( - 'label' => 'Lighttpd Webserver', - 'commands_1' => array( - 'apt-get install lighttpd', - ), - 'files' => array( - 'etc_lighttpd.conf' => '/etc/lighttpd/lighttpd.conf', - ), - 'commands_2' => array( - $configcommand['vhost'], - $configcommand['diroptions'], - $configcommand['v_inclighty'], - $configcommand['d_inclighty'], - 'lighty-disable-mod cgi', - 'lighty-disable-mod fastcgi', - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir') - ), - 'restart' => array( - 'service lighttpd restart' - ), - ), - 'nginx' => array( - 'label' => 'Nginx Webserver', - 'commands_1' => array( - 'apt-get install nginx php5-cgi php5-cli', - ), - 'files' => array( - 'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf', - 'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi' - ), - 'commands_2' => array( - 'rm /etc/nginx/sites-enabled/default', - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod u+x /etc/init.d/php-fcgi' - ), - 'restart' => array( - 'service php-fcgi start', - 'service nginx restart' - ) - ), - ), - ), - 'dns' => array( - 'label' => $lng['admin']['configfiles']['dns'], - 'daemons' => array( - 'bind' => array( - 'label' => 'Bind9', - 'commands' => array( - 'apt-get install bind9', - 'echo "include \"' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf\";" >> /etc/bind/named.conf', - 'touch ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chown root:bind ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chmod 0644 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' - ), - 'restart' => array( - 'service bind9 restart' - ) - ), - 'powerdns' => array( - 'label' => 'PowerDNS', - 'files' => array( - 'etc_powerdns_pdns.conf' => '/etc/powerdns/pdns.conf', - 'etc_powerdns_pdns-froxlor.conf' => '/etc/powerdns/pdns_froxlor.conf', - ), - 'restart' => array( - 'service pdns restart' - ) - ), - ) - ), - 'smtp' => array( - 'label' => $lng['admin']['configfiles']['smtp'], - 'daemons' => array( - 'postfix_courier' => array( - 'label' => 'Postfix/Courier', - 'commands' => array( - 'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql', - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'touch /etc/postfix/sasl/smtpd.conf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/sasl/smtpd.conf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0600 /etc/postfix/sasl/smtpd.conf', - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf', - 'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf' - ), - 'restart' => array( - 'newaliases', - 'service postfix restart' - ) - ), - 'dkim' => array( - 'label' => 'DomainKey filter', - 'commands_1' => array( - 'apt-get install dkim-filter', - 'mkdir -p /etc/postfix/dkim' - ), - 'files' => array( - 'dkim-filter.conf' => '/etc/dkim-filter.conf' - ), - 'commands_2' => array( - 'echo "milter_default_action = accept" >> /etc/postfix/main.cf', - 'echo "milter_protocol = 2" >> /etc/postfix/main.cf', - 'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf', - 'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf' - ), - 'restart' => array( - 'service dkim-filter restart', - 'service postfix restart' - ) - ), - 'postfix_dovecot' => array( - 'label' => 'Postfix/Dovecot', - 'commands' => array( - 'apt-get install postfix postfix-mysql', - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:root /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0644 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_master.cf' => '/etc/postfix/master.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'restart' => array( - 'newaliases', - 'service postfix restart' - ) - ), - 'postfix_mxaccess' => array( - 'label' => 'Postfix MX-Access (anti spam)', - 'files' => array( - 'etc_postfix_mx_access' => '/etc/postfix/mx_access', - 'etc_postfix_main.cf' => '/etc/postfix/main.cf' - ), - 'commands_1' => array( - 'postmap /etc/postfix/mx_access' - ), - 'restart' => array( - 'service postfix restart' - ) - ), - 'exim4' => array( - 'label' => 'Exim4', - 'commands_1' => array( - 'dpkg-reconfigure exim4-config', - '# choose "no configuration at this time" and "splitted configuration files" in the dialog' - ), - 'files' => array( - 'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul', - 'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config', - 'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options', - 'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config', - 'etc_exim4_conf.d_transport_30_froxlor-config' => '/etc/exim4/conf.d/transport/30_froxlor-config' - ), - 'commands_2' => array( - 'chmod o-rx /var/lib/exim4', - 'chmod o-rx /etc/exim4/conf.d/main/10_froxlor-config_options' - ), - 'restart' => array( - 'service exim4 restart' - ) - ) - ) - ), - 'mail' => array( - 'label' => $lng['admin']['configfiles']['mail'], - 'daemons' => array( - 'courier' => array( - 'label' => 'Courier', - 'commands' => array( - 'apt-get install courier-pop courier-imap courier-authlib-mysql' - ), - 'files' => array( - 'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc', - 'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc' - ), - 'restart' => array( - 'service courier-authdaemon restart', - 'service courier-pop restart' - ) - ), - 'dovecot' => array( - 'label' => 'Dovecot', - 'commands_1' => array( - 'apt-get install dovecot-imapd dovecot-pop3d dovecot-mysql mail-stack-delivery' - ), - 'files' => array( - 'etc_dovecot_conf.d_01_mail_stack_delivery.conf' => '/etc/dovecot/conf.d/01-mail-stack-delivery.conf', - 'etc_dovecot_conf.d_10_auth.conf' => '/etc/dovecot/conf.d/10-auth.conf', - 'etc_dovecot_dovecot-sql.conf.ext' => '/etc/dovecot/dovecot-sql.conf.ext' - ), - 'restart' => array( - 'service dovecot restart' - ) - ) - ) - ), - 'ftp' => array( - 'label' => $lng['admin']['configfiles']['ftp'], - 'daemons' => array( - 'proftpd' => array( - 'label' => 'ProFTPd', - 'commands' => array( - 'apt-get install proftpd-basic proftpd-mod-mysql' - ), - 'files' => array( - 'etc_proftpd_sql.conf' => '/etc/proftpd/sql.conf', - 'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf', - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'restart' => array( - 'service proftpd restart' - ) - ), - 'pure-ftpd' => array( - 'label' => 'Pure FTPd', - 'commands_1' => array( - 'apt-get install pure-ftpd-common pure-ftpd-mysql' - ), - 'files' => array( - 'etc_pure-ftpd_conf_MinUID' => '/etc/pure-ftpd/conf/MinUID', - 'etc_pure-ftpd_conf_MySQLConfigFile' => '/etc/pure-ftpd/conf/MySQLConfigFile', - 'etc_pure-ftpd_conf_NoAnonymous' => '/etc/pure-ftpd/conf/NoAnonymous', - 'etc_pure-ftpd_conf_MaxIdleTime' => '/etc/pure-ftpd/conf/MaxIdleTime', - 'etc_pure-ftpd_conf_ChrootEveryone' => '/etc/pure-ftpd/conf/ChrootEveryone', - 'etc_pure-ftpd_conf_PAMAuthentication' => '/etc/pure-ftpd/conf/PAMAuthentication', - 'etc_pure-ftpd_db_mysql.conf' => '/etc/pure-ftpd/db/mysql.conf', - 'etc_pure-ftpd_conf_CustomerProof' => '/etc/pure-ftpd/conf/CustomerProof', - 'etc_pure-ftpd_conf_Bind' => '/etc/pure-ftpd/conf/Bind', - 'etc_default_pure-ftpd-common' => '/etc/default/pure-ftpd-common' - ), - 'commands_2' => array( - 'chmod 0640 /etc/pure-ftpd/db/mysql.conf' - ), - 'restart' => array( - 'service pure-ftpd-mysql restart' - ) - ), - ) - ), - 'etc' => array( - 'label' => $lng['admin']['configfiles']['etc'], - 'daemons' => array( - 'cron' => array( - 'label' => 'Crond (cronscript)', - 'files' => array( - 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' - ), - 'restart' => array( - Settings::Get('system.crondreload') - ) - ), - 'awstats' => array( - 'label' => 'Awstats', - 'commands' => array( - 'apt-get install awstats', - 'cp /usr/share/awstats/tools/awstats_buildstaticpages.pl '.makeCorrectDir(Settings::Get('system.awstats_path')), - 'mv '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.conf').' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself', - 'rm /etc/cron.d/awstats' - ), - ), - 'libnss' => array( - 'label' => 'libnss-bg (system login with mysql)', - 'commands' => array( - 'apt-get install libnss-mysql-bg nscd', - 'chmod 600 /etc/libnss-mysql.cfg /etc/libnss-mysql-root.cfg' - ), - 'files' => array( - 'etc_libnss-mysql.cfg' => '/etc/libnss-mysql.cfg', - 'etc_libnss-mysql-root.cfg' => '/etc/libnss-mysql-root.cfg', - 'etc_nsswitch.conf' => '/etc/nsswitch.conf', - ), - 'restart' => array( - 'service nscd restart' - ) - ), - 'logrotate' => array( - 'label' => 'Logrotate', - 'commands_1' => array( - 'apt-get install logrotate', - 'touch /etc/logrotate.d/froxlor', - 'chmod 644 /etc/logrotate.d/froxlor' - ), - 'files' => array( - 'etc_logrotated_froxlor' => '/etc/logrotate.d/froxlor' - ), - 'commands_2' => array( - '# apt automatically adds a daily cronjob for logrotate', - '# you do not have to do anything else :)' - ) - ) - ) - ) - ) - ) -); diff --git a/lib/configfiles/wheezy.inc.php b/lib/configfiles/wheezy.inc.php deleted file mode 100644 index de5317cd..00000000 --- a/lib/configfiles/wheezy.inc.php +++ /dev/null @@ -1,457 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Configfiles - * - */ - -// Try to guess user/group from settings' email UID/GID -$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid')); -$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid')); - -/* If one of them are not set, call it 'vmail' and suggest creating user/group - * in scripts. */ -if ($vmail_user === false) { - $vmail_username="vmail"; -} else { - $vmail_username=$vmail_user['name']; -} -if ($vmail_group === false) { - $vmail_groupname="vmail"; -} else { - $vmail_groupname=$vmail_group['name']; -} - -return array( - 'debian_wheezy' => array( - 'label' => 'Debian 7.0 (Wheezy)', - 'services' => array( - 'http' => array( - 'label' => $lng['admin']['configfiles']['http'], - 'daemons' => array( - 'apache2' => array( - 'label' => 'Apache 2', - 'commands' => array( - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'a2dismod userdir' - ), - 'files' => ((int)Settings::Get('phpfpm.enabled') == 1) ? - array( - 'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf' - ) - : - null, - 'restart' => array( - '/etc/init.d/apache2 restart' - ), - ), - 'lighttpd' => array( - 'label' => 'Lighttpd Webserver', - 'commands_1' => array( - 'apt-get install lighttpd', - ), - 'files' => array( - 'etc_lighttpd.conf' => '/etc/lighttpd/lighttpd.conf', - ), - 'commands_2' => array( - $configcommand['vhost'], - $configcommand['diroptions'], - $configcommand['v_inclighty'], - $configcommand['d_inclighty'], - 'lighty-disable-mod cgi', - 'lighty-disable-mod fastcgi', - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir') - ), - 'restart' => array( - '/etc/init.d/lighttpd restart' - ) - ), - 'nginx' => array( - 'label' => 'Nginx Webserver', - 'commands_1' => array( - 'apt-get install nginx php5-cgi', - ), - 'files' => array( - 'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf', - 'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi' - ), - 'commands_2' => array( - 'rm /etc/nginx/sites-enabled/default', - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod u+x /etc/init.d/php-fcgi' - ), - 'restart' => array( - '/etc/init.d/php-fcgi start', - '/etc/init.d/nginx restart' - ) - ) - ) - ), - 'dns' => array( - 'label' => $lng['admin']['configfiles']['dns'], - 'daemons' => array( - 'bind' => array( - 'label' => 'Bind9', - 'commands' => array( - 'apt-get install bind9', - 'echo "include \"' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf\";" >> /etc/bind/named.conf.local', - 'touch ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chown root:bind ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chmod 0644 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' - ), - 'restart' => array( - '/etc/init.d/bind9 restart' - ) - ), - 'powerdns' => array( - 'label' => 'PowerDNS', - 'files' => array( - 'etc_powerdns_pdns.conf' => '/etc/powerdns/pdns.conf', - 'etc_powerdns_bindbackend.conf' => '/etc/powerdns/bindbackend.conf', - ), - 'restart' => array( - '/etc/init.d/pdns restart' - ) - ), - ) - ), - 'smtp' => array( - 'label' => $lng['admin']['configfiles']['smtp'], - 'daemons' => array( - 'postfix_courier' => array( - 'label' => 'Postfix/Courier', - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' '.$vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql', - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'touch /etc/postfix/sasl/smtpd.conf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/sasl/smtpd.conf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0600 /etc/postfix/sasl/smtpd.conf', - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf', - 'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf', - 'etc_aliases' => '/etc/aliases' - ), - 'restart' => array( - 'newaliases', - '/etc/init.d/postfix restart' - ) - ), - 'dkim' => array( - 'label' => 'DomainKey filter', - 'commands_1' => array( - 'apt-get install opendkim', - 'mkdir -p /etc/postfix/dkim' - ), - 'files' => array( - 'opendkim.conf' => '/etc/opendkim.conf' - ), - 'commands_2' => array( - 'echo "milter_default_action = accept" >> /etc/postfix/main.cf', - 'echo "milter_protocol = 6" >> /etc/postfix/main.cf', - 'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf', - 'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf' - ), - 'restart' => array( - '/etc/init.d/opendkim restart', - '/etc/init.d/postfix restart' - ) - ), - 'postfix_dovecot' => array( - 'label' => 'Postfix/Dovecot', - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R ' . $vmail_username . ':' . $vmail_groupname . ' ' . Settings::Get('system.vmail_homedir'), - 'apt-get install postfix postfix-mysql', - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:root /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0644 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_master.cf' => '/etc/postfix/master.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf', - 'etc_aliases' => '/etc/aliases' - ), - 'restart' => array( - 'newaliases', - '/etc/init.d/postfix restart' - ) - ), - 'postfix_mxaccess' => array( - 'label' => 'Postfix MX-Access (anti spam)', - 'files' => array( - 'etc_postfix_mx_access' => '/etc/postfix/mx_access', - 'etc_postfix_main.cf' => '/etc/postfix/main.cf' - ), - 'commands_1' => array( - 'postmap /etc/postfix/mx_access' - ), - 'restart' => array( - '/etc/init.d/postfix restart' - ) - ), - 'exim4' => array( - 'label' => 'Exim4', - 'commands_1' => array( - 'dpkg-reconfigure exim4-config', - '# choose "no configuration at this time" and "splitted configuration files" in the dialog' - ), - 'files' => array( - 'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt', - 'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config', - 'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options', - 'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config', - 'etc_exim4_conf.d_transport_30_froxlor-config' => '/etc/exim4/conf.d/transport/30_froxlor-config' - ), - 'commands_2' => array( - 'chmod o-rx /var/lib/exim4', - 'chmod o-rx /etc/exim4/conf.d/main/10_froxlor-config_options' - ), - 'restart' => array( - '/etc/init.d/exim4 restart' - ) - ) - ) - ), - 'mail' => array( - 'label' => $lng['admin']['configfiles']['mail'], - 'daemons' => array( - 'courier' => array( - 'label' => 'Courier', - 'commands' => array( - 'apt-get install courier-pop courier-imap courier-authlib-mysql' - ), - 'files' => array( - 'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc', - 'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc' - ), - 'restart' => array( - '/etc/init.d/courier-authdaemon restart', - '/etc/init.d/courier-pop restart' - ) - ), - 'dovecot' => array( - 'label' => 'Dovecot', - 'commands_1' => array( - 'apt-get install dovecot-imapd dovecot-pop3d dovecot-mysql dovecot-managesieved dovecot-sieve' - ), - 'files' => array( - 'etc_dovecot_conf.d_10-auth.conf' => '/etc/dovecot/conf.d/10-auth.conf', - 'etc_dovecot_conf.d_10-mail.conf' => '/etc/dovecot/conf.d/10-mail.conf', - 'etc_dovecot_conf.d_10-master.conf' => '/etc/dovecot/conf.d/10-master.conf', - 'etc_dovecot_conf.d_15-lda.conf' => '/etc/dovecot/conf.d/15-lda.conf', - 'etc_dovecot_conf.d_20-imap.conf' => '/etc/dovecot/conf.d/20-imap.conf', - 'etc_dovecot_conf.d_20-pop3.conf' => '/etc/dovecot/conf.d/20-pop3.conf', - 'etc_dovecot_conf.d_20-managesieve.conf' => '/etc/dovecot/20-managesieve.conf', - 'etc_dovecot_conf.d_90-sieve.conf' => '/etc/dovecot/90-sieve.conf', - 'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf', - 'etc_dovecot_dovecot-sql.conf.ext' => '/etc/dovecot/dovecot-sql.conf.ext' - ), - 'restart' => array( - '/etc/init.d/dovecot restart' - ) - ) - ) - ), - 'ftp' => array( - 'label' => $lng['admin']['configfiles']['ftp'], - 'daemons' => array( - 'proftpd' => array( - 'label' => 'ProFTPd', - 'commands' => array( - 'apt-get install proftpd-basic proftpd-mod-mysql' - ), - 'files' => array( - 'etc_proftpd_sql.conf' => '/etc/proftpd/sql.conf', - 'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf', - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'restart' => array( - '/etc/init.d/proftpd restart' - ) - ), - 'pure-ftpd' => array( - 'label' => 'Pure FTPd', - 'commands_1' => array( - 'apt-get install pure-ftpd-common pure-ftpd-mysql' - ), - 'files' => array( - 'etc_pure-ftpd_conf_MinUID' => '/etc/pure-ftpd/conf/MinUID', - 'etc_pure-ftpd_conf_MySQLConfigFile' => '/etc/pure-ftpd/conf/MySQLConfigFile', - 'etc_pure-ftpd_conf_NoAnonymous' => '/etc/pure-ftpd/conf/NoAnonymous', - 'etc_pure-ftpd_conf_MaxIdleTime' => '/etc/pure-ftpd/conf/MaxIdleTime', - 'etc_pure-ftpd_conf_ChrootEveryone' => '/etc/pure-ftpd/conf/ChrootEveryone', - 'etc_pure-ftpd_conf_PAMAuthentication' => '/etc/pure-ftpd/conf/PAMAuthentication', - 'etc_pure-ftpd_db_mysql.conf' => '/etc/pure-ftpd/db/mysql.conf', - 'etc_pure-ftpd_conf_CustomerProof' => '/etc/pure-ftpd/conf/CustomerProof', - 'etc_pure-ftpd_conf_Bind' => '/etc/pure-ftpd/conf/Bind', - 'etc_default_pure-ftpd-common' => '/etc/default/pure-ftpd-common' - ), - 'commands_2' => array( - 'chmod 0640 /etc/pure-ftpd/db/mysql.conf' - ), - 'restart' => array( - '/etc/init.d/pure-ftpd-mysql restart' - ) - ), - ) - ), - 'etc' => array( - 'label' => $lng['admin']['configfiles']['etc'], - 'daemons' => array( - 'cron' => array( - 'label' => 'Crond (cronscript)', - 'files' => array( - 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' - ), - 'restart' => array( - Settings::Get('system.crondreload') - ) - ), - 'awstats' => array( - 'label' => 'Awstats', - 'commands' => array( - 'apt-get install awstats', - 'cp /usr/share/awstats/tools/awstats_buildstaticpages.pl '.makeCorrectDir(Settings::Get('system.awstats_path')), - 'mv '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.conf').' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself', - 'rm /etc/cron.d/awstats' - ), - ), - 'libnss' => array( - 'label' => 'libnss (system login with mysql)', - 'commands' => array( - 'apt-get install libnss-mysql-bg nscd', - 'chmod 600 /etc/libnss-mysql.cfg /etc/libnss-mysql-root.cfg' - ), - 'files' => array( - 'etc_libnss-mysql.cfg' => '/etc/libnss-mysql.cfg', - 'etc_libnss-mysql-root.cfg' => '/etc/libnss-mysql-root.cfg', - 'etc_nsswitch.conf' => '/etc/nsswitch.conf', - ), - 'restart' => array( - '/etc/init.d/nscd restart' - ) - ), - 'logrotate' => array( - 'label' => 'Logrotate', - 'commands_1' => array( - 'apt-get install logrotate', - 'touch /etc/logrotate.d/froxlor', - 'chmod 644 /etc/logrotate.d/froxlor' - ), - 'files' => array( - 'etc_logrotated_froxlor' => '/etc/logrotate.d/froxlor' - ), - 'commands_2' => array( - '# apt automatically adds a daily cronjob for logrotate', - '# you do not have to do anything else :)' - ) - ), - 'fcgid' => array( - 'label' => 'FCGID', - 'commands' => array( - 'apt-get install apache2-suexec libapache2-mod-fcgid php5-cgi', - 'a2enmod suexec fcgid', - (Settings::Get('system.mod_fcgid_ownvhost') == '1') ? 'groupadd -f '.Settings::Get('system.mod_fcgid_httpgroup') : null, - (Settings::Get('system.mod_fcgid_ownvhost') == '1') ? 'useradd -s /bin/false -g '.Settings::Get('system.mod_fcgid_httpgroup').' '.Settings::Get('system.mod_fcgid_httpuser') : null, - (Settings::Get('system.mod_fcgid_ownvhost') == '1') ? 'chown -R '.Settings::Get('system.mod_fcgid_httpuser').':'.Settings::Get('system.mod_fcgid_httpgroup').' '.FROXLOR_INSTALL_DIR : null, - (Settings::Get('system.mod_fcgid_ownvhost') == '1') ? 'mkdir -p '.makeCorrectDir(Settings::Get('system.mod_fcgid_configdir')) : null, - (Settings::Get('system.mod_fcgid_ownvhost') == '1') ? 'mkdir -p '.makeCorrectDir(Settings::Get('system.mod_fcgid_tmpdir')) : null, - (Settings::Get('system.mod_fcgid_ownvhost') == '1') ? 'a2dismod php5' : null - ), - 'restart' => array( - Settings::Get('system.apachereload_command') - ) - ), - 'php-fpm' => array( - 'label' => 'PHP-FPM', - 'commands' => array( - (Settings::Get('system.webserver') == 'apache2') ? '# add "non-free" after all occurrences of "main" in /etc/apt/sources.list' : null, - (Settings::Get('system.webserver') == 'apache2') ? '# this is needed for libapache2-mod-fastcgi to install' : null, - 'apt-get install '.((Settings::Get('system.webserver') == 'apache2') ? 'apache2-suexec libapache2-mod-fastcgi ' : '') . 'php5-fpm', - 'rm /etc/php5/fpm/pool.d/www.conf', - (Settings::Get('system.webserver') == 'apache2') ? 'a2enmod suexec fastcgi actions' : null, - (Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'groupadd -f '.Settings::Get('phpfpm.vhost_httpgroup') : null, - (Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'useradd -s /bin/false -g '.Settings::Get('phpfpm.vhost_httpgroup').' '.Settings::Get('phpfpm.vhost_httpuser') : null, - (Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'usermod -aG '.Settings::Get('phpfpm.vhost_httpgroup').' '.Settings::Get('system.httpuser') : null, - (Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'chown -R '.Settings::Get('phpfpm.vhost_httpuser').':'.Settings::Get('phpfpm.vhost_httpgroup').' '.FROXLOR_INSTALL_DIR : null, - (Settings::Get('system.webserver') == 'apache2' && Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'a2dismod php5' : null - ), - 'restart' => array( - Settings::Get('system.apachereload_command') - ) - ) - ) - ) - ) - ) -); From 5e60b96cd6ce6f5fc1f9bf9ad7e893bc3a92fcfc Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 29 Jul 2015 14:56:06 +0200 Subject: [PATCH 14/34] add tentative jessie config xml file, testers are welcome Signed-off-by: Michael Kaufmann (d00p) --- lib/configfiles/jessie.xml | 3846 ++++++++++++++++++++++++++++++++++++ 1 file changed, 3846 insertions(+) create mode 100644 lib/configfiles/jessie.xml diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml new file mode 100644 index 00000000..c50d4a33 --- /dev/null +++ b/lib/configfiles/jessie.xml @@ -0,0 +1,3846 @@ + + + + + + + + + + + {{settings.system.apacheconf_vhost}} + + + + + {{settings.system.apacheconf_vhost}} + + + + + + + {{settings.system.apacheconf_diroptions}} + + + + + {{settings.system.apacheconf_diroptions}} + + + + + + + + + + + {{settings.system.deactivateddocroot}} + + + + + + + + + + //service[@type='http']/general/commands + + {{settings.phpfpm.enabled}} + + + + + {{settings.phpfpm.enabled}} + + + FastCgiIpcDir + + + Require all granted + Require env REDIRECT_STATUS + + +]]> + + + + + + + + + + + + //service[@type='http']/general/commands + + {{settings.system.apacheconf_vhost}} + + > /etc/lighttpd/lighttpd.conf]]> + + + {{settings.system.apacheconf_vhost}} + + > /etc/lighttpd/lighttpd.conf]]> + + + {{settings.system.apacheconf_diroptions}} + + > /etc/lighttpd/lighttpd.conf]]> + + + {{settings.system.apacheconf_diroptions}} + + > /etc/lighttpd/lighttpd.conf]]> + + + + + + + + + + {{settings.phpfpm.enabled}} + + {{settings.system.mod_fcgid}} + + + + + + + + + + + + + {{settings.phpfpm.enabled}} + + {{settings.system.mod_fcgid}} + + + + + //service[@type='http']/general/commands + + {{settings.phpfpm.enabled}} + + {{settings.system.mod_fcgid}} + + + + + + + + + + + + > /etc/bind/named.conf.local]]> + + + + + + + + + + +################################# +# allow-recursion List of netmasks that are allowed to recurse +# +allow-recursion=127.0.0.1 + +################################# +# allow-recursion-override Local data even about hosts that don't exist will +# override the internet. (on/off) +# +# allow-recursion-override= + +################################# +# cache-ttl Seconds to store packets in the PacketCache +# +# cache-ttl=20 + +################################# +# chroot If set, chroot to this directory for more security +# +# chroot=/var/spool/powerdns + +################################# +# config-dir Location of configuration directory (pdns.conf) +# +config-dir=/etc/powerdns + +################################# +# config-name Name of this virtual configuration - will rename the binary image +# +# config-name= + +################################# +# control-console Debugging switch - don't use +# +# control-console=no + +################################# +# daemon Operate as a daemon +# +daemon=yes + +################################# +# default-soa-name name to insert in the SOA record if none set in the backend +# +# default-soa-name=a.misconfigured.powerdns.server + +################################# +# disable-axfr Disable zonetransfers but do allow TCP queries +# +disable-axfr=yes + +################################# +# disable-tcp Do not listen to TCP queries +# +# disable-tcp=no + +################################# +# distributor-threads Default number of Distributor (backend) threads to start +# +# distributor-threads=3 + +################################# +# fancy-records Process URL and MBOXFW records +# +# fancy-records=no + +################################# +# guardian Run within a guardian process +# +guardian=yes + +################################# +# launch Which backends to launch and order to query them in +# +launch=bind + +################################# +# lazy-recursion Only recurse if question cannot be answered locally +# +lazy-recursion=yes + +################################# +# load-modules Load this module - supply absolute or relative path +# +# load-modules= + +################################# +# local-address Local IP address to which we bind +# +local-address=,127.0.0.1 + +################################# +# local-ipv6 Local IP address to which we bind +# +# local-ipv6= + +################################# +# local-port The port on which we listen +# +local-port=53 + +################################# +# log-dns-details If PDNS should log failed update requests +# +log-dns-details=yes + +################################# +# log-failed-updates If PDNS should log failed update requests +# +# log-failed-updates= + +################################# +# logfile Logfile to use +# +# logfile=/var/log/pdns.log + +################################# +# logging-facility Log under a specific facility +# +# logging-facility= + +################################# +# loglevel Amount of logging. Higher is more. Do not set below 3 +# +# loglevel=4 + +################################# +# master Act as a master +# +master=yes + +################################# +# max-queue-length Maximum queuelength before considering situation lost +# +# max-queue-length=5000 + +################################# +# max-tcp-connections Maximum number of TCP connections +# +# max-tcp-connections=10 + +################################# +# module-dir Default directory for modules +# +module-dir=/usr/lib/powerdns + +################################# +# negquery-cache-ttl Seconds to store packets in the PacketCache +# +# negquery-cache-ttl=60 + +################################# +# out-of-zone-additional-processing Do out of zone additional processing +# +# out-of-zone-additional-processing=no + +################################# +# query-cache-ttl Seconds to store packets in the PacketCache +# +# query-cache-ttl=20 + +################################# +# query-logging Hint backends that queries should be logged +# +# query-logging=no + +################################# +# queue-limit Maximum number of milliseconds to queue a query +# +# queue-limit=1500 + +################################# +# query-local-address The IP address to use as a source address for sending +# queries. +# query-local-address= + +################################# +# receiver-threads Number of receiver threads to launch +# +# receiver-threads=1 + +################################# +# recursive-cache-ttl Seconds to store packets in the PacketCache +# +# recursive-cache-ttl=10 + +################################# +# recursor If recursion is desired, IP address of a recursing nameserver +# +# recursor= + +################################# +# setgid If set, change group id to this gid for more security +# +setgid=pdns + +################################# +# setuid If set, change user id to this uid for more security +# +setuid=pdns + +################################# +# skip-cname Do not perform CNAME indirection for each query +# +# skip-cname=no + +################################# +# slave Act as a slave +# +# slave=no + +################################# +# slave-cycle-interval Reschedule failed SOA serial checks once every .. seconds +# +# slave-cycle-interval=60 + +################################# +# smtpredirector Our smtpredir MX host +# +# smtpredirector=a.misconfigured.powerdns.smtp.server + +################################# +# soa-minimum-ttl Default SOA mininum ttl +# +# soa-minimum-ttl=3600 + +################################# +# soa-refresh-default Default SOA refresh +# +# soa-refresh-default=10800 + +################################# +# soa-retry-default Default SOA retry +# +# soa-retry-default=3600 + +################################# +# soa-expire-default Default SOA expire +# +# soa-expire-default=604800 + +################################# +# soa-serial-offset Make sure that no SOA serial is less than this number +# +# soa-serial-offset=0 + +################################# +# socket-dir Where the controlsocket will live +# +socket-dir=/var/run + +################################# +# strict-rfc-axfrs Perform strictly rfc compliant axfrs (very slow) +# +# strict-rfc-axfrs=no + +################################# +# urlredirector Where we send hosts to that need to be url redirected +# +# urlredirector=127.0.0.1 + +################################# +# use-logfile Use a log file +# +# use-logfile=yes + +################################# +# webserver Start a webserver for monitoring +# +# webserver=no + +################################# +# webserver-address IP Address of webserver to listen on +# +# webserver-address=127.0.0.1 + +################################# +# webserver-password Password required for accessing the webserver +# +# webserver-password= + +################################# +# webserver-port Port of webserver to listen on +# +# webserver-port=8081 + +################################# +# webserver-print-arguments If the webserver should print arguments +# +# webserver-print-arguments=no + +################################# +# wildcard-url Process URL and MBOXFW records +# +# wildcard-url=no + +################################# +# wildcards Honor wildcards in the database +# +# wildcards= + +################################# +# version-string What should PowerDNS return for version +# allowed methods are anonymous / powerdns / full / custom +version-string=powerdns + +include=/etc/powerdns/pdns.d +]]> + + + + named.conf + +# How often to check for zone changes. See 'Operation' section. +bind-check-interval=180 + +# Uncomment to enable Huffman compression on zone data. +# Currently saves around 20% of memory actually used, but slows down operation. +# bind-enable-huffman +]]> + + + + + + + + + + + + {{settings.system.vmail_gid}} + + + + + {{settings.system.vmail_uid}} + + + + + + + + + + + + + + + + + +password = +dbname = +hosts = +query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' +]]> + + + + +password = +dbname = +hosts = +query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' +]]> + + + + +password = +dbname = +expansion_limit = 1 +hosts = +query = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE email = '%s' +]]> + + + + +password = +dbname = +hosts = +query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); +]]> + + + + +password = +dbname = +expansion_limit = 1 +hosts = +query = SELECT uid FROM mail_users WHERE email = '%s' +]]> + + + + +password = +dbname = +expansion_limit = 1 +hosts = +query = SELECT gid FROM mail_users WHERE email = '%s' +]]> + + + + +]]> + + + + + + + + + + + //service[@type='smtp']/general/commands[@index=1] + + //service[@type='smtp']/general/installs[@index=1] + + //service[@type='smtp']/general/commands[@index=2] + + + + +# SENDING MAIL +# +# The myorigin parameter specifies the domain that locally-posted +# mail appears to come from. The default is to append $myhostname, +# which is fine for small sites. If you run a domain with multiple +# machines, you should (1) change this to $mydomain and (2) set up +# a domain-wide alias database that aliases each user to +# user@that.users.mailhost. +# +# For the sake of consistency between sender and recipient addresses, +# myorigin also specifies the default domain name that is appended +# to recipient addresses that have no @domain part. +# +# Debian GNU/Linux specific: Specifying a file name will cause the +# first line of that file to be used as the name. The Debian default +# is /etc/mailname. +# +#myorigin = /etc/mailname +#myorigin = $myhostname +#myorigin = $mydomain + +# RECEIVING MAIL + +# The inet_interfaces parameter specifies the network interface +# addresses that this mail system receives mail on. By default, +# the software claims all active interfaces on the machine. The +# parameter also controls delivery of mail to user@[ip.address]. +# +# See also the proxy_interfaces parameter, for network addresses that +# are forwarded to us via a proxy or network address translator. +# +# Note: you need to stop/start Postfix when this parameter changes. +# +#inet_interfaces = all +#inet_interfaces = $myhostname +#inet_interfaces = $myhostname, localhost + +# The proxy_interfaces parameter specifies the network interface +# addresses that this mail system receives mail on by way of a +# proxy or network address translation unit. This setting extends +# the address list specified with the inet_interfaces parameter. +# +# You must specify your proxy/NAT addresses when your system is a +# backup MX host for other domains, otherwise mail delivery loops +# will happen when the primary MX host is down. +# +#proxy_interfaces = +#proxy_interfaces = 1.2.3.4 + +# The mydestination parameter specifies the list of domains that this +# machine considers itself the final destination for. +# +# These domains are routed to the delivery agent specified with the +# local_transport parameter setting. By default, that is the UNIX +# compatible delivery agent that lookups all recipients in /etc/passwd +# and /etc/aliases or their equivalent. +# +# The default is $myhostname + localhost.$mydomain. On a mail domain +# gateway, you should also include $mydomain. +# +# Do not specify the names of virtual domains - those domains are +# specified elsewhere (see VIRTUAL_README). +# +# Do not specify the names of domains that this machine is backup MX +# host for. Specify those names via the relay_domains settings for +# the SMTP server, or use permit_mx_backup if you are lazy (see +# STANDARD_CONFIGURATION_README). +# +# The local machine is always the final destination for mail addressed +# to user@[the.net.work.address] of an interface that the mail system +# receives mail on (see the inet_interfaces parameter). +# +# Specify a list of host or domain names, /file/name or type:table +# patterns, separated by commas and/or whitespace. A /file/name +# pattern is replaced by its contents; a type:table is matched when +# a name matches a lookup key (the right-hand side is ignored). +# Continue long lines by starting the next line with whitespace. +# +# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". +# +#mydestination = $myhostname, localhost.$mydomain, localhost +#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain +#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, +# mail.$mydomain, www.$mydomain, ftp.$mydomain + +# REJECTING MAIL FOR UNKNOWN LOCAL USERS +# +# The local_recipient_maps parameter specifies optional lookup tables +# with all names or addresses of users that are local with respect +# to $mydestination, $inet_interfaces or $proxy_interfaces. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown local users. This parameter is defined by default. +# +# To turn off local recipient checking in the SMTP server, specify +# local_recipient_maps = (i.e. empty). +# +# The default setting assumes that you use the default Postfix local +# delivery agent for local delivery. You need to update the +# local_recipient_maps setting if: +# +# - You define $mydestination domain recipients in files other than +# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files. +# For example, you define $mydestination domain recipients in +# the $virtual_mailbox_maps files. +# +# - You redefine the local delivery agent in master.cf. +# +# - You redefine the "local_transport" setting in main.cf. +# +# - You use the "luser_relay", "mailbox_transport", or "fallback_transport" +# feature of the Postfix local delivery agent (see local(8)). +# +# Details are described in the LOCAL_RECIPIENT_README file. +# +# Beware: if the Postfix SMTP server runs chrooted, you probably have +# to access the passwd file via the proxymap service, in order to +# overcome chroot restrictions. The alternative, having a copy of +# the system passwd file in the chroot jail is just not practical. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify a bare username, an @domain.tld +# wild-card, or specify a user@domain.tld address. +# +#local_recipient_maps = unix:passwd.byname $alias_maps +#local_recipient_maps = proxy:unix:passwd.byname $alias_maps +#local_recipient_maps = + +# The unknown_local_recipient_reject_code specifies the SMTP server +# response code when a recipient domain matches $mydestination or +# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty +# and the recipient address or address local-part is not found. +# +# The default setting is 550 (reject mail) but it is safer to start +# with 450 (try again later) until you are certain that your +# local_recipient_maps settings are OK. +# +unknown_local_recipient_reject_code = 550 + +# TRUST AND RELAY CONTROL + +# The mynetworks parameter specifies the list of "trusted" SMTP +# clients that have more privileges than "strangers". +# +# In particular, "trusted" SMTP clients are allowed to relay mail +# through Postfix. See the smtpd_recipient_restrictions parameter +# in postconf(5). +# +# You can specify the list of "trusted" network addresses by hand +# or you can let Postfix do it for you (which is the default). +# +# By default (mynetworks_style = subnet), Postfix "trusts" SMTP +# clients in the same IP subnetworks as the local machine. +# On Linux, this does works correctly only with interfaces specified +# with the "ifconfig" command. +# +# Specify "mynetworks_style = class" when Postfix should "trust" SMTP +# clients in the same IP class A/B/C networks as the local machine. +# Don't do this with a dialup site - it would cause Postfix to "trust" +# your entire provider's network. Instead, specify an explicit +# mynetworks list by hand, as described below. +# +# Specify "mynetworks_style = host" when Postfix should "trust" +# only the local machine. +# +#mynetworks_style = class +#mynetworks_style = subnet +#mynetworks_style = host + +# Alternatively, you can specify the mynetworks list by hand, in +# which case Postfix ignores the mynetworks_style setting. +# +# Specify an explicit list of network/netmask patterns, where the +# mask specifies the number of bits in the network part of a host +# address. +# +# You can also specify the absolute pathname of a pattern file instead +# of listing the patterns here. Specify type:table for table-based lookups +# (the value on the table right-hand side is not used). +# +#mynetworks = 168.100.189.0/28, 127.0.0.0/8 +#mynetworks = $config_directory/mynetworks +#mynetworks = hash:/etc/postfix/network_table +mynetworks = 127.0.0.0/8 + +# The relay_domains parameter restricts what destinations this system will +# relay mail to. See the smtpd_recipient_restrictions description in +# postconf(5) for detailed information. +# +# By default, Postfix relays mail +# - from "trusted" clients (IP address matches $mynetworks) to any destination, +# - from "untrusted" clients to destinations that match $relay_domains or +# subdomains thereof, except addresses with sender-specified routing. +# The default relay_domains value is $mydestination. +# +# In addition to the above, the Postfix SMTP server by default accepts mail +# that Postfix is final destination for: +# - destinations that match $inet_interfaces or $proxy_interfaces, +# - destinations that match $mydestination +# - destinations that match $virtual_alias_domains, +# - destinations that match $virtual_mailbox_domains. +# These destinations do not need to be listed in $relay_domains. +# +# Specify a list of hosts or domains, /file/name patterns or type:name +# lookup tables, separated by commas and/or whitespace. Continue +# long lines by starting the next line with whitespace. A file name +# is replaced by its contents; a type:name table is matched when a +# (parent) domain appears as lookup key. +# +# NOTE: Postfix will not automatically forward mail for domains that +# list this system as their primary or backup MX host. See the +# permit_mx_backup restriction description in postconf(5). +# +#relay_domains = $mydestination + +# INTERNET OR INTRANET + +# The relayhost parameter specifies the default host to send mail to +# when no entry is matched in the optional transport(5) table. When +# no relayhost is given, mail is routed directly to the destination. +# +# On an intranet, specify the organizational domain name. If your +# internal DNS uses no MX records, specify the name of the intranet +# gateway host instead. +# +# In the case of SMTP, specify a domain, host, host:port, [host]:port, +# [address] or [address]:port; the form [host] turns off MX lookups. +# +# If you're connected via UUCP, see also the default_transport parameter. +# +#relayhost = $mydomain +#relayhost = [gateway.my.domain] +#relayhost = [mailserver.isp.tld] +#relayhost = uucphost +#relayhost = [an.ip.add.ress] + +# REJECTING UNKNOWN RELAY USERS +# +# The relay_recipient_maps parameter specifies optional lookup tables +# with all addresses in the domains that match $relay_domains. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown relay users. This feature is off by default. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify an @domain.tld wild-card, or specify +# a user@domain.tld address. +# +#relay_recipient_maps = hash:/etc/postfix/relay_recipients + +# INPUT RATE CONTROL +# +# The in_flow_delay configuration parameter implements mail input +# flow control. This feature is turned on by default, although it +# still needs further development (it's disabled on SCO UNIX due +# to an SCO bug). +# +# A Postfix process will pause for $in_flow_delay seconds before +# accepting a new message, when the message arrival rate exceeds the +# message delivery rate. With the default 100 SMTP server process +# limit, this limits the mail inflow to 100 messages a second more +# than the number of messages delivered per second. +# +# Specify 0 to disable the feature. Valid delays are 0..10. +# +#in_flow_delay = 1s + +# ADDRESS REWRITING +# +# The ADDRESS_REWRITING_README document gives information about +# address masquerading or other forms of address rewriting including +# username->Firstname.Lastname mapping. + +# ADDRESS REDIRECTION (VIRTUAL DOMAIN) +# +# The VIRTUAL_README document gives information about the many forms +# of domain hosting that Postfix supports. + +# "USER HAS MOVED" BOUNCE MESSAGES +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# TRANSPORT MAP +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# ALIAS DATABASE +# +# The alias_maps parameter specifies the list of alias databases used +# by the local delivery agent. The default list is system dependent. +# +# On systems with NIS, the default is to search the local alias +# database, then the NIS alias database. See aliases(5) for syntax +# details. +# +# If you change the alias database, run "postalias /etc/aliases" (or +# wherever your system stores the mail alias file), or simply run +# "newaliases" to build the necessary DBM or DB file. +# +# It will take a minute or so before changes become visible. Use +# "postfix reload" to eliminate the delay. +# +#alias_maps = dbm:/etc/aliases +#alias_maps = hash:/etc/aliases +#alias_maps = hash:/etc/aliases, nis:mail.aliases +#alias_maps = netinfo:/aliases + +# The alias_database parameter specifies the alias database(s) that +# are built with "newaliases" or "sendmail -bi". This is a separate +# configuration parameter, because alias_maps (see above) may specify +# tables that are not necessarily all under control by Postfix. +# +#alias_database = dbm:/etc/aliases +#alias_database = dbm:/etc/mail/aliases +#alias_database = hash:/etc/aliases +#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases + +# ADDRESS EXTENSIONS (e.g., user+foo) +# +# The recipient_delimiter parameter specifies the separator between +# user names and address extensions (user+foo). See canonical(5), +# local(8), relocated(5) and virtual(5) for the effects this has on +# aliases, canonical, virtual, relocated and .forward file lookups. +# Basically, the software tries user+foo and .forward+foo before +# trying user and .forward. +# +#recipient_delimiter = + + +# DELIVERY TO MAILBOX +# +# The home_mailbox parameter specifies the optional pathname of a +# mailbox file relative to a user's home directory. The default +# mailbox file is /var/spool/mail/user or /var/mail/user. Specify +# "Maildir/" for qmail-style delivery (the / is required). +# +#home_mailbox = Mailbox +#home_mailbox = Maildir/ + +# The mail_spool_directory parameter specifies the directory where +# UNIX-style mailboxes are kept. The default setting depends on the +# system type. +# +#mail_spool_directory = /var/mail +#mail_spool_directory = /var/spool/mail + +# The mailbox_command parameter specifies the optional external +# command to use instead of mailbox delivery. The command is run as +# the recipient with proper HOME, SHELL and LOGNAME environment settings. +# Exception: delivery for root is done as $default_user. +# +# Other environment variables of interest: USER (recipient username), +# EXTENSION (address extension), DOMAIN (domain part of address), +# and LOCAL (the address localpart). +# +# Unlike other Postfix configuration parameters, the mailbox_command +# parameter is not subjected to $parameter substitutions. This is to +# make it easier to specify shell syntax (see example below). +# +# Avoid shell meta characters because they will force Postfix to run +# an expensive shell process. Procmail alone is expensive enough. +# +# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN +# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. +# +#mailbox_command = /usr/bin/procmail +#mailbox_command = /usr/bin/procmail -a "$EXTENSION" + +# The mailbox_transport specifies the optional transport in master.cf +# to use after processing aliases and .forward files. This parameter +# has precedence over the mailbox_command, fallback_transport and +# luser_relay parameters. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" +# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. +#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp +# +# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and +# subsequent line in master.cf. +#mailbox_transport = cyrus + +# The fallback_transport specifies the optional transport in master.cf +# to use for recipients that are not found in the UNIX passwd database. +# This parameter has precedence over the luser_relay parameter. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#fallback_transport = lmtp:unix:/file/name +#fallback_transport = cyrus +#fallback_transport = + +# The luser_relay parameter specifies an optional destination address +# for unknown recipients. By default, mail for unknown@$mydestination, +# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned +# as undeliverable. +# +# The following expansions are done on luser_relay: $user (recipient +# username), $shell (recipient shell), $home (recipient home directory), +# $recipient (full recipient address), $extension (recipient address +# extension), $domain (recipient domain), $local (entire recipient +# localpart), $recipient_delimiter. Specify ${name?value} or +# ${name:value} to expand value only when $name does (does not) exist. +# +# luser_relay works only for the default Postfix local delivery agent. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must specify "local_recipient_maps =" (i.e. empty) in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#luser_relay = $user@other.host +#luser_relay = $local@other.host +#luser_relay = admin+$local + +# JUNK MAIL CONTROLS +# +# The controls listed here are only a very small subset. The file +# SMTPD_ACCESS_README provides an overview. + +# The header_checks parameter specifies an optional table with patterns +# that each logical message header is matched against, including +# headers that span multiple physical lines. +# +# By default, these patterns also apply to MIME headers and to the +# headers of attached messages. With older Postfix versions, MIME and +# attached message headers were treated as body text. +# +# For details, see "man header_checks". +# +#header_checks = regexp:/etc/postfix/header_checks + +# FAST ETRN SERVICE +# +# Postfix maintains per-destination logfiles with information about +# deferred mail, so that mail can be flushed quickly with the SMTP +# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". +# See the ETRN_README document for a detailed description. +# +# The fast_flush_domains parameter controls what destinations are +# eligible for this service. By default, they are all domains that +# this server is willing to relay mail to. +# +#fast_flush_domains = $relay_domains + +# SHOW SOFTWARE VERSION OR NOT +# +# The smtpd_banner parameter specifies the text that follows the 220 +# code in the SMTP server's greeting banner. Some people like to see +# the mail version advertised. By default, Postfix shows no version. +# +# You MUST specify $myhostname at the start of the text. That is an +# RFC requirement. Postfix itself does not care. +# +#smtpd_banner = $myhostname ESMTP $mail_name +#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) +smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) + + +# PARALLEL DELIVERY TO THE SAME DESTINATION +# +# How many parallel deliveries to the same user or domain? With local +# delivery, it does not make sense to do massively parallel delivery +# to the same user, because mailbox updates must happen sequentially, +# and expensive pipelines in .forward files can cause disasters when +# too many are run at the same time. With SMTP deliveries, 10 +# simultaneous connections to the same domain could be sufficient to +# raise eyebrows. +# +# Each message delivery transport has its XXX_destination_concurrency_limit +# parameter. The default is $default_destination_concurrency_limit for +# most delivery transports. For the local delivery agent the default is 2. + +#local_destination_concurrency_limit = 2 +#default_destination_concurrency_limit = 20 + +# DEBUGGING CONTROL +# +# The debug_peer_level parameter specifies the increment in verbose +# logging level when an SMTP client or server host name or address +# matches a pattern in the debug_peer_list parameter. +# +#debug_peer_level = 2 + +# The debug_peer_list parameter specifies an optional list of domain +# or network patterns, /file/name patterns or type:name tables. When +# an SMTP client or server host name or address matches a pattern, +# increase the verbose logging level by the amount specified in the +# debug_peer_level parameter. +# +#debug_peer_list = 127.0.0.1 +#debug_peer_list = some.domain + +# The debugger_command specifies the external command that is executed +# when a Postfix daemon program is run with the -D option. +# +# Use "command .. & sleep 5" so that the debugger can attach before +# the process marches on. If you use an X-based debugger, be sure to +# set up your XAUTHORITY environment variable before starting Postfix. +# +debugger_command = + PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + ddd $daemon_directory/$process_name $process_id & sleep 5 + +# If you can't use X, use this to capture the call stack when a +# daemon crashes. The result is in a file in the configuration +# directory, and is named after the process name and the process ID. +# +# debugger_command = +# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; +# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 +# >$config_directory/$process_name.$process_id.log & sleep 5 +# +# Another possibility is to run gdb under a detached screen session. +# To attach to the screen sesssion, su root and run "screen -r +# " where uniquely matches one of the detached +# sessions (from "screen -list"). +# +# debugger_command = +# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen +# -dmS $process_name gdb $daemon_directory/$process_name +# $process_id & sleep 1 + +# INSTALL-TIME CONFIGURATION INFORMATION +# +# The following parameters are used when installing a new Postfix version. +# +# sendmail_path: The full pathname of the Postfix sendmail command. +# This is the Sendmail-compatible mail posting interface. +# +sendmail_path = + +# newaliases_path: The full pathname of the Postfix newaliases command. +# This is the Sendmail-compatible command to build alias databases. +# +newaliases_path = + +# mailq_path: The full pathname of the Postfix mailq command. This +# is the Sendmail-compatible mail queue listing command. +# +mailq_path = + +# setgid_group: The group for mail submission and queue management +# commands. This must be a group name with a numerical group ID that +# is not shared with other accounts, not even with the Postfix account. +# +setgid_group = + +# html_directory: The location of the Postfix HTML documentation. +# +html_directory = + +# manpage_directory: The location of the Postfix on-line manual pages. +# +manpage_directory = + +# sample_directory: The location of the Postfix sample configuration files. +# This parameter is obsolete as of Postfix 2.1. +# +sample_directory = + +# readme_directory: The location of the Postfix README files. +# +readme_directory = +inet_protocols = ipv4 + +append_dot_mydomain = no +biff = no +smtpd_helo_required = yes +smtpd_recipient_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unauth_destination, + reject_unauth_pipelining, + reject_non_fqdn_recipient +smtpd_sender_restrictions = permit_mynetworks, + reject_sender_login_mismatch, + permit_sasl_authenticated, + reject_unknown_helo_hostname, + reject_unknown_recipient_domain, + reject_unknown_sender_domain +smtpd_client_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unknown_client_hostname + +# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. +# The option is intentionally left empty. +smtpd_relay_restrictions = + +# Maximum size of Message in bytes (50MB) +message_size_limit = 52428800 + +## SASL Auth Settings +smtpd_sasl_auth_enable = yes +smtpd_sasl_local_domain = $myhostname +broken_sasl_auth_clients = yes +## Dovecot Settings for deliver, SASL Auth and virtual transport +smtpd_sasl_type = dovecot +virtual_transport = dovecot +dovecot_destination_recipient_limit = 1 +smtpd_sasl_path = private/auth + +# Virtual delivery settings +virtual_mailbox_base = +virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf +virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf +virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf +smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf +virtual_uid_maps = static: +virtual_gid_maps = static: + +# Local delivery settings +local_transport = local +alias_maps = $alias_database + +# Default Mailbox size, is set to 0 which means unlimited! +mailbox_size_limit = 0 +virtual_mailbox_limit = 0 + +### TLS settings +### +## TLS for outgoing mails from the server to another server +#smtp_tls_security_level = may +#smtp_tls_note_starttls_offer = yes +## TLS for incoming connections (clients or other mail servers) +#smtpd_tls_security_level = may +#smtpd_tls_cert_file = /etc/ssl/server/.pem +#smtpd_tls_key_file = $smtpd_tls_cert_file +#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt +#smtpd_tls_loglevel = 1 +#smtpd_tls_received_header = yes +]]> + + + //service[@type='smtp']/general/files[@index=0] + + + + + //service[@type='smtp']/general/commands[@index=3] + + + + + + + + + + + + + to select which instance is used (an alternative +# to -c ). The instance name is also added to Dovecot processes +# in ps output. +#instance_name = dovecot + +# Greeting message for clients. +#login_greeting = Dovecot ready. + +# Space separated list of trusted network ranges. Connections from these +# IPs are allowed to override their IP addresses and ports (for logging and +# for authentication checks). disable_plaintext_auth is also ignored for +# these networks. Typically you'd specify your IMAP proxy servers here. +#login_trusted_networks = + +# Space separated list of login access check sockets (e.g. tcpwrap) +#login_access_sockets = + +# With proxy_maybe=yes if proxy destination matches any of these IPs, don't do +# proxying. This isn't necessary normally, but may be useful if the destination +# IP is e.g. a load balancer's IP. +#auth_proxy_self = + +# Show more verbose process titles (in ps). Currently shows user name and +# IP address. Useful for seeing who are actually using the IMAP processes +# (eg. shared mailboxes or if same uid is used for multiple accounts). +#verbose_proctitle = no + +# Should all processes be killed when Dovecot master process shuts down. +# Setting this to "no" means that Dovecot can be upgraded without +# forcing existing client connections to close (although that could also be +# a problem if the upgrade is e.g. because of a security fix). +#shutdown_clients = yes + +# If non-zero, run mail commands via this many connections to doveadm server, +# instead of running them directly in the same process. +#doveadm_worker_count = 0 +# UNIX socket or host:port used for connecting to doveadm server +#doveadm_socket_path = doveadm-server + +# Space separated list of environment variables that are preserved on Dovecot +# startup and passed down to all of its child processes. You can also give +# key=value pairs to always set specific settings. +#import_environment = TZ + +## +## Dictionary server settings +## + +# Dictionary can be used to store key=value lists. This is used by several +# plugins. The dictionary can be accessed either directly or though a +# dictionary server. The following dict block maps dictionary names to URIs +# when the server is used. These can then be referenced using URIs in format +# "proxy::". + +dict { + #quota = mysql:/etc/dovecot/dovecot-dict-sql.conf.ext + #expire = sqlite:/etc/dovecot/dovecot-dict-sql.conf.ext +} + +# Most of the actual configuration gets included below. The filenames are +# first sorted by their ASCII value and parsed in that order. The 00-prefixes +# in filenames are intended to make it easier to understand the ordering. +!include conf.d/*.conf + +# A config file can also tried to be included without giving an error if +# it's not found: +!include_try local.conf +]]> + + + + dbname= user= password= + +# Default password scheme. +# +# List of supported schemes is in +# http://wiki2.dovecot.org/Authentication/PasswordSchemes +# +default_pass_scheme = CRYPT + +# passdb query to retrieve the password. It can return fields: +# password - The user's password. This field must be returned. +# user - user@domain from the database. Needed with case-insensitive lookups. +# username and domain - An alternative way to represent the "user" field. +# +# The "user" field is often necessary with case-insensitive lookups to avoid +# e.g. "name" and "nAme" logins creating two different mail directories. If +# your user and domain names are in separate fields, you can return "username" +# and "domain" fields instead of "user". +# +# The query can also return other fields which have a special meaning, see +# http://wiki2.dovecot.org/PasswordDatabase/ExtraFields +# +# Commonly used available substitutions (see http://wiki2.dovecot.org/Variables +# for full list): +# %u = entire user@domain +# %n = user part of user@domain +# %d = domain part of user@domain +# +# Note that these can be used only as input to SQL query. If the query outputs +# any of these substitutions, they're not touched. Otherwise it would be +# difficult to have eg. usernames containing '%' characters. +# +# Example: +# password_query = SELECT userid AS user, pw AS password \ +# FROM users WHERE userid = '%u' AND active = 'Y' +# +#password_query = \ +# SELECT username, domain, password \ +# FROM users WHERE username = '%n' AND domain = '%d' + +# userdb query to retrieve the user information. It can return fields: +# uid - System UID (overrides mail_uid setting) +# gid - System GID (overrides mail_gid setting) +# home - Home directory +# mail - Mail location (overrides mail_location setting) +# +# None of these are strictly required. If you use a single UID and GID, and +# home or mail directory fits to a template string, you could use userdb static +# instead. For a list of all fields that can be returned, see +# http://wiki2.dovecot.org/UserDatabase/ExtraFields +# +# Examples: +# user_query = SELECT home, uid, gid FROM users WHERE userid = '%u' +# user_query = SELECT dir AS home, user AS uid, group AS gid FROM users where userid = '%u' +# user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u' +# +#user_query = \ +# SELECT home, uid, gid \ +# FROM users WHERE username = '%n' AND domain = '%d' +user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') + +# If you wish to avoid two SQL lookups (passdb + userdb), you can use +# userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll +# also have to return userdb fields in password_query prefixed with "userdb_" +# string. For example: +#password_query = \ +# SELECT userid AS user, password, \ +# home AS userdb_home, uid AS userdb_uid, gid AS userdb_gid \ +# FROM users WHERE userid = '%u' +password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve') + +# Query to get a list of all usernames. +#iterate_query = SELECT username AS user FROM users +]]> + + + + to characters. For example "#@/@" means +# that '#' and '/' characters are translated to '@'. +#auth_username_translation = + +# Username formatting before it's looked up from databases. You can use +# the standard variables here, eg. %Lu would lowercase the username, %n would +# drop away the domain if it was given, or "%n-AT-%d" would change the '@' into +# "-AT-". This translation is done after auth_username_translation changes. +#auth_username_format = %Lu + +# If you want to allow master users to log in by specifying the master +# username within the normal username string (ie. not using SASL mechanism's +# support for it), you can specify the separator character here. The format +# is then . UW-IMAP uses "*" as the +# separator, so that could be a good choice. +#auth_master_user_separator = + +# Username to use for users logging in with ANONYMOUS SASL mechanism +#auth_anonymous_username = anonymous + +# Maximum number of dovecot-auth worker processes. They're used to execute +# blocking passdb and userdb queries (eg. MySQL and PAM). They're +# automatically created and destroyed as needed. +#auth_worker_max_count = 30 + +# Host name to use in GSSAPI principal names. The default is to use the +# name returned by gethostname(). Use "$ALL" (with quotes) to allow all keytab +# entries. +#auth_gssapi_hostname = + +# Kerberos keytab to use for the GSSAPI mechanism. Will use the system +# default (usually /etc/krb5.keytab) if not specified. You may need to change +# the auth service to run as root to be able to read this file. +#auth_krb5_keytab = + +# Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and +# ntlm_auth helper. +#auth_use_winbind = no + +# Path for Samba's ntlm_auth helper binary. +#auth_winbind_helper_path = /usr/bin/ntlm_auth + +# Time to delay before replying to failed authentications. +#auth_failure_delay = 2 secs + +# Require a valid SSL client certificate or the authentication fails. +#auth_ssl_require_client_cert = no + +# Take the username from client's SSL certificate, using +# X509_NAME_get_text_by_NID() which returns the subject's DN's +# CommonName. +#auth_ssl_username_from_cert = no + +# Space separated list of wanted authentication mechanisms: +# plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey +# gss-spnego +# NOTE: See also disable_plaintext_auth setting. +auth_mechanisms = plain login + +## +## Password and user databases +## + +# +# Password database is used to verify user's password (and nothing more). +# You can have multiple passdbs and userdbs. This is useful if you want to +# allow both system users (/etc/passwd) and virtual users to login without +# duplicating the system users into virtual database. +# +# +# +# User database specifies where mails are located and what user/group IDs +# own them. For single-UID configuration use "static" userdb. +# +# + +#!include auth-deny.conf.ext +#!include auth-master.conf.ext + +#!include auth-system.conf.ext +!include auth-sql.conf.ext +#!include auth-ldap.conf.ext +#!include auth-passwdfile.conf.ext +#!include auth-checkpassword.conf.ext +#!include auth-vpopmail.conf.ext +#!include auth-static.conf.ext +]]> + + + + +# +mail_location = mbox:~/mail:INBOX=/var/mail/%u + +# If you need to set multiple mailbox locations or want to change default +# namespace settings, you can do it by defining namespace sections. +# +# You can have private, shared and public namespaces. Private namespaces +# are for user's personal mails. Shared namespaces are for accessing other +# users' mailboxes that have been shared. Public namespaces are for shared +# mailboxes that are managed by sysadmin. If you create any shared or public +# namespaces you'll typically want to enable ACL plugin also, otherwise all +# users can access all the shared mailboxes, assuming they have permissions +# on filesystem level to do so. +namespace inbox { + # Namespace type: private, shared or public + #type = private + + # Hierarchy separator to use. You should use the same separator for all + # namespaces or some clients get confused. '/' is usually a good one. + # The default however depends on the underlying mail storage format. + #separator = + + # Prefix required to access this namespace. This needs to be different for + # all namespaces. For example "Public/". + #prefix = + + # Physical location of the mailbox. This is in same format as + # mail_location, which is also the default for it. + #location = + + # There can be only one INBOX, and this setting defines which namespace + # has it. + inbox = yes + + # If namespace is hidden, it's not advertised to clients via NAMESPACE + # extension. You'll most likely also want to set list=no. This is mostly + # useful when converting from another server with different namespaces which + # you want to deprecate but still keep working. For example you can create + # hidden namespaces with prefixes "~/mail/", "~%u/mail/" and "mail/". + #hidden = no + + # Show the mailboxes under this namespace with LIST command. This makes the + # namespace visible for clients that don't support NAMESPACE extension. + # "children" value lists child mailboxes, but hides the namespace prefix. + #list = yes + + # Namespace handles its own subscriptions. If set to "no", the parent + # namespace handles them (empty prefix should always have this as "yes") + #subscriptions = yes +} + +# Example shared namespace configuration +#namespace { + #type = shared + #separator = / + + # Mailboxes are visible under "shared/user@domain/" + # %%n, %%d and %%u are expanded to the destination user. + #prefix = shared/%%u/ + + # Mail location for other users' mailboxes. Note that %variables and ~/ + # expands to the logged in user's data. %%n, %%d, %%u and %%h expand to the + # destination user's data. + #location = maildir:%%h/Maildir:INDEX=~/Maildir/shared/%%u + + # Use the default namespace for saving subscriptions. + #subscriptions = no + + # List the shared/ namespace only if there are visible shared mailboxes. + #list = children +#} +# Should shared INBOX be visible as "shared/user" or "shared/user/INBOX"? +#mail_shared_explicit_inbox = no + +# System user and group used to access mails. If you use multiple, userdb +# can override these by returning uid or gid fields. You can use either numbers +# or names. +#mail_uid = +#mail_gid = + +# Group to enable temporarily for privileged operations. Currently this is +# used only with INBOX when either its initial creation or dotlocking fails. +# Typically this is set to "mail" to give access to /var/mail. +#mail_privileged_group = + +# Grant access to these supplementary groups for mail processes. Typically +# these are used to set up access to shared mailboxes. Note that it may be +# dangerous to set these if users can create symlinks (e.g. if "mail" group is +# set here, ln -s /var/mail ~/mail/var could allow a user to delete others' +# mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it). +mail_access_groups = vmail + +# Allow full filesystem access to clients. There's no access checks other than +# what the operating system does for the active UID/GID. It works with both +# maildir and mboxes, allowing you to prefix mailboxes names with eg. /path/ +# or ~user/. +#mail_full_filesystem_access = no + +# Dictionary for key=value mailbox attributes. Currently used by URLAUTH, but +# soon intended to be used by METADATA as well. +#mail_attribute_dict = + +## +## Mail processes +## + +# Don't use mmap() at all. This is required if you store indexes to shared +# filesystems (NFS or clustered filesystem). +#mmap_disable = no + +# Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL +# since version 3, so this should be safe to use nowadays by default. +#dotlock_use_excl = yes + +# When to use fsync() or fdatasync() calls: +# optimized (default): Whenever necessary to avoid losing important data +# always: Useful with e.g. NFS when write()s are delayed +# never: Never use it (best performance, but crashes can lose data) +#mail_fsync = optimized + +# Locking method for index files. Alternatives are fcntl, flock and dotlock. +# Dotlocking uses some tricks which may create more disk I/O than other locking +# methods. NFS users: flock doesn't work, remember to change mmap_disable. +#lock_method = fcntl + +# Directory in which LDA/LMTP temporarily stores incoming mails >128 kB. +#mail_temp_dir = /tmp + +# Valid UID range for users, defaults to 500 and above. This is mostly +# to make sure that users can't log in as daemons or other system users. +# Note that denying root logins is hardcoded to dovecot binary and can't +# be done even if first_valid_uid is set to 0. +#first_valid_uid = 500 +#last_valid_uid = 0 + +# Valid GID range for users, defaults to non-root/wheel. Users having +# non-valid GID as primary group ID aren't allowed to log in. If user +# belongs to supplementary groups with non-valid GIDs, those groups are +# not set. +#first_valid_gid = 1 +#last_valid_gid = 0 + +# Maximum allowed length for mail keyword name. It's only forced when trying +# to create new keywords. +#mail_max_keyword_length = 50 + +# ':' separated list of directories under which chrooting is allowed for mail +# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too). +# This setting doesn't affect login_chroot, mail_chroot or auth chroot +# settings. If this setting is empty, "/./" in home dirs are ignored. +# WARNING: Never add directories here which local users can modify, that +# may lead to root exploit. Usually this should be done only if you don't +# allow shell access for users. +#valid_chroot_dirs = + +# Default chroot directory for mail processes. This can be overridden for +# specific users in user database by giving /./ in user's home directory +# (eg. /home/./user chroots into /home). Note that usually there is no real +# need to do chrooting, Dovecot doesn't allow users to access files outside +# their mail directory anyway. If your home directories are prefixed with +# the chroot directory, append "/." to mail_chroot. +#mail_chroot = + +# UNIX socket path to master authentication server to find users. +# This is used by imap (for shared users) and lda. +#auth_socket_path = /var/run/dovecot/auth-userdb + +# Directory where to look up mail plugins. +#mail_plugin_dir = /usr/lib/dovecot/modules + +# Space separated list of plugins to load for all services. Plugins specific to +# IMAP, LDA, etc. are added to this list in their own .conf files. +#mail_plugins = + +## +## Mailbox handling optimizations +## + +# Mailbox list indexes can be used to optimize IMAP STATUS commands. They are +# also required for IMAP NOTIFY extension to be enabled. +#mailbox_list_index = no + +# The minimum number of mails in a mailbox before updates are done to cache +# file. This allows optimizing Dovecot's behavior to do less disk writes at +# the cost of more disk reads. +#mail_cache_min_mail_count = 0 + +# When IDLE command is running, mailbox is checked once in a while to see if +# there are any new mails or other changes. This setting defines the minimum +# time to wait between those checks. Dovecot can also use dnotify, inotify and +# kqueue to find out immediately when changes occur. +#mailbox_idle_check_interval = 30 secs + +# Save mails with CR+LF instead of plain LF. This makes sending those mails +# take less CPU, especially with sendfile() syscall with Linux and FreeBSD. +# But it also creates a bit more disk I/O which may just make it slower. +# Also note that if other software reads the mboxes/maildirs, they may handle +# the extra CRs wrong and cause problems. +#mail_save_crlf = no + +# Max number of mails to keep open and prefetch to memory. This only works with +# some mailbox formats and/or operating systems. +#mail_prefetch_count = 0 + +# How often to scan for stale temporary files and delete them (0 = never). +# These should exist only after Dovecot dies in the middle of saving mails. +#mail_temp_scan_interval = 1w + +## +## Maildir-specific settings +## + +# By default LIST command returns all entries in maildir beginning with a dot. +# Enabling this option makes Dovecot return only entries which are directories. +# This is done by stat()ing each entry, so it causes more disk I/O. +# (For systems setting struct dirent->d_type, this check is free and it's +# done always regardless of this setting) +#maildir_stat_dirs = no + +# When copying a message, do it with hard links whenever possible. This makes +# the performance much better, and it's unlikely to have any side effects. +#maildir_copy_with_hardlinks = yes + +# Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only +# when its mtime changes unexpectedly or when we can't find the mail otherwise. +#maildir_very_dirty_syncs = no + +# If enabled, Dovecot doesn't use the S= in the Maildir filenames for +# getting the mail's physical size, except when recalculating Maildir++ quota. +# This can be useful in systems where a lot of the Maildir filenames have a +# broken size. The performance hit for enabling this is very small. +#maildir_broken_filename_sizes = no + +# Always move mails from new/ directory to cur/, even when the \Recent flags +# aren't being reset. +#maildir_empty_new = no + +## +## mbox-specific settings +## + +# Which locking methods to use for locking mbox. There are four available: +# dotlock: Create .lock file. This is the oldest and most NFS-safe +# solution. If you want to use /var/mail/ like directory, the users +# will need write access to that directory. +# dotlock_try: Same as dotlock, but if it fails because of permissions or +# because there isn't enough disk space, just skip it. +# fcntl : Use this if possible. Works with NFS too if lockd is used. +# flock : May not exist in all systems. Doesn't work with NFS. +# lockf : May not exist in all systems. Doesn't work with NFS. +# +# You can use multiple locking methods; if you do the order they're declared +# in is important to avoid deadlocks if other MTAs/MUAs are using multiple +# locking methods as well. Some operating systems don't allow using some of +# them simultaneously. +# +# The Debian value for mbox_write_locks differs from upstream Dovecot. It is +# changed to be compliant with Debian Policy (section 11.6) for NFS safety. +# Dovecot: mbox_write_locks = dotlock fcntl +# Debian: mbox_write_locks = fcntl dotlock +# +#mbox_read_locks = fcntl +#mbox_write_locks = fcntl dotlock + +# Maximum time to wait for lock (all of them) before aborting. +#mbox_lock_timeout = 5 mins + +# If dotlock exists but the mailbox isn't modified in any way, override the +# lock file after this much time. +#mbox_dotlock_change_timeout = 2 mins + +# When mbox changes unexpectedly we have to fully read it to find out what +# changed. If the mbox is large this can take a long time. Since the change +# is usually just a newly appended mail, it'd be faster to simply read the +# new mails. If this setting is enabled, Dovecot does this but still safely +# fallbacks to re-reading the whole mbox file whenever something in mbox isn't +# how it's expected to be. The only real downside to this setting is that if +# some other MUA changes message flags, Dovecot doesn't notice it immediately. +# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK +# commands. +#mbox_dirty_syncs = yes + +# Like mbox_dirty_syncs, but don't do full syncs even with SELECT, EXAMINE, +# EXPUNGE or CHECK commands. If this is set, mbox_dirty_syncs is ignored. +#mbox_very_dirty_syncs = no + +# Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK +# commands and when closing the mailbox). This is especially useful for POP3 +# where clients often delete all mails. The downside is that our changes +# aren't immediately visible to other MUAs. +#mbox_lazy_writes = yes + +# If mbox size is smaller than this (e.g. 100k), don't write index files. +# If an index file already exists it's still read, just not updated. +#mbox_min_index_size = 0 + +# Mail header selection algorithm to use for MD5 POP3 UIDLs when +# pop3_uidl_format=%m. For backwards compatibility we use apop3d inspired +# algorithm, but it fails if the first Received: header isn't unique in all +# mails. An alternative algorithm is "all" that selects all headers. +#mbox_md5 = apop3d + +## +## mdbox-specific settings +## + +# Maximum dbox file size until it's rotated. +#mdbox_rotate_size = 2M + +# Maximum dbox file age until it's rotated. Typically in days. Day begins +# from midnight, so 1d = today, 2d = yesterday, etc. 0 = check disabled. +#mdbox_rotate_interval = 0 + +# When creating new mdbox files, immediately preallocate their size to +# mdbox_rotate_size. This setting currently works only in Linux with some +# filesystems (ext4, xfs). +#mdbox_preallocate_space = no + +## +## Mail attachments +## + +# sdbox and mdbox support saving mail attachments to external files, which +# also allows single instance storage for them. Other backends don't support +# this for now. + +# Directory root where to store mail attachments. Disabled, if empty. +#mail_attachment_dir = + +# Attachments smaller than this aren't saved externally. It's also possible to +# write a plugin to disable saving specific attachments externally. +#mail_attachment_min_size = 128k + +# Filesystem backend to use for saving attachments: +# posix : No SiS done by Dovecot (but this might help FS's own deduplication) +# sis posix : SiS with immediate byte-by-byte comparison during saving +# sis-queue posix : SiS with delayed comparison and deduplication +#mail_attachment_fs = sis posix + +# Hash format to use in attachment filenames. You can add any text and +# variables: %{md4}, %{md5}, %{sha1}, %{sha256}, %{sha512}, %{size}. +# Variables can be truncated, e.g. %{sha256:80} returns only first 80 bits +#mail_attachment_hash = %{sha1} +]]> + + + + + #service_count = 1 + + # Number of processes to always keep waiting for more connections. + #process_min_avail = 0 + + # If you set service_count=0, you probably need to grow this. + #vsz_limit = $default_vsz_limit +} + +service pop3-login { + inet_listener pop3 { + #port = 110 + } + inet_listener pop3s { + #port = 995 + #ssl = yes + } +} + +service lmtp { + unix_listener lmtp { + #mode = 0666 + } + + # Create inet listener only if you can't use the above UNIX socket + #inet_listener lmtp { + # Avoid making LMTP visible for the entire internet + #address = + #port = + #} +} + +service imap { + # Most of the memory goes to mmap()ing files. You may need to increase this + # limit if you have huge mailboxes. + #vsz_limit = $default_vsz_limit + + # Max. number of IMAP processes (connections) + #process_limit = 1024 +} + +service pop3 { + # Max. number of POP3 processes (connections) + #process_limit = 1024 +} + +service auth { + # auth_socket_path points to this userdb socket by default. It's typically + # used by dovecot-lda, doveadm, possibly imap process, etc. Users that have + # full permissions to this socket are able to get a list of all usernames and + # get the results of everyone's userdb lookups. + # + # The default 0666 mode allows anyone to connect to the socket, but the + # userdb lookups will succeed only if the userdb returns an "uid" field that + # matches the caller process's UID. Also if caller's uid or gid matches the + # socket's uid or gid the lookup succeeds. Anything else causes a failure. + # + # To give the caller full permissions to lookup all users, set the mode to + # something else than 0666 and Dovecot lets the kernel enforce the + # permissions (e.g. 0777 allows everyone full permissions). + unix_listener auth-userdb { + #mode = 0666 + #user = + #group = + } + + # Postfix smtp-auth + unix_listener /var/spool/postfix/private/auth { + mode = 0660 + user = postfix + group = postfix + } + + # Exim4 smtp-auth + unix_listener auth-client { + mode = 0660 + user = mail + group = Debian-exim + } + + # Auth process is run as this user. + #user = $default_internal_user +} + +service auth-worker { + # Auth worker process is run as root by default, so that it can access + # /etc/shadow. If this isn't necessary, the user should be changed to + # $default_internal_user. + #user = root +} + +service dict { + # If dict proxy is used, mail processes should have access to its socket. + # For example: mode=0660, group=vmail and global mail_access_groups=vmail + unix_listener dict { + #mode = 0600 + #user = + #group = + } +} +]]> + + + + . %d expands to recipient domain. +postmaster_address = postmaster@ + +# Hostname to use in various parts of sent mails (e.g. in Message-Id) and +# in LMTP replies. Default is the system's real hostname@domain. +#hostname = + +# If user is over quota, return with temporary failure instead of +# bouncing the mail. +#quota_full_tempfail = no + +# Binary to use for sending mails. +#sendmail_path = /usr/sbin/sendmail + +# If non-empty, send mails via this SMTP host[:port] instead of sendmail. +#submission_host = + +# Subject: header to use for rejection mails. You can use the same variables +# as for rejection_reason below. +#rejection_subject = Rejected: %s + +# Human readable error message for rejection mails. You can use variables: +# %n = CRLF, %r = reason, %s = original subject, %t = recipient +#rejection_reason = Your message to <%t> was automatically rejected:%n%r + +# Delimiter character between local-part and detail in email address. +#recipient_delimiter = + + +# Header where the original recipient address (SMTP's RCPT TO: address) is taken +# from if not available elsewhere. With dovecot-lda -a parameter overrides this. +# A commonly used header for this is X-Original-To. +#lda_original_recipient_header = + +# Should saving a mail to a nonexistent mailbox automatically create it? +#lda_mailbox_autocreate = no + +# Should automatically created mailboxes be also automatically subscribed? +#lda_mailbox_autosubscribe = no + +protocol lda { + # Space separated list of plugins to load (default is global mail_plugins). + mail_plugins = $mail_plugins quota sieve +} +]]> + + + + + + + + + #service_count = 1 + + # Number of processes to always keep waiting for more connections. + #process_min_avail = 0 + + # If you set service_count=0, you probably need to grow this. + #vsz_limit = 64M +#} + +#service managesieve { + # Max. number of ManageSieve processes (connections) + #process_limit = 1024 +#} + +# Service configuration + +protocol sieve { + # Maximum ManageSieve command line length in bytes. ManageSieve usually does + # not involve overly long command lines, so this setting will not normally + # need adjustment + #managesieve_max_line_length = 65536 + + # Maximum number of ManageSieve connections allowed for a user from each IP + # address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (none known to be useful so far). + # Do NOT try to load IMAP plugins here. + #mail_plugins = + + # MANAGESIEVE logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + #managesieve_logout_format = bytes=%i/%o + + # To fool ManageSieve clients that are focused on CMU's timesieved you can + # specify the IMPLEMENTATION capability that Dovecot reports to clients. + # For example: 'Cyrus timsieved v2.2.13' + #managesieve_implementation_string = Dovecot Pigeonhole + + # Explicitly specify the SIEVE and NOTIFY capability reported by the server + # before login. If left unassigned these will be reported dynamically + # according to what the Sieve interpreter supports by default (after login + # this may differ depending on the user). + #managesieve_sieve_capability = + #managesieve_notify_capability = + + # The maximum number of compile errors that are returned to the client upon + # script upload or script verification. + #managesieve_max_compile_errors = 5 + + # Refer to 90-sieve.conf for script quota configuration and configuration of + # Sieve execution limits. +} +]]> + + + + = 2.1.4) : %v.%u +# Dovecot v0.99.x : %v.%u +# tpop3d : %Mf +# +# Note that Outlook 2003 seems to have problems with %v.%u format which was +# Dovecot's default, so if you're building a new server it would be a good +# idea to change this. %08Xu%08Xv should be pretty fail-safe. +# +#pop3_uidl_format = %08Xu%08Xv + +# Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes +# won't change those UIDLs. Currently this works only with Maildir. +#pop3_save_uidl = no + +# What to do about duplicate UIDLs if they exist? +# allow: Show duplicates to clients. +# rename: Append a temporary -2, -3, etc. counter after the UIDL. +#pop3_uidl_duplicates = allow + +# This option changes POP3 behavior so that it's not possible to actually +# delete mails via POP3, only hide them from future POP3 sessions. The mails +# will still be counted towards user's quota until actually deleted via IMAP. +# Use e.g. "$POP3Deleted" as the value (it will be visible as IMAP keyword). +# Make sure you can legally archive mails before enabling this setting. +#pop3_deleted_flag = + +# POP3 logout format string: +# %i - total number of bytes read from client +# %o - total number of bytes sent to client +# %t - number of TOP commands +# %p - number of bytes sent to client as a result of TOP command +# %r - number of RETR commands +# %b - number of bytes sent to client as a result of RETR command +# %d - number of deleted messages +# %m - number of messages (before deletion) +# %s - mailbox size in bytes (before deletion) +# %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly +#pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + +# Workarounds for various client bugs: +# outlook-no-nuls: +# Outlook and Outlook Express hang if mails contain NUL characters. +# This setting replaces them with 0x80 character. +# oe-ns-eoh: +# Outlook Express and Netscape Mail breaks if end of headers-line is +# missing. This option simply sends it if it's missing. +# The list is space-separated. +#pop3_client_workarounds = + +protocol pop3 { + # Space separated list of plugins to load (default is global mail_plugins). + #mail_plugins = $mail_plugins + + # Maximum number of POP3 connections allowed for a user from each IP address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 +} +]]> + + + + See sieve_before fore executing scripts before the user's personal + # script. + #sieve_default = /var/lib/dovecot/sieve/default.sieve + + # Directory for :personal include scripts for the include extension. This + # is also where the ManageSieve service stores the user's scripts. + sieve_dir = ~/sieve + + # Directory for :global include scripts for the include extension. + #sieve_global_dir = + + # Path to a script file or a directory containing script files that need to be + # executed before the user's script. If the path points to a directory, all + # the Sieve scripts contained therein (with the proper .sieve extension) are + # executed. The order of execution within a directory is determined by the + # file names, using a normal 8bit per-character comparison. Multiple script + # file or directory paths can be specified by appending an increasing number. + #sieve_before = + #sieve_before2 = + #sieve_before3 = (etc...) + + # Identical to sieve_before, only the specified scripts are executed after the + # user's script (only when keep is still in effect!). Multiple script file or + # directory paths can be specified by appending an increasing number. + #sieve_after = + #sieve_after2 = + #sieve_after2 = (etc...) + + # Which Sieve language extensions are available to users. By default, all + # supported extensions are available, except for deprecated extensions or + # those that are still under development. Some system administrators may want + # to disable certain Sieve extensions or enable those that are not available + # by default. This setting can use '+' and '-' to specify differences relative + # to the default. For example `sieve_extensions = +imapflags' will enable the + # deprecated imapflags extension in addition to all extensions were already + # enabled by default. + #sieve_extensions = +notify +imapflags + + # Which Sieve language extensions are ONLY available in global scripts. This + # can be used to restrict the use of certain Sieve extensions to administrator + # control, for instance when these extensions can cause security concerns. + # This setting has higher precedence than the `sieve_extensions' setting + # (above), meaning that the extensions enabled with this setting are never + # available to the user's personal script no matter what is specified for the + # `sieve_extensions' setting. The syntax of this setting is similar to the + # `sieve_extensions' setting, with the difference that extensions are + # enabled or disabled for exclusive use in global scripts. Currently, no + # extensions are marked as such by default. + #sieve_global_extensions = + + # The Pigeonhole Sieve interpreter can have plugins of its own. Using this + # setting, the used plugins can be specified. Check the Dovecot wiki + # (wiki2.dovecot.org) or the pigeonhole website + # (http://pigeonhole.dovecot.org) for available plugins. + # The sieve_extprograms plugin is included in this release. + #sieve_plugins = + + # The separator that is expected between the :user and :detail + # address parts introduced by the subaddress extension. This may + # also be a sequence of characters (e.g. '--'). The current + # implementation looks for the separator from the left of the + # localpart and uses the first one encountered. The :user part is + # left of the separator and the :detail part is right. This setting + # is also used by Dovecot's LMTP service. + #recipient_delimiter = + + + # The maximum size of a Sieve script. The compiler will refuse to compile any + # script larger than this limit. If set to 0, no limit on the script size is + # enforced. + #sieve_max_script_size = 1M + + # The maximum number of actions that can be performed during a single script + # execution. If set to 0, no limit on the total number of actions is enforced. + #sieve_max_actions = 32 + + # The maximum number of redirect actions that can be performed during a single + # script execution. If set to 0, no redirect actions are allowed. + #sieve_max_redirects = 4 + + # The maximum number of personal Sieve scripts a single user can have. If set + # to 0, no limit on the number of scripts is enforced. + # (Currently only relevant for ManageSieve) + #sieve_quota_max_scripts = 0 + + # The maximum amount of disk storage a single user's scripts may occupy. If + # set to 0, no limit on the used amount of disk storage is enforced. + # (Currently only relevant for ManageSieve) + #sieve_quota_max_storage = 0 +} +]]> + + + + + + + + + + //service[@type='mail']/general/installs[@index=1] + + //service[@type='mail']/general/files[@index=1] + + //service[@type='mail']/general/commands[@index=1] + + + + + //service[@type='mail']/general/installs[@index=1] + + //service[@type='mail']/general/files[@index=1] + + //service[@type='mail']/general/commands[@index=1] + + + + + + + + + + FTP Server" +ServerType standalone +DeferWelcome off + +MultilineRFC2228 on +DefaultServer on +ShowSymlinks on + +TimeoutNoTransfer 600 +TimeoutStalled 600 +TimeoutIdle 1200 + +DisplayLogin welcome.msg +DisplayChdir .message true +ListOptions "-l" + +DenyFilter \*.*/ + +# Use this to jail all users in their homes +# DefaultRoot ~ + +# Users require a valid shell listed in /etc/shells to login. +# Use this directive to release that constrain. +# RequireValidShell off + +# Port 21 is the standard FTP port. +Port 21 + +# In some cases you have to specify passive ports range to by-pass +# firewall limitations. Ephemeral ports can be used for that, but +# feel free to use a more narrow range. +# PassivePorts 49152 65534 + +# If your host was NATted, this option is useful in order to +# allow passive tranfers to work. You have to use your public +# address and opening the passive ports used on your firewall as well. +# MasqueradeAddress 1.2.3.4 + +# This is useful for masquerading address with dynamic IPs: +# refresh any configured MasqueradeAddress directives every 8 hours + +# DynMasqRefresh 28800 + + +# To prevent DoS attacks, set the maximum number of child processes +# to 30. If you need to allow more than 30 concurrent connections +# at once, simply increase this value. Note that this ONLY works +# in standalone mode, in inetd mode you should use an inetd server +# that allows you to limit maximum number of processes per service +# (such as xinetd) +MaxInstances 30 + +# Set the user and group that the server normally runs at. +User proftpd +Group nogroup + +# Umask 022 is a good standard umask to prevent new files and dirs +# (second parm) from being group and world writable. +Umask 022 022 +# Normally, we want files to be overwriteable. +AllowOverwrite on + +# Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: +# PersistentPasswd off + +# This is required to use both PAM-based authentication and local passwords +# AuthOrder mod_auth_pam.c* mod_auth_unix.c + +# Be warned: use of this directive impacts CPU average load! +# Uncomment this if you like to see progress and transfer rate with ftpwho +# in downloads. That is not needed for uploads rates. +# +# UseSendFile off + +TransferLog /var/log/proftpd/xferlog +SystemLog /var/log/proftpd/proftpd.log + +# Logging onto /var/log/lastlog is enabled but set to off by default +#UseLastlog on + +# In order to keep log file dates consistent after chroot, use timezone info +# from /etc/localtime. If this is not set, and proftpd is configured to +# chroot (e.g. DefaultRoot or ), it will use the non-daylight +# savings timezone regardless of whether DST is in effect. +#SetEnv TZ :/etc/localtime + + +QuotaEngine on + + + +Ratios off + + + +# Delay engine reduces impact of the so-called Timing Attack described in +# http://www.securityfocus.com/bid/11430/discuss +# It is on by default. + +DelayEngine on + + + +ControlsEngine off +ControlsMaxClients 2 +ControlsLog /var/log/proftpd/controls.log +ControlsInterval 5 +ControlsSocket /var/run/proftpd/proftpd.sock + + + +AdminControlsEngine off + + +# +# Alternative authentication frameworks +# +#Include /etc/proftpd/ldap.conf +Include /etc/proftpd/sql.conf + +# +# This is used for FTPS connections +# +#Include /etc/proftpd/tls.conf + +# +# Useful to keep VirtualHost/VirtualRoot directives separated +# +#Include /etc/proftpd/virtuals.conf + +# A basic anonymous configuration, no upload directories. + +# +# User ftp +# Group nogroup +# # We want clients to be able to login with "anonymous" as well as "ftp" +# UserAlias anonymous ftp +# # Cosmetic changes, all files belongs to ftp user +# DirFakeUser on ftp +# DirFakeGroup on ftp +# +# RequireValidShell off +# +# # Limit the maximum number of anonymous logins +# MaxClients 10 +# +# # We want 'welcome.msg' displayed at login, and '.message' displayed +# # in each newly chdired directory. +# DisplayLogin welcome.msg +# DisplayChdir .message +# +# # Limit WRITE everywhere in the anonymous chroot +# +# +# DenyAll +# +# +# +# # Uncomment this if you're brave. +# # +# # # Umask 022 is a good standard umask to prevent new files and dirs +# # # (second parm) from being group and world writable. +# # Umask 022 022 +# # +# # DenyAll +# # +# # +# # AllowAll +# # +# # +# +# + +# Include other custom configuration files +Include /etc/proftpd/conf.d/ +]]> + + + + + + + + +# +# Choose a SQL backend among MySQL or PostgreSQL. +# Both modules are loaded in default configuration, so you have to specify the backend +# or comment out the unused module in /etc/proftpd/modules.conf. +# Use 'mysql' or 'postgres' as possible values. +# +SQLBackend mysql +# +SQLEngine on +SQLAuthenticate on +# +# Use both a crypted or plaintext password +SQLAuthTypes Crypt +# +# Connection +SQLConnectInfo @ +# +# Describes both users/groups tables +# +SQLUserInfo ftp_users username password uid gid homedir shell +SQLGroupInfo ftp_groups groupname gid members +# +SQLUserWhereClause "login_enabled = 'y'" + +SQLLog PASS login +SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users + +SQLLog RETR download +SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users + +SQLLog STOR upload +SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users + +QuotaEngine on +QuotaShowQuotas on +QuotaDisplayUnits Mb +QuotaLock /var/lock/ftpd.quotatab.lock +QuotaLimitTable sql:/get-quota-limit +QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally +SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" +SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" +SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies +SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# Mandatory : user password. You must have a password. + +MYSQLPassword + + +# Mandatory : database to open. + +MYSQLDatabase + + +# Mandatory : how passwords are stored +# Valid values are : "cleartext", "crypt", "sha1", "md5" and "password" +# ("password" = MySQL password() function) +# You can also use "any" to try "crypt", "sha1", "md5" *and* "password" + +MYSQLCrypt any + + +# In the following directives, parts of the strings are replaced at +# run-time before performing queries : +# +# \L is replaced by the login of the user trying to authenticate. +# \I is replaced by the IP address the user connected to. +# \P is replaced by the port number the user connected to. +# \R is replaced by the IP address the user connected from. +# \D is replaced by the remote IP address, as a long decimal number. +# +# Very complex queries can be performed using these substitution strings, +# especially for virtual hosting. + + +# Query to execute in order to fetch the password + +MYSQLGetPW SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y" + + +# Query to execute in order to fetch the system user name or uid + +MYSQLGetUID SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y" + + +# Optional : default UID - if set this overrides MYSQLGetUID + +#MYSQLDefaultUID 1000 + + +# Query to execute in order to fetch the system user group or gid + +MYSQLGetGID SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y" + + +# Optional : default GID - if set this overrides MYSQLGetGID + +#MYSQLDefaultGID 1000 + + +# Query to execute in order to fetch the home directory + +MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y" + + +# Optional : query to get the maximal number of files +# Pure-FTPd must have been compiled with virtual quotas support. + +# MySQLGetQTAFS SELECT QuotaFiles FROM users WHERE User='\L' + + +# Optional : query to get the maximal disk usage (virtual quotas) +# The number should be in Megabytes. +# Pure-FTPd must have been compiled with virtual quotas support. + +MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) + + +# Optional : ratios. The server has to be compiled with ratio support. + +# MySQLGetRatioUL SELECT ULRatio FROM users WHERE User='\L' +# MySQLGetRatioDL SELECT DLRatio FROM users WHERE User='\L' + + +# Optional : bandwidth throttling. +# The server has to be compiled with throttling support. +# Values are in KB/s . + +# MySQLGetBandwidthUL SELECT ULBandwidth FROM users WHERE User='\L' +# MySQLGetBandwidthDL SELECT DLBandwidth FROM users WHERE User='\L' + +# Enable ~ expansion. NEVER ENABLE THIS BLINDLY UNLESS : +# 1) You know what you are doing. +# 2) Real and virtual users match. + +# MySQLForceTildeExpansion 1 + + +# If you're using a transactionnal storage engine, you can enable SQL +# transactions to avoid races. Leave this commented if you are using the +# traditionnal MyIsam engine. + +# MySQLTransactions On +]]> + + + + + + + + + + + + + + + + + + + + + + + scripts/froxlor_master_cronjob.php +]]> + + + + + + + + + + + + + + + + + + +database +username +password +port 3306 +#socket /var/run/mysqld/mysqld.sock +]]> + + + + + {{sql.socket}} + + + + + + +password +]]> + + + + + + + + + + + + + + + *.log { + missingok + weekly + rotate 4 + compress + delaycompress + notifempty + create + sharedscripts + postrotate + > /dev/null 2>&1 || true + endscript +} +]]> + + + + + + + + + {{settings.system.mod_fcgid_ownvhost}} + + + + + + + + + + + + + + {{settings.system.webserver}} + + + + + + {{settings.system.webserver}} + + + + + + {{settings.system.webserver}} + + + + + {{settings.phpfpm.enabled_ownvhost}} + + {{settings.phpfpm.vhost_httpuser}} + + + + + + {{settings.system.webserver}} + + {{settings.phpfpm.enabled_ownvhost}} + + + + + + + + + + From 565bb55b139adb49493f4876b3601c78f8b96015 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 29 Jul 2015 15:58:27 +0200 Subject: [PATCH 15/34] display description of integrity-check rather then just the function-name, makes things clearer Signed-off-by: Michael Kaufmann (d00p) --- admin_settings.php | 1 + lng/english.lng.php | 6 ++++++ lng/german.lng.php | 6 ++++++ templates/Sparkle/admin/settings/integritycheck_row.tpl | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/admin_settings.php b/admin_settings.php index 21b8913d..e8213225 100644 --- a/admin_settings.php +++ b/admin_settings.php @@ -283,6 +283,7 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') { foreach ($integrity->available as $id => $check) { $displayid = $id + 1; $result = $integrity->$check(); + $checkdesc = $lng['integrity_check'][$check]; eval("\$integritycheck.=\"" . getTemplate("settings/integritycheck_row") . "\";"); } eval("echo \"" . getTemplate("settings/integritycheck") . "\";"); diff --git a/lng/english.lng.php b/lng/english.lng.php index f698bb46..72816115 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1843,3 +1843,9 @@ $lng['admin']['configfiles']['commands'] = 'Commands: T $lng['admin']['configfiles']['files'] = 'Configfiles: This is an example of the contents of a configuration file. The commands before these textfields should open an editor with the target file. Just copy and paste the contents into the editor and save the file.

Please note: The MySQL-password has not been replaced for security reasons. Please replace "MYSQL_PASSWORD" on your own. If you forgot your MySQL-password you\'ll find it in "lib/userdata.inc.php"'; $lng['serversettings']['apache_itksupport']['title'] = 'Use modifications for Apache ITK-MPM'; $lng['serversettings']['apache_itksupport']['description'] = 'ATTENTION: use only if you acutally have apache itk-mpm enabled
otherwise your webserver will not be able to start'; + +$lng['integrity_check']['DatabaseCharset'] = 'Characterset of database (should be UTF-8)'; +$lng['integrity_check']['DomainIpTable'] = 'IP <‐> domain references'; +$lng['integrity_check']['SubdomainSslRedirect'] = 'False SSL-redirect flag for non-ssl domains'; +$lng['integrity_check']['FroxlorLocalGroupMemberForFcgidPhpFpm'] = 'froxlor-user in the customer groups (for FCGID/php-fpm)'; +$lng['integrity_check']['WebserverGroupMemberForFcgidPhpFpm'] = 'Webserver-user in the customer groups (for FCGID/php-fpm)'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 80e8d5e6..8cc303b2 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1570,3 +1570,9 @@ $lng['admin']['configfiles']['commands'] = 'Kommandos: $lng['admin']['configfiles']['files'] = 'Konfigurationsdateien: Dies ist der Inhalt einer Konfigurationsdatei. Der Befehl direkt vor dem Textfeld sollte einen Editor mit der Zeildatei รถffnen. Der Inhalt kann nun einfach kopiert und in den Editor eingefรผgt und die Datei gespeichert werden.

Beachten Sie: Das MySQL-Passwort wurde aus Sicherheitsgrรผnden nicht ersetzt. Bitte ersetzen Sie "MYSQL_PASSWORD" manuell durch das entsprechende Passwort. Falls Sie es vergessen haben sollten, finden Sie es in der Datei "lib/userdata.inc.php".'; $lng['serversettings']['apache_itksupport']['title'] = 'Anpassungen fรผr Apache ITK-MPM verwenden'; $lng['serversettings']['apache_itksupport']['description'] = '
Achtung: Bitte nur verwenden, wenn wirklich Apache itk-mpm verwendet wird, ansonsten wird der Webserver nicht starten.
'; + +$lng['integrity_check']['DatabaseCharset'] = 'Characterset der Datenbank (sollte UTF-8 sein)'; +$lng['integrity_check']['DomainIpTable'] = 'IP <‐> Domain Verknüpfung'; +$lng['integrity_check']['SubdomainSslRedirect'] = 'Falsches SSL-redirect Flag bei nicht-ssl Domains'; +$lng['integrity_check']['FroxlorLocalGroupMemberForFcgidPhpFpm'] = 'froxlor-Benutzer in Kunden Gruppen (für FCGID/php-fpm)'; +$lng['integrity_check']['WebserverGroupMemberForFcgidPhpFpm'] = 'Webserver-Benutzer in Kunden Gruppen (für FCGID/php-fpm)'; diff --git a/templates/Sparkle/admin/settings/integritycheck_row.tpl b/templates/Sparkle/admin/settings/integritycheck_row.tpl index e614f61b..0641d471 100644 --- a/templates/Sparkle/admin/settings/integritycheck_row.tpl +++ b/templates/Sparkle/admin/settings/integritycheck_row.tpl @@ -1,6 +1,6 @@ {$displayid} - {$check} + {$checkname} OK From 532c5d1b9ff04631b181c24c0978f0c15b1f49a9 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 29 Jul 2015 16:03:55 +0200 Subject: [PATCH 16/34] revert the new formfield-layout for customer-mysql Signed-off-by: Michael Kaufmann (d00p) --- lib/formfields/customer/formfield.mysql.php | 57 ----------------- .../customer/mysql/formfield.mysql_add.php | 61 +++++++++++++++++++ .../customer/mysql/formfield.mysql_edit.php | 56 +++++++++++++++++ 3 files changed, 117 insertions(+), 57 deletions(-) delete mode 100644 lib/formfields/customer/formfield.mysql.php create mode 100644 lib/formfields/customer/mysql/formfield.mysql_add.php create mode 100644 lib/formfields/customer/mysql/formfield.mysql_edit.php diff --git a/lib/formfields/customer/formfield.mysql.php b/lib/formfields/customer/formfield.mysql.php deleted file mode 100644 index a9c01a22..00000000 --- a/lib/formfields/customer/formfield.mysql.php +++ /dev/null @@ -1,57 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'section_a' => array( - 'fields' => array( - 'description' => array( - 'label' => $lng['mysql']['databasedescription'], - 'type' => 'text', - ), - 'mysql_server' => array( - 'label' => $lng['mysql']['mysql_server'], - 'type' => (isset($result)) ? 'select' : 'text', - 'visible' => (1 < $count_mysqlservers ? true : false), - 'values' => (isset($mysql_servers)) ? $mysql_servers : "" - ), - 'mysql_password' => array( - 'label' => $lng['login']['password'], - 'type' => 'password', - 'attributes' => array( - 'autocomplete' => 'off' - ) - ), - 'mysql_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], - 'type' => 'text', - 'visible' => (Settings::Get('panel.password_regex') == ''), - 'value' => generatePassword(), - 'attributes' => array( - 'readonly' => true - ) - ), - 'sendinfomail' => array( - 'label' => $lng['customer']['sendinfomail'], - 'type' => 'checkbox', - 'visible' => 'new', - 'attributes' => array( - 'checked' => true - ) - ) - ) - ) -); \ No newline at end of file diff --git a/lib/formfields/customer/mysql/formfield.mysql_add.php b/lib/formfields/customer/mysql/formfield.mysql_add.php new file mode 100644 index 00000000..b0dba786 --- /dev/null +++ b/lib/formfields/customer/mysql/formfield.mysql_add.php @@ -0,0 +1,61 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + */ +return array( + 'mysql_add' => array( + 'title' => $lng['mysql']['database_create'], + 'image' => 'icons/mysql_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['mysql']['database_create'], + 'image' => 'icons/mysql_add.png', + 'fields' => array( + 'description' => array( + 'label' => $lng['mysql']['databasedescription'], + 'type' => 'text' + ), + 'mysql_server' => array( + 'visible' => (1 < $count_mysqlservers ? true : false), + 'label' => $lng['mysql']['mysql_server'], + 'type' => 'select', + 'select_var' => $mysql_servers + ), + 'mysql_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password', + 'autocomplete' => 'off' + ), + 'mysql_password_suggestion' => array( + 'label' => $lng['customer']['generated_pwd'], + 'type' => 'text', + 'visible' => (Settings::Get('panel.password_regex') == ''), + 'value' => generatePassword() + ), + 'sendinfomail' => array( + 'label' => $lng['customer']['sendinfomail'], + 'type' => 'checkbox', + 'values' => array( + array( + 'label' => $lng['panel']['yes'], + 'value' => '1' + ) + ), + 'value' => array() + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/mysql/formfield.mysql_edit.php b/lib/formfields/customer/mysql/formfield.mysql_edit.php new file mode 100644 index 00000000..5be87ed4 --- /dev/null +++ b/lib/formfields/customer/mysql/formfield.mysql_edit.php @@ -0,0 +1,56 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + */ +return array( + 'mysql_edit' => array( + 'title' => $lng['mysql']['database_edit'], + 'image' => 'icons/mysql_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['mysql']['database_edit'], + 'image' => 'icons/mysql_edit.png', + 'fields' => array( + 'databasename' => array( + 'label' => $lng['mysql']['databasename'], + 'type' => 'label', + 'value' => $result['databasename'] + ), + 'description' => array( + 'label' => $lng['mysql']['databasedescription'], + 'type' => 'text', + 'value' => $result['description'] + ), + 'mysql_server' => array( + 'visible' => (1 < $count_mysqlservers ? true : false), + 'label' => $lng['mysql']['mysql_server'], + 'type' => 'label', + 'value' => $sql_root['caption'] + ), + 'mysql_password' => array( + 'label' => $lng['changepassword']['new_password_ifnotempty'], + 'type' => 'password', + 'autocomplete' => 'off' + ), + 'mysql_password_suggestion' => array( + 'label' => $lng['customer']['generated_pwd'], + 'type' => 'text', + 'visible' => (Settings::Get('panel.password_regex') == ''), + 'value' => generatePassword() + ) + ) + ) + ) + ) +); From 12723d49418f78b64ffa414722a1c37c9fa0b188 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 29 Jul 2015 18:09:42 +0200 Subject: [PATCH 17/34] add update compatibility for bugfix-release 0.9.33.2 Signed-off-by: Michael Kaufmann (d00p) --- install/updates/froxlor/0.9/update_0.9.inc.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 0f87196e..67ea8d38 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2905,7 +2905,15 @@ if (isFroxlorVersion('0.9.33')) { if (isFroxlorVersion('0.9.33.1')) { - showUpdateStep("Updating from 0.9.33.1 to 0.9.34-dev1", false); + showUpdateStep("Updating from 0.9.33.1 to 0.9.33.2"); + lastStepStatus(0); + updateToVersion('0.9.33.2'); + +} + +if (isFroxlorVersion('0.9.33.2')) { + + showUpdateStep("Updating from 0.9.33.2 to 0.9.34-dev1", false); showUpdateStep("Updating table structure of domains"); Database::query("ALTER TABLE `".TABLE_PANEL_DOMAINS."` MODIFY `parentdomainid` int(11) NOT NULL default '0'"); From 3d01947f3d1862332aec0c65c75e4ee60544546b Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 30 Jul 2015 11:35:24 +0200 Subject: [PATCH 18/34] fix wrong tpl-variable-name Signed-off-by: Michael Kaufmann (d00p) --- templates/Sparkle/admin/settings/integritycheck_row.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Sparkle/admin/settings/integritycheck_row.tpl b/templates/Sparkle/admin/settings/integritycheck_row.tpl index 0641d471..999a1fbc 100644 --- a/templates/Sparkle/admin/settings/integritycheck_row.tpl +++ b/templates/Sparkle/admin/settings/integritycheck_row.tpl @@ -1,6 +1,6 @@ {$displayid} - {$checkname} + {$checkdesc} OK From 819db2583bb2a3e5a221ef02d2e2926103d463cf Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 31 Jul 2015 09:18:57 +0200 Subject: [PATCH 19/34] add mpm-itk to the list of dependents of libnss-mysql; fix proftpd-sql config for jessie; update powerdns-config for jessie Signed-off-by: Michael Kaufmann (d00p) --- lib/configfiles/gentoo.xml | 2 +- lib/configfiles/jessie.xml | 382 +++++++++++++++++++++++++------- lib/configfiles/precise.xml | 2 +- lib/configfiles/rhel_centos.xml | 2 +- lib/configfiles/trusty.xml | 2 +- lib/configfiles/wheezy.xml | 2 +- 6 files changed, 302 insertions(+), 90 deletions(-) diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index d70e79ac..908cb9ea 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -2880,7 +2880,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin - + diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml index c50d4a33..41151e00 100644 --- a/lib/configfiles/jessie.xml +++ b/lib/configfiles/jessie.xml @@ -350,33 +350,55 @@ exit "$RETVAL" +# allow-axfr-ips=127.0.0.0/8,::1, ################################# -# allow-recursion List of netmasks that are allowed to recurse +# allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. +# +# allow-dnsupdate-from=127.0.0.0/8,::1 + +################################# +# allow-recursion List of subnets that are allowed to recurse # allow-recursion=127.0.0.1 ################################# -# allow-recursion-override Local data even about hosts that don't exist will -# override the internet. (on/off) +# also-notify When notifying a domain, also notify these nameservers # -# allow-recursion-override= +# also-notify= + +################################# +# any-to-tcp Answer ANY queries with tc=1, shunting to TCP +# +# any-to-tcp=no ################################# # cache-ttl Seconds to store packets in the PacketCache # # cache-ttl=20 +################################# +# carbon-interval Number of seconds between carbon (graphite) updates +# +# carbon-interval=30 + +################################# +# carbon-ourname If set, overrides our reported hostname for carbon stats +# +# carbon-ourname= + +################################# +# carbon-server If set, send metrics in carbon (graphite) format to this server +# +# carbon-server= + ################################# # chroot If set, chroot to this directory for more security # -# chroot=/var/spool/powerdns +# chroot= ################################# # config-dir Location of configuration directory (pdns.conf) @@ -398,15 +420,55 @@ config-dir=/etc/powerdns # daemon=yes +################################# +# default-ksk-algorithms Default KSK algorithms +# +# default-ksk-algorithms=rsasha256 + +################################# +# default-ksk-size Default KSK size (0 means default) +# +# default-ksk-size=0 + +################################# +# default-soa-mail mail address to insert in the SOA record if none set in the backend +# +# default-soa-mail= + ################################# # default-soa-name name to insert in the SOA record if none set in the backend # # default-soa-name=a.misconfigured.powerdns.server +################################# +# default-ttl Seconds a result is valid if not set otherwise +# +# default-ttl=3600 + +################################# +# default-zsk-algorithms Default ZSK algorithms +# +# default-zsk-algorithms=rsasha256 + +################################# +# default-zsk-size Default ZSK size (0 means default) +# +# default-zsk-size=0 + +################################# +# direct-dnskey Fetch DNSKEY RRs from backend during DNSKEY synthesis +# +# direct-dnskey=no + ################################# # disable-axfr Disable zonetransfers but do allow TCP queries # -disable-axfr=yes +# disable-axfr=no + +################################# +# disable-axfr-rectify Disable the rectify step during an outgoing AXFR. Only required for regression testing. +# +# disable-axfr-rectify=no ################################# # disable-tcp Do not listen to TCP queries @@ -419,9 +481,54 @@ disable-axfr=yes # distributor-threads=3 ################################# -# fancy-records Process URL and MBOXFW records +# do-ipv6-additional-processing Do AAAA additional processing # -# fancy-records=no +# do-ipv6-additional-processing=yes + +################################# +# edns-subnet-processing If we should act on EDNS Subnet options +# +# edns-subnet-processing=no + +################################# +# entropy-source If set, read entropy from this file +# +# entropy-source=/dev/urandom + +################################# +# experimental-api-key REST API Static authentication key (required for API use) +# +# experimental-api-key= + +################################# +# experimental-api-readonly If the JSON API should disallow data modification +# +# experimental-api-readonly=no + +################################# +# experimental-dname-processing If we should support DNAME records +# +# experimental-dname-processing=no + +################################# +# experimental-dnsupdate Enable/Disable DNS update (RFC2136) support. Default is no. +# +# experimental-dnsupdate=no + +################################# +# experimental-json-interface If the webserver should serve JSON data +# +# experimental-json-interface=no + +################################# +# experimental-logfile Filename of the log file for JSON parser +# +# experimental-logfile=/var/log/pdns.log + +################################# +# forward-dnsupdate A global setting to allow DNS update packages that are for a Slave domain, to be forwarded to the master. +# +# forward-dnsupdate=yes ################################# # guardian Run within a guardian process @@ -429,14 +536,16 @@ disable-axfr=yes guardian=yes ################################# -# launch Which backends to launch and order to query them in +# include-dir Include *.conf files from this directory # -launch=bind +# include-dir= +include-dir=/etc/powerdns/pdns.d ################################# -# lazy-recursion Only recurse if question cannot be answered locally +# launch Which backends to launch and order to query them in # -lazy-recursion=yes +# launch= +launch=bind ################################# # load-modules Load this module - supply absolute or relative path @@ -444,34 +553,39 @@ lazy-recursion=yes # load-modules= ################################# -# local-address Local IP address to which we bind +# local-address Local IP addresses to which we bind # local-address=,127.0.0.1 +################################# +# local-address-nonexist-fail Fail to start if one or more of the local-address's do not exist on this server +# +# local-address-nonexist-fail=yes + ################################# # local-ipv6 Local IP address to which we bind # # local-ipv6= +################################# +# local-ipv6-nonexist-fail Fail to start if one or more of the local-ipv6 addresses do not exist on this server +# +# local-ipv6-nonexist-fail=yes + ################################# # local-port The port on which we listen # -local-port=53 +# local-port=53 ################################# -# log-dns-details If PDNS should log failed update requests +# log-dns-details If PDNS should log DNS non-erroneous details # -log-dns-details=yes +# log-dns-details=no ################################# -# log-failed-updates If PDNS should log failed update requests +# log-dns-queries If PDNS should log all incoming DNS queries # -# log-failed-updates= - -################################# -# logfile Logfile to use -# -# logfile=/var/log/pdns.log +# log-dns-queries=no ################################# # logging-facility Log under a specific facility @@ -483,16 +597,41 @@ log-dns-details=yes # # loglevel=4 +################################# +# lua-prequery-script Lua script with prequery handler +# +# lua-prequery-script= + ################################# # master Act as a master # master=yes +################################# +# max-cache-entries Maximum number of cache entries +# +# max-cache-entries=1000000 + +################################# +# max-ent-entries Maximum number of empty non-terminals in a zone +# +# max-ent-entries=100000 + +################################# +# max-nsec3-iterations Limit the number of NSEC3 hash iterations +# +# max-nsec3-iterations=500 + ################################# # max-queue-length Maximum queuelength before considering situation lost # # max-queue-length=5000 +################################# +# max-signature-cache-entries Maximum number of signatures cache entries +# +# max-signature-cache-entries= + ################################# # max-tcp-connections Maximum number of TCP connections # @@ -501,23 +640,58 @@ master=yes ################################# # module-dir Default directory for modules # -module-dir=/usr/lib/powerdns +# module-dir=/usr/lib/TRIPLET/pdns ################################# -# negquery-cache-ttl Seconds to store packets in the PacketCache +# negquery-cache-ttl Seconds to store negative query results in the QueryCache # # negquery-cache-ttl=60 ################################# -# out-of-zone-additional-processing Do out of zone additional processing +# no-shuffle Set this to prevent random shuffling of answers - for regression testing # -# out-of-zone-additional-processing=no +# no-shuffle=off ################################# -# query-cache-ttl Seconds to store packets in the PacketCache +# only-notify Only send AXFR NOTIFY to these IP addresses or netmasks +# +# only-notify=0.0.0.0/0,::/0 + +################################# +# out-of-zone-additional-processing Do out of zone additional processing +# +# out-of-zone-additional-processing=yes + +################################# +# overload-queue-length Maximum queuelength moving to packetcache only +# +# overload-queue-length=0 + +################################# +# pipebackend-abi-version Version of the pipe backend ABI +# +# pipebackend-abi-version=1 + +################################# +# prevent-self-notification Don't send notifications to what we think is ourself +# +# prevent-self-notification=yes + +################################# +# query-cache-ttl Seconds to store query results in the QueryCache # # query-cache-ttl=20 +################################# +# query-local-address Source IP address for sending queries +# +# query-local-address=0.0.0.0 + +################################# +# query-local-address6 Source IPv6 address for sending queries +# +# query-local-address6=:: + ################################# # query-logging Hint backends that queries should be logged # @@ -529,24 +703,44 @@ module-dir=/usr/lib/powerdns # queue-limit=1500 ################################# -# query-local-address The IP address to use as a source address for sending -# queries. -# query-local-address= - -################################# -# receiver-threads Number of receiver threads to launch +# receiver-threads Default number of receiver threads to start # # receiver-threads=1 ################################# -# recursive-cache-ttl Seconds to store packets in the PacketCache +# recursive-cache-ttl Seconds to store packets for recursive queries in the PacketCache # # recursive-cache-ttl=10 ################################# # recursor If recursion is desired, IP address of a recursing nameserver # -# recursor= +# recursor=no + +################################# +# retrieval-threads Number of AXFR-retrieval threads for slave operation +# +# retrieval-threads=2 + +################################# +# reuseport Enable higher performance on compliant kernels by using SO_REUSEPORT allowing each receiver thread to open its own socket +# +# reuseport=no + +################################# +# security-poll-suffix Domain name from which to query security update notifications +# +# security-poll-suffix=secpoll.powerdns.com. + +################################# +# send-root-referral Send out old-fashioned root-referral instead of ServFail in case of no authority +# +# send-root-referral=no + +################################# +# server-id Returned when queried for 'server.id' TXT or NSID, defaults to hostname - disabled or custom +# +# server-id= ################################# # setgid If set, change group id to this gid for more security @@ -559,9 +753,9 @@ setgid=pdns setuid=pdns ################################# -# skip-cname Do not perform CNAME indirection for each query +# signing-threads Default number of signer threads to start # -# skip-cname=no +# signing-threads=3 ################################# # slave Act as a slave @@ -574,55 +768,75 @@ setuid=pdns # slave-cycle-interval=60 ################################# -# smtpredirector Our smtpredir MX host +# slave-renotify If we should send out notifications for slaved updates # -# smtpredirector=a.misconfigured.powerdns.smtp.server +# slave-renotify=no ################################# -# soa-minimum-ttl Default SOA mininum ttl -# -# soa-minimum-ttl=3600 - -################################# -# soa-refresh-default Default SOA refresh -# -# soa-refresh-default=10800 - -################################# -# soa-retry-default Default SOA retry -# -# soa-retry-default=3600 - -################################# -# soa-expire-default Default SOA expire +# soa-expire-default Default SOA expire # # soa-expire-default=604800 ################################# -# soa-serial-offset Make sure that no SOA serial is less than this number +# soa-minimum-ttl Default SOA minimum ttl # -# soa-serial-offset=0 +# soa-minimum-ttl=3600 + +################################# +# soa-refresh-default Default SOA refresh +# +# soa-refresh-default=10800 + +################################# +# soa-retry-default Default SOA retry +# +# soa-retry-default=3600 ################################# # socket-dir Where the controlsocket will live # -socket-dir=/var/run +# socket-dir=/var/run ################################# -# strict-rfc-axfrs Perform strictly rfc compliant axfrs (very slow) +# tcp-control-address If set, PowerDNS can be controlled over TCP on this address # -# strict-rfc-axfrs=no +# tcp-control-address= ################################# -# urlredirector Where we send hosts to that need to be url redirected +# tcp-control-port If set, PowerDNS can be controlled over TCP on this address # -# urlredirector=127.0.0.1 +# tcp-control-port=53000 ################################# -# use-logfile Use a log file +# tcp-control-range If set, remote control of PowerDNS is possible over these networks only # -# use-logfile=yes +# tcp-control-range=127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12, ::1/128, fe80::/10 +################################# +# tcp-control-secret If set, PowerDNS can be controlled over TCP after passing this secret +# +# tcp-control-secret= + +################################# +# traceback-handler Enable the traceback handler (Linux only) +# +# traceback-handler=yes + +################################# +# trusted-notification-proxy IP address of incoming notification proxy +# +# trusted-notification-proxy= + +################################# +# udp-truncation-threshold Maximum UDP response size before we truncate +# +# udp-truncation-threshold=1680 + +################################# +# version-string PowerDNS version in packets - full, anonymous, powerdns or custom +# + +version-string=powerdns ################################# # webserver Start a webserver for monitoring # @@ -633,6 +847,11 @@ socket-dir=/var/run # # webserver-address=127.0.0.1 +################################# +# webserver-allow-from Webserver access is only allowed from these subnets +# +# webserver-allow-from=0.0.0.0/0,::/0 + ################################# # webserver-password Password required for accessing the webserver # @@ -648,21 +867,6 @@ socket-dir=/var/run # # webserver-print-arguments=no -################################# -# wildcard-url Process URL and MBOXFW records -# -# wildcard-url=no - -################################# -# wildcards Honor wildcards in the database -# -# wildcards= - -################################# -# version-string What should PowerDNS return for version -# allowed methods are anonymous / powerdns / full / custom -version-string=powerdns - include=/etc/powerdns/pdns.d ]]> @@ -3356,6 +3560,11 @@ LoadModule mod_ifsession.c # + +DefaultRoot ~ +RequireValidShell off +AuthOrder mod_sql.c + # # Choose a SQL backend among MySQL or PostgreSQL. # Both modules are loaded in default configuration, so you have to specify the backend @@ -3369,6 +3578,9 @@ SQLAuthenticate on # # Use both a crypted or plaintext password SQLAuthTypes Crypt + +SQLAuthenticate users* groups* + # # Connection SQLConnectInfo @ @@ -3662,7 +3874,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - + - + diff --git a/lib/configfiles/rhel_centos.xml b/lib/configfiles/rhel_centos.xml index b5131138..b749d4dd 100644 --- a/lib/configfiles/rhel_centos.xml +++ b/lib/configfiles/rhel_centos.xml @@ -2299,7 +2299,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin - + - + diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml index 640cf702..893eedfd 100644 --- a/lib/configfiles/wheezy.xml +++ b/lib/configfiles/wheezy.xml @@ -4945,7 +4945,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - + From 8e8c97f7f9312c9edadd5a530a9c8b2c024b6a34 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 31 Jul 2015 10:44:33 +0200 Subject: [PATCH 20/34] avoid empty value for makeCorrectDir as the assert-check runs before evaluating to / in certain places Signed-off-by: Michael Kaufmann (d00p) --- customer_domains.php | 2 +- customer_extras.php | 10 +++++----- customer_ftp.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/customer_domains.php b/customer_domains.php index 416f3e4b..2e0fb0f2 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -141,7 +141,7 @@ if ($page == 'overview') { foreach ($domain_array as $row) { if (strpos($row['documentroot'], $userinfo['documentroot']) === 0) { - $row['documentroot'] = makeCorrectDir(substr($row['documentroot'], strlen($userinfo['documentroot']))); + $row['documentroot'] = makeCorrectDir(substr($row['documentroot'], strlen($userinfo['documentroot']) - 1)); } // get ssl-ips if activated diff --git a/customer_extras.php b/customer_extras.php index 4c88883c..def51907 100644 --- a/customer_extras.php +++ b/customer_extras.php @@ -53,7 +53,7 @@ if ($page == 'overview') { while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) { if ($paging->checkDisplay($i)) { if (strpos($row['path'], $userinfo['documentroot']) === 0) { - $row['path'] = substr($row['path'], strlen($userinfo['documentroot'])); + $row['path'] = substr($row['path'], strlen($userinfo['documentroot']) - 1); } $row = htmlentities_array($row); @@ -86,7 +86,7 @@ if ($page == 'overview') { redirectTo($filename, array('page' => $page, 's' => $s)); } else { if (strpos($result['path'], $userinfo['documentroot']) === 0) { - $result['path'] = substr($result['path'], strlen($userinfo['documentroot'])); + $result['path'] = substr($result['path'], strlen($userinfo['documentroot']) - 1); } ask_yesno('extras_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['username'] . ' (' . $result['path'] . ')'); @@ -302,11 +302,11 @@ if ($page == 'overview') { AND `id`= :id" ); Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id)); - $log->logAction(USR_ACTION, LOG_INFO, "deleted htaccess for '" . str_replace($userinfo['documentroot'], '', $result['path']) . "'"); + $log->logAction(USR_ACTION, LOG_INFO, "deleted htaccess for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'"); inserttask('1'); redirectTo($filename, array('page' => $page, 's' => $s)); } else { - ask_yesno('extras_reallydelete_pathoptions', $filename, array('id' => $id, 'page' => $page, 'action' => $action), str_replace($userinfo['documentroot'], '', $result['path'])); + ask_yesno('extras_reallydelete_pathoptions', $filename, array('id' => $id, 'page' => $page, 'action' => $action), str_replace($userinfo['documentroot'], '/', $result['path'])); } } } elseif ($action == 'add') { @@ -438,7 +438,7 @@ if ($page == 'overview') { "id" => $id ); Database::pexecute($stmt, $params); - $log->logAction(USR_ACTION, LOG_INFO, "edited htaccess for '" . str_replace($userinfo['documentroot'], '', $result['path']) . "'"); + $log->logAction(USR_ACTION, LOG_INFO, "edited htaccess for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'"); } redirectTo($filename, array('page' => $page, 's' => $s)); diff --git a/customer_ftp.php b/customer_ftp.php index 0a86b43d..606ae86e 100644 --- a/customer_ftp.php +++ b/customer_ftp.php @@ -57,7 +57,7 @@ if ($page == 'overview') { while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) { if ($paging->checkDisplay($i)) { if (strpos($row['homedir'], $userinfo['documentroot']) === 0) { - $row['documentroot'] = substr($row['homedir'], strlen($userinfo['documentroot'])); + $row['documentroot'] = substr($row['homedir'], strlen($userinfo['documentroot']) - 1); } else { $row['documentroot'] = $row['homedir']; } From 51368248446de6e5e12340c70f9959993adf1e63 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 31 Jul 2015 11:45:30 +0200 Subject: [PATCH 21/34] Merge pull request #244 from greybyte/vhost_config_variables Variable substitution in vhost specialconfig --- lng/english.lng.php | 5 ++- lng/german.lng.php | 4 +- scripts/classes/class.HttpConfigBase.php | 38 +++++++++++++++++++ .../jobs/cron_tasks.inc.http.10.apache.php | 34 +++++++++++++---- .../jobs/cron_tasks.inc.http.20.lighttpd.php | 33 +++++++++++++--- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 36 +++++++++++++++--- 6 files changed, 131 insertions(+), 19 deletions(-) create mode 100644 scripts/classes/class.HttpConfigBase.php diff --git a/lng/english.lng.php b/lng/english.lng.php index 72816115..d0366dae 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1843,9 +1843,12 @@ $lng['admin']['configfiles']['commands'] = 'Commands: T $lng['admin']['configfiles']['files'] = 'Configfiles: This is an example of the contents of a configuration file. The commands before these textfields should open an editor with the target file. Just copy and paste the contents into the editor and save the file.

Please note: The MySQL-password has not been replaced for security reasons. Please replace "MYSQL_PASSWORD" on your own. If you forgot your MySQL-password you\'ll find it in "lib/userdata.inc.php"'; $lng['serversettings']['apache_itksupport']['title'] = 'Use modifications for Apache ITK-MPM'; $lng['serversettings']['apache_itksupport']['description'] = 'ATTENTION: use only if you acutally have apache itk-mpm enabled
otherwise your webserver will not be able to start'; - $lng['integrity_check']['DatabaseCharset'] = 'Characterset of database (should be UTF-8)'; $lng['integrity_check']['DomainIpTable'] = 'IP <‐> domain references'; $lng['integrity_check']['SubdomainSslRedirect'] = 'False SSL-redirect flag for non-ssl domains'; $lng['integrity_check']['FroxlorLocalGroupMemberForFcgidPhpFpm'] = 'froxlor-user in the customer groups (for FCGID/php-fpm)'; $lng['integrity_check']['WebserverGroupMemberForFcgidPhpFpm'] = 'Webserver-user in the customer groups (for FCGID/php-fpm)'; +$lng['admin']['specialsettings_replacements'] = "You can use the following variables:
{DOMAIN}, {DOCROOT}, {CUSTOMER}, {IP}, {PORT}, {SCHEME}
"; +$lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into this ip/port vHost container directly. '.$lng['admin']['specialsettings_replacements'].' Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!'; +$lng['serversettings']['default_vhostconf_domain']['description'] = 'The content of this field will be included into the domain vHost container directly. '.$lng['admin']['specialsettings_replacements'].' Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!'; + diff --git a/lng/german.lng.php b/lng/german.lng.php index 8cc303b2..47430913 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1570,9 +1570,11 @@ $lng['admin']['configfiles']['commands'] = 'Kommandos: $lng['admin']['configfiles']['files'] = 'Konfigurationsdateien: Dies ist der Inhalt einer Konfigurationsdatei. Der Befehl direkt vor dem Textfeld sollte einen Editor mit der Zeildatei รถffnen. Der Inhalt kann nun einfach kopiert und in den Editor eingefรผgt und die Datei gespeichert werden.

Beachten Sie: Das MySQL-Passwort wurde aus Sicherheitsgrรผnden nicht ersetzt. Bitte ersetzen Sie "MYSQL_PASSWORD" manuell durch das entsprechende Passwort. Falls Sie es vergessen haben sollten, finden Sie es in der Datei "lib/userdata.inc.php".'; $lng['serversettings']['apache_itksupport']['title'] = 'Anpassungen fรผr Apache ITK-MPM verwenden'; $lng['serversettings']['apache_itksupport']['description'] = '
Achtung: Bitte nur verwenden, wenn wirklich Apache itk-mpm verwendet wird, ansonsten wird der Webserver nicht starten.
'; - $lng['integrity_check']['DatabaseCharset'] = 'Characterset der Datenbank (sollte UTF-8 sein)'; $lng['integrity_check']['DomainIpTable'] = 'IP <‐> Domain Verknüpfung'; $lng['integrity_check']['SubdomainSslRedirect'] = 'Falsches SSL-redirect Flag bei nicht-ssl Domains'; $lng['integrity_check']['FroxlorLocalGroupMemberForFcgidPhpFpm'] = 'froxlor-Benutzer in Kunden Gruppen (für FCGID/php-fpm)'; $lng['integrity_check']['WebserverGroupMemberForFcgidPhpFpm'] = 'Webserver-Benutzer in Kunden Gruppen (für FCGID/php-fpm)'; +$lng['admin']['specialsettings_replacements'] = "Die folgenden Variablen kรถnnen verwendet werden:
{DOMAIN}, {DOCROOT}, {CUSTOMER}, {IP}, {PORT}, {SCHEME}
"; +$lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in den IP/Port-vHost-Container รผbernommen. '.$lng['admin']['specialsettings_replacements'].'
ACHTUNG: Der Code wird nicht auf Fehler geprรผft. Etwaige Fehler werden also auch รผbernommen. Der Webserver kรถnnte nicht mehr starten!'; +$lng['serversettings']['default_vhostconf_domain']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container รผbernommen. '. $lng['admin']['specialsettings_replacements'].'ACHTUNG: Der Code wird nicht auf Fehler geprรผft. Etwaige Fehler werden also auch รผbernommen. Der Webserver kรถnnte nicht mehr starten!'; diff --git a/scripts/classes/class.HttpConfigBase.php b/scripts/classes/class.HttpConfigBase.php new file mode 100644 index 00000000..071f43c1 --- /dev/null +++ b/scripts/classes/class.HttpConfigBase.php @@ -0,0 +1,38 @@ + $domain['domain'], + 'CUSTOMER' => $domain['loginname'], + 'IP' => $ip, + 'PORT' => $port, + 'SCHEME' => ($is_ssl_vhost)?'https':'http', + 'DOCROOT' => $domain['documentroot'] + ); + return replace_variables($template, $templateVars); + } + +} \ No newline at end of file diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index ce59690d..f615065b 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -17,7 +17,9 @@ * */ -class apache { +require_once(dirname(__FILE__).'/../classes/class.HttpConfigBase.php'); + +class apache extends HttpConfigBase { private $logger = false; private $debugHandler = false; private $idnaConvert = false; @@ -42,7 +44,6 @@ class apache { $this->logger = $logger; $this->debugHandler = $debugHandler; $this->idnaConvert = $idnaConvert; - } @@ -315,7 +316,12 @@ class apache { */ if ($row_ipsandports['specialsettings'] != '') { - $this->virtualhosts_data[$vhosts_filename] .= $row_ipsandports['specialsettings'] . "\n"; + $this->virtualhosts_data[$vhosts_filename] .= $this->processSpecialConfigTemplate( + $row_ipsandports['specialsettings'], + $domain, + $row_ipsandports['ip'], + $row_ipsandports['port'], + $row_ipsandports['ssl'] == '1') . "\n"; } if ($row_ipsandports['ssl'] == '1' && Settings::Get('system.use_ssl') == '1') { @@ -664,7 +670,6 @@ class apache { return $vhost_filename; } - /** * We compose the virtualhost entry for one domain */ @@ -719,7 +724,12 @@ class apache { } if ($ipandport['default_vhostconf_domain'] != '') { - $_vhost_content .= $ipandport['default_vhostconf_domain'] . "\n"; + $_vhost_content .= $this->processSpecialConfigTemplate( + $ipandport['default_vhostconf_domain'], + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost) . "\n"; } $ipportlist .= $ipport; } @@ -828,7 +838,12 @@ class apache { $vhost_content .= $this->getLogfiles($domain); if ($domain['specialsettings'] != '') { - $vhost_content .= $domain['specialsettings'] . "\n"; + $vhost_content .= $this->processSpecialConfigTemplate( + $domain['specialsettings'], + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost) . "\n"; } if ($_vhost_content != '') { @@ -836,7 +851,12 @@ class apache { } if (Settings::Get('system.default_vhostconf') != '') { - $vhost_content .= Settings::Get('system.default_vhostconf') . "\n"; + $vhost_content .= $this->processSpecialConfigTemplate( + Settings::Get('system.default_vhostconf'), + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost) . "\n"; } } diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index 787ee383..9d76b428 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -18,7 +18,9 @@ * @TODO ssl-redirect to non-standard port */ -class lighttpd { +require_once(dirname(__FILE__).'/../classes/class.HttpConfigBase.php'); + +class lighttpd extends HttpConfigBase { private $logger = false; private $debugHandler = false; private $idnaConvert = false; @@ -145,7 +147,13 @@ class lighttpd { } if ($row_ipsandports['specialsettings'] != '') { - $this->lighttpd_data[$vhost_filename].= $row_ipsandports['specialsettings'] . "\n"; + $this->lighttpd_data[$vhost_filename].= $this->processSpecialConfigTemplate( + $row_ipsandports['specialsettings'], + $domain, + $row_ipsandports['ip'], + $row_ipsandports['port'], + $row_ipsandports['ssl'] == '1' + ). "\n"; } $this->lighttpd_data[$vhost_filename].= '}' . "\n"; @@ -453,15 +461,30 @@ class lighttpd { $vhost_content.= $this->getSslSettings($domain, $ssl_vhost); if ($domain['specialsettings'] != "") { - $vhost_content.= $domain['specialsettings'] . "\n"; + $vhost_content.= $this->processSpecialConfigTemplate( + $domain['specialsettings'], + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost). "\n"; } if ($ipandport['default_vhostconf_domain'] != '') { - $vhost_content.= $ipandport['default_vhostconf_domain'] . "\n"; + $vhost_content.= $this->processSpecialConfigTemplate( + $ipandport['default_vhostconf_domain'], + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost) . "\n"; } if (Settings::Get('system.default_vhostconf') != '') { - $vhost_content.= Settings::Get('system.default_vhostconf') . "\n"; + $vhost_content.= $this->processSpecialConfigTemplate( + Settings::Get('system.default_vhostconf'), + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost). "\n"; } } $vhost_content.= $this->getLogFiles($domain); diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index 012c7abf..fafcefa3 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -15,7 +15,9 @@ * */ -class nginx { +require_once(dirname(__FILE__).'/../classes/class.HttpConfigBase.php'); + +class nginx extends HttpConfigBase { private $logger = false; private $debugHandler = false; private $idnaConvert = false; @@ -187,7 +189,14 @@ class nginx { $this->nginx_data[$vhost_filename] .= "\t".'}'."\n"; if ($row_ipsandports['specialsettings'] != '') { - $this->nginx_data[$vhost_filename].= $row_ipsandports['specialsettings'] . "\n"; + $this->nginx_data[$vhost_filename].= $this->processSpecialConfigTemplate( + $row_ipsandports['specialsettings'], + array('domain'=> Settings::Get('system.hostname'), + 'loginname' => Settings::Get('phpfpm.vhost_httpuser'), + 'documentroot'=> $mypath), + $row_ipsandports['ip'], + $row_ipsandports['port'], + $row_ipsandports['ssl'] == '1'). "\n"; } /** @@ -365,7 +374,12 @@ class nginx { } if ($ipandport['default_vhostconf_domain'] != '') { - $_vhost_content .= $ipandport['default_vhostconf_domain'] . "\n"; + $_vhost_content .= $this->processSpecialConfigTemplate( + $ipandport['default_vhostconf_domain'], + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost). "\n"; } $vhost_content.= "\t" . 'listen ' . $ipport . ($ssl_vhost == true ? ' ssl' : '') . ';' . "\n"; @@ -427,7 +441,13 @@ class nginx { $vhost_content.= isset($this->needed_htpasswds[$domain['id']]) ? $this->needed_htpasswds[$domain['id']] . "\n" : ''; if ($domain['specialsettings'] != "") { - $vhost_content = $this->mergeVhostCustom($vhost_content, $domain['specialsettings']); + $vhost_content = $this->mergeVhostCustom($vhost_content, $this->processSpecialConfigTemplate( + $domain['specialsettings'], + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost + )); } if ($_vhost_content != '') { @@ -435,7 +455,13 @@ class nginx { } if (Settings::Get('system.default_vhostconf') != '') { - $vhost_content = $this->mergeVhostCustom($vhost_content, Settings::Get('system.default_vhostconf')."\n"); + $vhost_content = $this->mergeVhostCustom($vhost_content, + $this->processSpecialConfigTemplate( + Settings::Get('system.default_vhostconf'), + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost)."\n"); } } } From 6abe0bdaec05e2e7e8acf6e3abccc96d5b749523 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 31 Jul 2015 13:20:31 +0200 Subject: [PATCH 22/34] allow customization of umask in php-fcgi-starter scripts, refs #1486 Signed-off-by: Michael Kaufmann (d00p) --- admin_phpsettings.php | 8 ++++++++ install/froxlor.sql | 3 ++- install/updates/froxlor/0.9/update_0.9.inc.php | 12 ++++++++++++ .../phpinterface/class.phpinterface_fcgid.php | 2 +- lib/version.inc.php | 2 +- lng/english.lng.php | 2 +- lng/german.lng.php | 1 + 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/admin_phpsettings.php b/admin_phpsettings.php index 5f10145c..4f7f9824 100644 --- a/admin_phpsettings.php +++ b/admin_phpsettings.php @@ -115,6 +115,7 @@ if ($page == 'overview') { $file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/'); $mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', '')); $mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', '')); + $mod_fcgid_umask = validate($_POST['mod_fcgid_umask'], 'mod_fcgid_umask', '/^[0-9]*$/'); // disable fpm stuff $fpm_enableslowlog = 0; $fpm_reqtermtimeout = 0; @@ -129,6 +130,7 @@ if ($page == 'overview') { $file_extensions = 'php'; $mod_fcgid_starter = 0; $mod_fcgid_maxrequests = 0; + $mod_fcgid_umask = "022"; } if (strlen($description) == 0 @@ -144,6 +146,7 @@ if ($page == 'overview') { `file_extensions` = :fext, `mod_fcgid_starter` = :starter, `mod_fcgid_maxrequests` = :mreq, + `mod_fcgid_umask` = :umask, `fpm_slowlog` = :fpmslow, `fpm_reqterm` = :fpmreqterm, `fpm_reqslow` = :fpmreqslow, @@ -155,6 +158,7 @@ if ($page == 'overview') { 'fext' => $file_extensions, 'starter' => $mod_fcgid_starter, 'mreq' => $mod_fcgid_maxrequests, + 'umask' => $mod_fcgid_umask, 'fpmslow' => $fpm_enableslowlog, 'fpmreqterm' => $fpm_reqtermtimeout, 'fpmreqslow' => $fpm_reqslowtimeout, @@ -265,6 +269,7 @@ if ($page == 'overview') { $file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/'); $mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', '')); $mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', '')); + $mod_fcgid_umask = validate($_POST['mod_fcgid_umask'], 'mod_fcgid_umask', '/^[0-9]*$/'); // disable fpm stuff $fpm_enableslowlog = 0; $fpm_reqtermtimeout = 0; @@ -279,6 +284,7 @@ if ($page == 'overview') { $file_extensions = 'php'; $mod_fcgid_starter = 0; $mod_fcgid_maxrequests = 0; + $mod_fcgid_umask = "022"; } if (strlen($description) == 0 @@ -294,6 +300,7 @@ if ($page == 'overview') { `file_extensions` = :fext, `mod_fcgid_starter` = :starter, `mod_fcgid_maxrequests` = :mreq, + `mod_fcgid_umask` = :umask, `fpm_slowlog` = :fpmslow, `fpm_reqterm` = :fpmreqterm, `fpm_reqslow` = :fpmreqslow, @@ -306,6 +313,7 @@ if ($page == 'overview') { 'fext' => $file_extensions, 'starter' => $mod_fcgid_starter, 'mreq' => $mod_fcgid_maxrequests, + 'umask' => $mod_fcgid_umask, 'fpmslow' => $fpm_enableslowlog, 'fpmreqterm' => $fpm_reqtermtimeout, 'fpmreqslow' => $fpm_reqslowtimeout, diff --git a/install/froxlor.sql b/install/froxlor.sql index bbbb2b81..5ea4c9fd 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -539,7 +539,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'password_numeric', '0'), ('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char', '!?<>ยง$%+#=@'), - ('panel', 'version', '0.9.34-dev3'); + ('panel', 'version', '0.9.34-dev4'); DROP TABLE IF EXISTS `panel_tasks`; @@ -713,6 +713,7 @@ CREATE TABLE `panel_phpconfigs` ( `file_extensions` varchar(255) NOT NULL, `mod_fcgid_starter` int(4) NOT NULL DEFAULT '-1', `mod_fcgid_maxrequests` int(4) NOT NULL DEFAULT '-1', + `mod_fcgid_umask` varchar(15) NOT NULL DEFAULT '022', `fpm_slowlog` tinyint(1) NOT NULL default '0', `fpm_reqterm` varchar(15) NOT NULL default '60s', `fpm_reqslow` varchar(15) NOT NULL default '5s', diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 67ea8d38..a59083ef 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2984,3 +2984,15 @@ if (isFroxlorVersion('0.9.34-dev2')) { updateToVersion('0.9.34-dev3'); } } + + +if (isFroxlorVersion('0.9.34-dev3')) { + + showUpdateStep("Updating from 0.9.34-dev3 to 0.9.34-dev4", false); + + showUpdateStep("Adding field umask to phpconfig table"); + Database::query("ALTER TABLE `".TABLE_PANEL_PHPCONFIGS."` ADD `mod_fcgid_umask` varchar(15) NOT NULL DEFAULT '022' AFTER `mod_fcgid_maxrequests`"); + lastStepStatus(0); + + updateToVersion('0.9.34-dev4'); +} diff --git a/lib/classes/phpinterface/class.phpinterface_fcgid.php b/lib/classes/phpinterface/class.phpinterface_fcgid.php index b20ebbe5..9f8192ba 100644 --- a/lib/classes/phpinterface/class.phpinterface_fcgid.php +++ b/lib/classes/phpinterface/class.phpinterface_fcgid.php @@ -52,7 +52,7 @@ class phpinterface_fcgid { $starter_file.= "# starter created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $this->_domain['domain'] . "' with id #" . $this->_domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n"; $starter_file.= "# Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n"; $starter_file.= "#\n\n"; - $starter_file.= "umask 022\n"; + $starter_file.= "umask ".$phpconfig['mod_fcgid_umask']."\n"; $starter_file.= "PHPRC=" . escapeshellarg($this->getConfigDir()) . "\n"; $starter_file.= "export PHPRC\n"; diff --git a/lib/version.inc.php b/lib/version.inc.php index a11fa0fc..c40eb019 100644 --- a/lib/version.inc.php +++ b/lib/version.inc.php @@ -16,7 +16,7 @@ */ // Main version variable -$version = '0.9.34-dev3'; +$version = '0.9.34-dev4'; // Database version (unused, old stuff from SysCP) $dbversion = '2'; diff --git a/lng/english.lng.php b/lng/english.lng.php index d0366dae..d2f4bbe8 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1851,4 +1851,4 @@ $lng['integrity_check']['WebserverGroupMemberForFcgidPhpFpm'] = 'Webserver-user $lng['admin']['specialsettings_replacements'] = "You can use the following variables:
{DOMAIN}, {DOCROOT}, {CUSTOMER}, {IP}, {PORT}, {SCHEME}
"; $lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into this ip/port vHost container directly. '.$lng['admin']['specialsettings_replacements'].' Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!'; $lng['serversettings']['default_vhostconf_domain']['description'] = 'The content of this field will be included into the domain vHost container directly. '.$lng['admin']['specialsettings_replacements'].' Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!'; - +$lng['admin']['mod_fcgid_umask']['title'] = 'Umask (default: 022)'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 47430913..5f236deb 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1578,3 +1578,4 @@ $lng['integrity_check']['WebserverGroupMemberForFcgidPhpFpm'] = 'Webserver-Benut $lng['admin']['specialsettings_replacements'] = "Die folgenden Variablen kรถnnen verwendet werden:
{DOMAIN}, {DOCROOT}, {CUSTOMER}, {IP}, {PORT}, {SCHEME}
"; $lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in den IP/Port-vHost-Container รผbernommen. '.$lng['admin']['specialsettings_replacements'].'
ACHTUNG: Der Code wird nicht auf Fehler geprรผft. Etwaige Fehler werden also auch รผbernommen. Der Webserver kรถnnte nicht mehr starten!'; $lng['serversettings']['default_vhostconf_domain']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container รผbernommen. '. $lng['admin']['specialsettings_replacements'].'ACHTUNG: Der Code wird nicht auf Fehler geprรผft. Etwaige Fehler werden also auch รผbernommen. Der Webserver kรถnnte nicht mehr starten!'; +$lng['admin']['mod_fcgid_umask']['title'] = 'Umask (Standard: 022)'; From e1b80b513dbfd62948b6981adbdff9a7c7b48d80 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 31 Jul 2015 13:22:23 +0200 Subject: [PATCH 23/34] add umask form-field, fixes #1486 (0_9_34) Signed-off-by: Michael Kaufmann (d00p) --- lib/formfields/admin/phpconfig/formfield.phpconfig_add.php | 7 +++++++ .../admin/phpconfig/formfield.phpconfig_edit.php | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php b/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php index bbad9529..3bcc4922 100644 --- a/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php +++ b/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php @@ -54,6 +54,13 @@ return array( 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], 'type' => 'text' ), + 'mod_fcgid_umask' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['mod_fcgid_umask']['title'], + 'type' => 'text', + 'maxlength' => 3, + 'value' => '022' + ), 'phpfpm_enable_slowlog' => array( 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), 'label' => $lng['admin']['phpsettings']['enable_slowlog'], diff --git a/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php b/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php index 83dbbd44..d3a9828f 100644 --- a/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php +++ b/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php @@ -57,6 +57,13 @@ return array( 'type' => 'text', 'value' => ((int)$result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '') ), + 'mod_fcgid_umask' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['mod_fcgid_umask']['title'], + 'type' => 'text', + 'maxlength' => 3, + 'value' => $result['mod_fcgid_umask'] + ), 'phpfpm_enable_slowlog' => array( 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), 'label' => $lng['admin']['phpsettings']['enable_slowlog'], From 161e11a8dd002c5f0d72ab1b61d5e8e3000e9482 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 3 Aug 2015 17:46:29 +0200 Subject: [PATCH 24/34] fix subdir-value if homeDir == dirToCreate in mkDirWithCorrectOwnership(), fixes pr #246 Signed-off-by: Michael Kaufmann (d00p) --- lib/functions/filedir/function.mkDirWithCorrectOwnership.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/filedir/function.mkDirWithCorrectOwnership.php b/lib/functions/filedir/function.mkDirWithCorrectOwnership.php index 4acc30fd..97e739ba 100644 --- a/lib/functions/filedir/function.mkDirWithCorrectOwnership.php +++ b/lib/functions/filedir/function.mkDirWithCorrectOwnership.php @@ -47,7 +47,7 @@ function mkDirWithCorrectOwnership($homeDir, $dirToCreate, $uid, $gid, $placeind if(substr($dirToCreate, 0, strlen($homeDir)) == $homeDir) { - $subdir = substr($dirToCreate, strlen($homeDir)); + $subdir = substr($dirToCreate, strlen($homeDir) - 1); $within_homedir = true; } else From ab9b92112d37eedee85d5b04bb92c4d83aeb424e Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 13 Aug 2015 15:37:34 +0200 Subject: [PATCH 25/34] instead of env-variable, show ditro editor which is defined in the xml Signed-off-by: Michael Kaufmann (d00p) --- admin_configfiles.php | 2 ++ lib/classes/config/class.ConfigParser.php | 7 +++++++ lib/configfiles/gentoo.xml | 2 +- lib/configfiles/jessie.xml | 2 +- lib/configfiles/precise.xml | 2 +- lib/configfiles/rhel_centos.xml | 2 +- lib/configfiles/trusty.xml | 2 +- lib/configfiles/wheezy.xml | 2 +- lib/functions/validate/function.validatePasswordLogin.php | 7 +++++-- templates/Sparkle/admin/configfiles/configfiles_file.tpl | 2 +- 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/admin_configfiles.php b/admin_configfiles.php index 222f96cc..b1a13deb 100644 --- a/admin_configfiles.php +++ b/admin_configfiles.php @@ -115,6 +115,8 @@ if ($userinfo['change_serversettings'] == '1') { $configpage = ''; + $distro_editor = $configfiles->distributionEditor; + $commands_pre = ""; $commands_file = ""; $commands_post = ""; diff --git a/lib/classes/config/class.ConfigParser.php b/lib/classes/config/class.ConfigParser.php index 94d7fdf5..a294d56e 100644 --- a/lib/classes/config/class.ConfigParser.php +++ b/lib/classes/config/class.ConfigParser.php @@ -65,6 +65,12 @@ class ConfigParser { */ public $distributionVersion = ''; + /** + * Recommended editor + * @var string + */ + public $distributionEditor = '/bin/nano'; + /** * Show if this configuration is deprecated * @var bool @@ -106,6 +112,7 @@ class ConfigParser { case "name": $this->distributionName = (string)$value; break; case "version": $this->distributionVersion = (string)$value; break; case "codename": $this->distributionCodename = (string)$value; break; + case "defaulteditor": $this->distributionEditor = (string)$value; break; case "deprecated": (string)$value == 'true' ? $this->deprecated = true : $this->deprecated = false; break; } } diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index 908cb9ea..a3f0ca73 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -1,6 +1,6 @@ - + diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml index 41151e00..035583ae 100644 --- a/lib/configfiles/jessie.xml +++ b/lib/configfiles/jessie.xml @@ -1,6 +1,6 @@ - + diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml index 6eb0063f..adac5219 100644 --- a/lib/configfiles/precise.xml +++ b/lib/configfiles/precise.xml @@ -1,6 +1,6 @@ - + diff --git a/lib/configfiles/rhel_centos.xml b/lib/configfiles/rhel_centos.xml index b749d4dd..0703c781 100644 --- a/lib/configfiles/rhel_centos.xml +++ b/lib/configfiles/rhel_centos.xml @@ -1,6 +1,6 @@ - + diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml index 43daf1f2..efde5809 100644 --- a/lib/configfiles/trusty.xml +++ b/lib/configfiles/trusty.xml @@ -1,6 +1,6 @@ - + diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml index 893eedfd..05bd9ea4 100644 --- a/lib/configfiles/wheezy.xml +++ b/lib/configfiles/wheezy.xml @@ -1,6 +1,6 @@ - + diff --git a/lib/functions/validate/function.validatePasswordLogin.php b/lib/functions/validate/function.validatePasswordLogin.php index 599809ae..275d2bfb 100644 --- a/lib/functions/validate/function.validatePasswordLogin.php +++ b/lib/functions/validate/function.validatePasswordLogin.php @@ -32,6 +32,8 @@ */ function validatePasswordLogin($userinfo = null, $password = null, $table = 'panel_customers', $uid = 'customerid') { + global $version; + $systype = 3; // SHA256 if (Settings::Get('system.passwordcryptfunc') !== null) { $systype = (int)Settings::Get('system.passwordcryptfunc'); @@ -62,8 +64,9 @@ function validatePasswordLogin($userinfo = null, $password = null, $table = 'pan if ($pwd_hash == $pwd_check) { - // check for update of hash - if ($update_hash) { + // check for update of hash (only if our database is ready to handle the bigger string) + $is_ready = (version_compare2("0.9.33", $version) <= 0 ? true : false); + if ($update_hash && $is_ready) { $upd_stmt = Database::prepare(" UPDATE " . $table . " SET `password` = :newpasswd WHERE `" . $uid . "` = :uid "); diff --git a/templates/Sparkle/admin/configfiles/configfiles_file.tpl b/templates/Sparkle/admin/configfiles/configfiles_file.tpl index b627796f..57507d24 100644 --- a/templates/Sparkle/admin/configfiles/configfiles_file.tpl +++ b/templates/Sparkle/admin/configfiles/configfiles_file.tpl @@ -1,4 +1,4 @@
- +
From 8a17a90b1ad10da71e84c9f354cb92eff1337f23 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 13 Aug 2015 15:45:53 +0200 Subject: [PATCH 26/34] forgot to use the new distro-editor variable Signed-off-by: Michael Kaufmann (d00p) --- admin_configfiles.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin_configfiles.php b/admin_configfiles.php index b1a13deb..9e4edceb 100644 --- a/admin_configfiles.php +++ b/admin_configfiles.php @@ -142,7 +142,7 @@ if ($userinfo['change_serversettings'] == '1') { break; case "file": if (array_key_exists('content', $action)) { - $commands_file = getFileContentContainer($action['content'], $replace_arr, $action['name']); + $commands_file = getFileContentContainer($action['content'], $replace_arr, $action['name'], $distro_editor); } elseif (array_key_exists('subcommands', $action)) { foreach ($action['subcommands'] as $fileaction) { if (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "pre") { @@ -150,7 +150,7 @@ if ($userinfo['change_serversettings'] == '1') { } elseif (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "post") { $commands_post .= $fileaction['content'] . "\n"; } elseif ($fileaction['type'] == 'file') { - $commands_file = getFileContentContainer($fileaction['content'], $replace_arr, $action['name']); + $commands_file = getFileContentContainer($fileaction['content'], $replace_arr, $action['name'], $distro_editor); } } } @@ -187,7 +187,7 @@ if ($userinfo['change_serversettings'] == '1') { } // helper functions -function getFileContentContainer($file_content, &$replace_arr, $realname) +function getFileContentContainer($file_content, &$replace_arr, $realname, $distro_editor) { $files = ""; $file_content = trim($file_content); From edd60d3331e657274f84f2f10664c518e6e8e205 Mon Sep 17 00:00:00 2001 From: Frank Gehann Date: Sun, 16 Aug 2015 15:45:48 +0200 Subject: [PATCH 27/34] Fixed composeSslSettings which used variables not available in the function scope. --- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index fafcefa3..6e6e449f 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -536,58 +536,58 @@ class nginx extends HttpConfigBase { return implode("\n", $vhost_frx); } - protected function composeSslSettings($domain) { + protected function composeSslSettings($domain_or_ip) { $sslsettings = ''; - if ($domain['ssl_cert_file'] == '') { - $domain['ssl_cert_file'] = Settings::Get('system.ssl_cert_file'); + if ($domain_or_ip['ssl_cert_file'] == '') { + $domain_or_ip['ssl_cert_file'] = Settings::Get('system.ssl_cert_file'); } - if ($domain['ssl_key_file'] == '') { - $domain['ssl_key_file'] = Settings::Get('system.ssl_key_file'); + if ($domain_or_ip['ssl_key_file'] == '') { + $domain_or_ip['ssl_key_file'] = Settings::Get('system.ssl_key_file'); } - if ($domain['ssl_ca_file'] == '') { - $domain['ssl_ca_file'] = Settings::Get('system.ssl_ca_file'); + if ($domain_or_ip['ssl_ca_file'] == '') { + $domain_or_ip['ssl_ca_file'] = Settings::Get('system.ssl_ca_file'); } // #418 - if ($domain['ssl_cert_chainfile'] == '') { - $domain['ssl_cert_chainfile'] = Settings::Get('system.ssl_cert_chainfile'); + if ($domain_or_ip['ssl_cert_chainfile'] == '') { + $domain_or_ip['ssl_cert_chainfile'] = Settings::Get('system.ssl_cert_chainfile'); } - if ($domain['ssl_cert_file'] != '') { + if ($domain_or_ip['ssl_cert_file'] != '') { // check for existence, #1485 - if (!file_exists($domain['ssl_cert_file'])) { - $this->logger->logAction(CRON_ACTION, LOG_ERROR, $domain['domain'] . ' :: certificate file "'.$domain['ssl_cert_file'].'" does not exist! Cannot create ssl-directives'); - echo $domain['domain'] . ' :: certificate file "'.$domain['ssl_cert_file'].'" does not exist! Cannot create SSL-directives'."\n"; + if (!file_exists($domain_or_ip['ssl_cert_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $domain_or_ip['domain'] . ' :: certificate file "'.$domain_or_ip['ssl_cert_file'].'" does not exist! Cannot create ssl-directives'); + echo $domain_or_ip['domain'] . ' :: certificate file "'.$domain_or_ip['ssl_cert_file'].'" does not exist! Cannot create SSL-directives'."\n"; } else { // obsolete: ssl on now belongs to the listen block as 'ssl' at the end //$sslsettings .= "\t" . 'ssl on;' . "\n"; $sslsettings .= "\t" . 'ssl_protocols TLSv1 TLSv1.1 TLSv1.2;' . "\n"; $sslsettings .= "\t" . 'ssl_ciphers ' . Settings::Get('system.ssl_cipher_list') . ';' . "\n"; $sslsettings .= "\t" . 'ssl_prefer_server_ciphers on;' . "\n"; - $sslsettings .= "\t" . 'ssl_certificate ' . makeCorrectFile($domain['ssl_cert_file']) . ';' . "\n"; + $sslsettings .= "\t" . 'ssl_certificate ' . makeCorrectFile($domain_or_ip['ssl_cert_file']) . ';' . "\n"; - if ($domain['ssl_key_file'] != '') { + if ($domain_or_ip['ssl_key_file'] != '') { // check for existence, #1485 - if (!file_exists($row_ipsandports['ssl_key_file'])) { - $this->logger->logAction(CRON_ACTION, LOG_ERROR, $ipport . ' :: certificate key file "'.$domain['ssl_key_file'].'" does not exist! Cannot create ssl-directives'); - echo $ipport . ' :: certificate key file "'.$domain['ssl_key_file'].'" does not exist! SSL-directives might not be working'."\n"; + if (!file_exists($domain_or_ip['ssl_key_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $domain_or_ip['domain'] . ' :: certificate key file "'.$domain_or_ip['ssl_key_file'].'" does not exist! Cannot create ssl-directives'); + echo $domain_or_ip['domain'] . ' :: certificate key file "'.$domain_or_ip['ssl_key_file'].'" does not exist! SSL-directives might not be working'."\n"; } else { - $sslsettings .= "\t" . 'ssl_certificate_key ' .makeCorrectFile($domain['ssl_key_file']) . ';' . "\n"; + $sslsettings .= "\t" . 'ssl_certificate_key ' .makeCorrectFile($domain_or_ip['ssl_key_file']) . ';' . "\n"; } } - if ($domain['ssl_ca_file'] != '') { + if ($domain_or_ip['ssl_ca_file'] != '') { // check for existence, #1485 - if (!file_exists($row_ipsandports['ssl_ca_file'])) { - $this->logger->logAction(CRON_ACTION, LOG_ERROR, $domain['domain'] . ' :: certificate CA file "'.$domain['ssl_ca_file'].'" does not exist! Cannot create ssl-directives'); - echo $domain['domain'] . ' :: certificate CA file "'.$domain['ssl_ca_file'].'" does not exist! SSL-directives might not be working'."\n"; + if (!file_exists($domain_or_ip['ssl_ca_file'])) { + $this->logger->logAction(CRON_ACTION, LOG_ERROR, $domain_or_ip['domain'] . ' :: certificate CA file "'.$domain_or_ip['ssl_ca_file'].'" does not exist! Cannot create ssl-directives'); + echo $domain_or_ip['domain'] . ' :: certificate CA file "'.$domain_or_ip['ssl_ca_file'].'" does not exist! SSL-directives might not be working'."\n"; } else { - $sslsettings.= "\t" . 'ssl_client_certificate ' . makeCorrectFile($domain['ssl_ca_file']) . ';' . "\n"; + $sslsettings.= "\t" . 'ssl_client_certificate ' . makeCorrectFile($domain_or_ip['ssl_ca_file']) . ';' . "\n"; } } } From a6473695eb7b468a993a3156511826a9fb70c4e3 Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Wed, 19 Aug 2015 07:06:52 +0200 Subject: [PATCH 28/34] Fixed width of email inputs Signed-off-by: Roman Schmerold (BNoiZe) --- templates/Sparkle/assets/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 3572962c..df84f80d 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -587,7 +587,7 @@ textarea { border-radius:3px; } -input[type="text"],input[type="password"] { +input[type="text"],input[type="password"],input[type="text"] { width:400px; margin-top: 5px; } From 62559dd2b48cfbcb7346322828cd1874eab46899 Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Wed, 19 Aug 2015 07:16:05 +0200 Subject: [PATCH 29/34] Fixed undefined error in admin_customers.php Signed-off-by: Roman Schmerold (BNoiZe) --- templates/Sparkle/assets/css/main.css | 2 +- templates/Sparkle/assets/js/main.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index df84f80d..8e58b082 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -573,7 +573,7 @@ input { border-radius:3px; } -input[disabled] { +input[disabled], input[readonly] { cursor: not-allowed; background-color: #eee; } diff --git a/templates/Sparkle/assets/js/main.js b/templates/Sparkle/assets/js/main.js index 7bc896e9..4667924f 100644 --- a/templates/Sparkle/assets/js/main.js +++ b/templates/Sparkle/assets/js/main.js @@ -53,13 +53,13 @@ $(document).ready(function() { $("input[name$='_ul']").each(function() { var fieldname = $(this).attr("name").substring(0, $(this).attr("name").length - 3); $("input[name='" + fieldname + "']").prop({ - disabled: $(this).is(":checked") + readonly: $(this).is(":checked") }); }); $("input[name$='_ul']").change(function() { var fieldname = $(this).attr("name").substring(0, $(this).attr("name").length - 3); $("input[name='" + fieldname + "']").prop({ - disabled: $(this).is(":checked") + readonly: $(this).is(":checked") }).focus(); }); // Enable autoselect in configfules From 95035afe3800a36c1d13f90af795eab971584d58 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 20 Aug 2015 20:49:56 +0200 Subject: [PATCH 30/34] comment out unexisting group 'Debian-exim' when exim is not installed Signed-off-by: Michael Kaufmann (d00p) --- lib/configfiles/jessie.xml | 2 +- lib/configfiles/wheezy.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml index 035583ae..cdd84ddf 100644 --- a/lib/configfiles/jessie.xml +++ b/lib/configfiles/jessie.xml @@ -2779,7 +2779,7 @@ service auth { unix_listener auth-client { mode = 0660 user = mail - group = Debian-exim + # group = Debian-exim } # Auth process is run as this user. diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml index 05bd9ea4..10e4daba 100644 --- a/lib/configfiles/wheezy.xml +++ b/lib/configfiles/wheezy.xml @@ -3904,7 +3904,7 @@ service auth { unix_listener auth-client { mode = 0660 user = mail - group = Debian-exim + # group = Debian-exim } # Auth process is run as this user. From 9d40e0903b8d18d8b3f863ece5e202a4504312d1 Mon Sep 17 00:00:00 2001 From: Piotr Rzeczkowski Date: Mon, 24 Aug 2015 12:17:33 +0200 Subject: [PATCH 31/34] Allow max_input_vars in PHP-FPM configuration --- lib/classes/phpinterface/class.phpinterface_fpm.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/classes/phpinterface/class.phpinterface_fpm.php b/lib/classes/phpinterface/class.phpinterface_fpm.php index 12a976e2..5a09ea32 100644 --- a/lib/classes/phpinterface/class.phpinterface_fpm.php +++ b/lib/classes/phpinterface/class.phpinterface_fpm.php @@ -83,6 +83,7 @@ class phpinterface_fpm { 'error_log', 'gpc_order', 'max_input_time', + 'max_input_vars', 'memory_limit', 'open_basedir', 'output_buffering', From 7939187916f0168e43d735ca29520b97a959a059 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 4 Sep 2015 10:56:20 +0200 Subject: [PATCH 32/34] remove old/unused config-template-files (replaced by XML) Signed-off-by: Michael Kaufmann (d00p) --- lib/configfiles/freebsd.inc.php | 429 ---------- lib/configfiles/lucid.inc.php | 419 ---------- lib/configfiles/sle10.inc.php | 188 ----- lib/configfiles/sle11.inc.php | 267 ------- lib/configfiles/squeeze.inc.php | 418 ---------- lib/configfiles_index.inc.php | 58 -- .../etc_apache2_mods-enabled_fastcgi.conf | 10 - .../courier/etc_courier_authdaemonrc | 68 -- .../courier/etc_courier_authmysqlrc | 14 - .../debian_squeeze/cron/etc_cron.d_froxlor | 10 - .../debian_squeeze/dkim/dkim-filter.conf | 11 - .../dovecot/etc_dovecot_dovecot-sql.conf | 5 - .../dovecot/etc_dovecot_dovecot.conf | 87 --- ..._conf.d_acl_30_exim4-config_check_rcpt.rul | 125 --- .../etc_exim4_conf.d_auth_30_froxlor-config | 30 - ...xim4_conf.d_main_10_froxlor-config_options | 20 - ...etc_exim4_conf.d_router_180_froxlor-config | 13 - ...c_exim4_conf.d_transport_30_froxlor-config | 13 - .../libnss/etc_nss-mysql-root.conf | 16 - .../debian_squeeze/libnss/etc_nss-mysql.conf | 24 - .../debian_squeeze/libnss/etc_nsswitch.conf | 20 - .../debian_squeeze/lighttpd/etc_lighttpd.conf | 57 -- .../logrotate/etc_logrotated_froxlor | 16 - .../debian_squeeze/nginx/etc_init.d_php-fcgi | 41 - .../nginx/etc_nginx_fastcgi.conf | 15 - .../debian_squeeze/nginx/etc_nginx_nginx.conf | 25 - .../postfix_courier/etc_postfix_main.cf | 85 -- .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../etc_postfix_sasl_smtpd.conf | 11 - .../postfix_dovecot/etc_postfix_main.cf | 91 --- .../postfix_dovecot/etc_postfix_master.cf | 4 - .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../postfix_mxaccess/etc_postfix_main.cf | 25 - .../postfix_mxaccess/etc_postfix_mx_access | 9 - .../powerdns/etc_powerdns_pdns-froxlor.conf | 7 - .../powerdns/etc_powerdns_pdns.conf | 17 - .../proftpd/etc_proftpd_modules.conf | 58 -- .../proftpd/etc_proftpd_proftpd.conf | 131 ---- .../proftpd/etc_proftpd_sql.conf | 37 - .../pure-ftpd/etc_default_pure-ftpd-common | 5 - .../pure-ftpd/etc_pure-ftpd_conf_Bind | 1 - .../etc_pure-ftpd_conf_ChrootEveryone | 1 - .../etc_pure-ftpd_conf_CustomerProof | 1 - .../pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime | 1 - .../pure-ftpd/etc_pure-ftpd_conf_MinUID | 1 - .../etc_pure-ftpd_conf_MySQLConfigFile | 1 - .../pure-ftpd/etc_pure-ftpd_conf_NoAnonymous | 1 - .../etc_pure-ftpd_conf_PAMAuthentication | 1 - .../pure-ftpd/etc_pure-ftpd_db_mysql.conf | 11 - .../etc_apache2_mods-enabled_fastcgi.conf | 10 - .../courier/etc_courier_authdaemonrc | 103 --- .../courier/etc_courier_authmysqlrc | 288 ------- .../debian_wheezy/cron/etc_cron.d_froxlor | 10 - .../debian_wheezy/dkim/opendkim.conf | 36 - .../dovecot/etc_dovecot_conf.d_10-auth.conf | 127 --- .../dovecot/etc_dovecot_conf.d_10-mail.conf | 362 --------- .../dovecot/etc_dovecot_conf.d_10-master.conf | 126 --- .../dovecot/etc_dovecot_conf.d_15-lda.conf | 48 -- .../dovecot/etc_dovecot_conf.d_20-imap.conf | 58 -- .../etc_dovecot_conf.d_20-managesieve.conf | 73 -- .../dovecot/etc_dovecot_conf.d_20-pop3.conf | 91 --- .../dovecot/etc_dovecot_conf.d_90-sieve.conf | 104 --- .../etc_dovecot_conf.d_auth-sql.conf.ext | 30 - .../dovecot/etc_dovecot_dovecot-sql.conf.ext | 138 ---- .../dovecot/etc_dovecot_dovecot.conf | 98 --- ...xim4_conf.d_acl_30_exim4-config_check_rcpt | 358 --------- .../etc_exim4_conf.d_auth_30_froxlor-config | 44 -- ...xim4_conf.d_main_10_froxlor-config_options | 20 - ...etc_exim4_conf.d_router_180_froxlor-config | 13 - ...c_exim4_conf.d_transport_30_froxlor-config | 13 - .../libnss/etc_libnss-mysql-root.cfg | 2 - .../debian_wheezy/libnss/etc_libnss-mysql.cfg | 41 - .../debian_wheezy/libnss/etc_nsswitch.conf | 20 - .../debian_wheezy/lighttpd/etc_lighttpd.conf | 28 - .../logrotate/etc_logrotated_froxlor | 16 - .../debian_wheezy/nginx/etc_init.d_php-fcgi | 41 - .../debian_wheezy/nginx/etc_nginx_nginx.conf | 95 --- .../debian_wheezy/postfix_courier/etc_aliases | 16 - .../postfix_courier/etc_postfix_main.cf | 732 ----------------- .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../etc_postfix_sasl_smtpd.conf | 11 - .../debian_wheezy/postfix_dovecot/etc_aliases | 16 - .../postfix_dovecot/etc_postfix_main.cf | 737 ------------------ .../postfix_dovecot/etc_postfix_master.cf | 115 --- .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../postfix_mxaccess/etc_postfix_main.cf | 25 - .../postfix_mxaccess/etc_postfix_mx_access | 9 - .../powerdns/etc_powerdns_bindbackend.conf | 12 - .../powerdns/etc_powerdns_pdns.conf | 314 -------- .../proftpd/etc_proftpd_modules.conf | 96 --- .../proftpd/etc_proftpd_proftpd.conf | 189 ----- .../proftpd/etc_proftpd_sql.conf | 37 - .../pure-ftpd/etc_default_pure-ftpd-common | 26 - .../pure-ftpd/etc_pure-ftpd_conf_Bind | 1 - .../etc_pure-ftpd_conf_ChrootEveryone | 1 - .../etc_pure-ftpd_conf_CustomerProof | 1 - .../pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime | 1 - .../pure-ftpd/etc_pure-ftpd_conf_MinUID | 1 - .../etc_pure-ftpd_conf_MySQLConfigFile | 1 - .../pure-ftpd/etc_pure-ftpd_conf_NoAnonymous | 1 - .../etc_pure-ftpd_conf_PAMAuthentication | 1 - .../pure-ftpd/etc_pure-ftpd_db_mysql.conf | 129 --- .../freebsd/bind9/etc_namedb_default-zone | 4 - .../bind9/etc_namedb_master_default.zone | 45 -- .../freebsd/bind9/etc_namedb_named.conf | 32 - .../configfiles/freebsd/dkim/dkim-filter.conf | 15 - .../freebsd/dkim/postfix_dkim_addition.cf | 7 - .../dovecot/usr_local_etc_dovecot-sql.conf | 5 - .../dovecot/usr_local_etc_dovecot.conf | 127 --- .../usr_local_etc_dovecot_dovecot-sql.conf | 8 - .../usr_local_etc_dovecot_dovecot.conf | 141 ---- .../freebsd/libnss/etc_nsswitch.conf | 15 - .../usr_local_etc_libnss-mysql-root.cfg | 2 - .../libnss/usr_local_etc_libnss-mysql.cfg | 18 - .../freebsd/logrotate/etc_logrotated_froxlor | 16 - .../nginx/usr_local_etc_nginx_nginx.conf | 62 -- .../freebsd/postfix/etc_periodic.conf | 4 - .../postfix/usr_local_etc_postfix_main.cf | 110 --- ...al_etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - ..._etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../postfix_mxaccess/etc_postfix_main.cf | 25 - .../postfix_mxaccess/etc_postfix_mx_access | 9 - .../powerdns/usr_local_etc_pdns_pdns.conf | 10 - .../freebsd/proftpd/etc_proftpd_proftpd.conf | 96 --- .../pure-ftpd/usr_local_etc_pure-ftpd.conf | 63 -- .../usr_local_etc_pureftpd-mysql.conf | 30 - .../etc_apache2_modules.d_70_fastcgi.conf | 10 - .../gentoo/bind/etc_bind_default.zone | 21 - .../gentoo/courier/etc_courier-imap_imapd | 376 --------- .../gentoo/courier/etc_courier-imap_imapd-ssl | 199 ----- .../gentoo/courier/etc_courier-imap_pop3d | 127 --- .../gentoo/courier/etc_courier-imap_pop3d-ssl | 186 ----- .../courier/etc_courier_authlib_authdaemonrc | 93 --- .../courier/etc_courier_authlib_authmysqlrc | 14 - .../gentoo/cron/etc_cron.d_froxlor | 10 - .../configfiles/gentoo/dkim/dkim-filter.conf | 10 - .../dovecot/etc_dovecot_dovecot-sql.conf | 6 - .../gentoo/dovecot/etc_dovecot_dovecot.conf | 99 --- .../gentoo/libnss/etc_libnss-mysql-root.cfg | 2 - .../gentoo/libnss/etc_libnss-mysql.cfg | 41 - .../gentoo/libnss/etc_nsswitch.conf | 20 - .../gentoo/lighttpd/etc_lighttpd.conf | 56 -- .../gentoo/logrotate/etc_logrotated_froxlor | 16 - .../gentoo/nginx/etc_init.d_php-fcgi | 41 - .../gentoo/nginx/etc_nginx_fastcgi.conf | 15 - .../gentoo/nginx/etc_nginx_nginx.conf | 26 - .../postfix_courier/etc_postfix_main.cf | 91 --- .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - .../etc_postfix_mysql-virtual_gid_maps.cf | 6 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - ...ostfix_mysql-virtual_mailbox_limit_maps.cf | 6 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 6 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../etc_postfix_mysql-virtual_uid_maps.cf | 6 - .../postfix_courier/etc_sasl2_smtpd.conf | 12 - .../postfix_dovecot/etc_postfix_main.cf | 119 --- .../postfix_dovecot/etc_postfix_master.cf | 4 - .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - .../etc_postfix_mysql-virtual_gid_maps.cf | 6 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - ...ostfix_mysql-virtual_mailbox_limit_maps.cf | 6 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 6 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../etc_postfix_mysql-virtual_uid_maps.cf | 6 - .../postfix_mxaccess/etc_postfix_main.cf | 25 - .../postfix_mxaccess/etc_postfix_mx_access | 9 - .../gentoo/proftpd/etc_proftpd_proftpd.conf | 103 --- .../gentoo/pureftpd/etc_conf.d_pure-ftpd | 23 - .../gentoo/pureftpd/etc_pureftpd-mysql.conf | 12 - .../courier/etc_authlib_authdaemonrc | 103 --- .../courier/etc_authlib_authmysqlrc | 12 - .../opensuse_11_x/cron/etc_cron.d_froxlor | 10 - .../opensuse_11_x/dkim/dkim-filter.conf | 3 - .../dovecot/etc_dovecot_dovecot-sql.conf | 5 - .../dovecot/etc_dovecot_dovecot.conf | 105 --- ..._conf.d_acl_30_exim4-config_check_rcpt.rul | 125 --- .../etc_exim4_conf.d_auth_30_froxlor-config | 30 - ...xim4_conf.d_main_10_froxlor-config_options | 20 - ...etc_exim4_conf.d_router_180_froxlor-config | 12 - ...c_exim4_conf.d_transport_30_froxlor-config | 13 - .../opensuse_11_x/postfix/etc_postfix_main.cf | 65 -- .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - .../postfix/etc_sasl2_smtpd.conf | 9 - .../postfix_dovecot/etc_postfix_main.cf | 83 -- .../postfix_dovecot/etc_postfix_master.cf | 4 - .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../postfix_mxaccess/etc_postfix_main.cf | 25 - .../postfix_mxaccess/etc_postfix_mx_access | 9 - .../proftpd/etc_proftpd_modules.conf | 30 - .../proftpd/etc_proftpd_proftpd.conf | 84 -- .../pure-ftpd/etc_pure-ftpd.conf | 75 -- .../pure-ftpd/etc_pure-ftpd_mysql.conf | 15 - .../configfiles/rhel7/cron/etc_cron.d_froxlor | 10 - .../dovecot/etc_dovecot_conf.d_10-auth.conf | 129 --- .../etc_dovecot_conf.d_10-logging.conf | 84 -- .../dovecot/etc_dovecot_conf.d_10-mail.conf | 370 --------- .../dovecot/etc_dovecot_conf.d_10-master.conf | 119 --- .../dovecot/etc_dovecot_conf.d_10-ssl.conf | 60 -- .../dovecot/etc_dovecot_conf.d_15-lda.conf | 48 -- .../etc_dovecot_conf.d_15-mailboxes.conf | 52 -- .../dovecot/etc_dovecot_conf.d_20-imap.conf | 61 -- .../dovecot/etc_dovecot_conf.d_20-lmtp.conf | 20 - .../etc_dovecot_conf.d_20-managesieve.conf | 76 -- .../dovecot/etc_dovecot_conf.d_20-pop3.conf | 98 --- .../dovecot/etc_dovecot_conf.d_90-sieve.conf | 111 --- .../dovecot/etc_dovecot_dovecot-sql.conf.ext | 141 ---- .../rhel7/dovecot/etc_dovecot_dovecot.conf | 84 -- .../rhel7/postfix/etc_postfix_main.cf | 83 -- .../rhel7/postfix/etc_postfix_master.cf | 3 - .../etc_postfix_mysql-virtual_alias_maps.cf | 8 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 7 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../rhel7/proftpd/etc_proftpd_proftpd.conf | 448 ----------- .../sle_10/courier/etc_authlib_authdaemonrc | 103 --- .../sle_10/courier/etc_authlib_authmysqlrc | 14 - .../sle_10/cron/etc_cron.d_froxlor | 10 - .../configfiles/sle_10/dkim/dkim-filter.conf | 3 - .../sle_10/postfix/etc_postfix_main.cf | 66 -- .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../sle_10/postfix/usr_lib_sasl2_smtpd.conf | 9 - .../postfix_mxaccess/etc_postfix_main.cf | 25 - .../postfix_mxaccess/etc_postfix_mx_access | 9 - .../sle_10/proftpd/etc_proftpd_modules.conf | 30 - .../sle_10/proftpd/etc_proftpd_proftpd.conf | 84 -- .../etc_apache2_mods-enabled_fastcgi.conf | 10 - .../courier/etc_courier_authdaemonrc | 68 -- .../courier/etc_courier_authmysqlrc | 14 - .../ubuntu_lucid/cron/etc_cron.d_froxlor | 10 - .../ubuntu_lucid/dkim/dkim-filter.conf | 11 - ...etc_dovecot_auth.d_01-dovecot-postfix.auth | 28 - ...etc_dovecot_conf.d_01-dovecot-postfix.conf | 58 -- .../dovecot/etc_dovecot_dovecot-sql.conf | 6 - ..._conf.d_acl_30_exim4-config_check_rcpt.rul | 125 --- .../etc_exim4_conf.d_auth_30_froxlor-config | 30 - ...xim4_conf.d_main_10_froxlor-config_options | 20 - ...etc_exim4_conf.d_router_180_froxlor-config | 13 - ...c_exim4_conf.d_transport_30_froxlor-config | 13 - .../libnss/etc_nss-mysql-root.conf | 16 - .../ubuntu_lucid/libnss/etc_nss-mysql.conf | 24 - .../ubuntu_lucid/libnss/etc_nsswitch.conf | 20 - .../ubuntu_lucid/lighttpd/etc_lighttpd.conf | 57 -- .../logrotate/etc_logrotated_froxlor | 16 - .../ubuntu_lucid/nginx/etc_init.d_php-fcgi | 41 - .../ubuntu_lucid/nginx/etc_nginx_fastcgi.conf | 15 - .../ubuntu_lucid/nginx/etc_nginx_nginx.conf | 26 - .../postfix_courier/etc_postfix_main.cf | 85 -- .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../etc_postfix_sasl_smtpd.conf | 11 - .../postfix_dovecot/etc_postfix_main.cf | 91 --- .../postfix_dovecot/etc_postfix_master.cf | 4 - .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../postfix_mxaccess/etc_postfix_main.cf | 25 - .../postfix_mxaccess/etc_postfix_mx_access | 9 - .../powerdns/etc_powerdns_pdns-froxlor.conf | 7 - .../powerdns/etc_powerdns_pdns.conf | 17 - .../proftpd/etc_proftpd_modules.conf | 58 -- .../proftpd/etc_proftpd_proftpd.conf | 131 ---- .../ubuntu_lucid/proftpd/etc_proftpd_sql.conf | 37 - .../pure-ftpd/etc_default_pure-ftpd-common | 5 - .../pure-ftpd/etc_pure-ftpd_conf_Bind | 1 - .../etc_pure-ftpd_conf_ChrootEveryone | 1 - .../etc_pure-ftpd_conf_CustomerProof | 1 - .../pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime | 1 - .../pure-ftpd/etc_pure-ftpd_conf_MinUID | 1 - .../etc_pure-ftpd_conf_MySQLConfigFile | 1 - .../pure-ftpd/etc_pure-ftpd_conf_NoAnonymous | 1 - .../etc_pure-ftpd_conf_PAMAuthentication | 1 - .../pure-ftpd/etc_pure-ftpd_db_mysql.conf | 11 - .../etc_apache2_mods-enabled_fastcgi.conf | 10 - .../courier/etc_courier_authdaemonrc | 68 -- .../courier/etc_courier_authmysqlrc | 14 - .../ubuntu_precise/cron/etc_cron.d_froxlor | 10 - ...dovecot_conf.d_01_mail_stack_delivery.conf | 83 -- .../dovecot/etc_dovecot_conf.d_10_auth.conf | 127 --- .../etc_dovecot_conf.d_auth-sql.conf.ext | 8 - .../dovecot/etc_dovecot_dovecot-sql.conf.ext | 6 - .../libnss/etc_libnss-mysql-root.cfg | 2 - .../libnss/etc_libnss-mysql.cfg | 41 - .../ubuntu_precise/libnss/etc_nsswitch.conf | 20 - .../ubuntu_precise/lighttpd/etc_lighttpd.conf | 57 -- .../logrotate/etc_logrotated_froxlor | 16 - .../ubuntu_precise/nginx/etc_init.d_php-fcgi | 41 - .../nginx/etc_nginx_fastcgi.conf | 15 - .../ubuntu_precise/nginx/etc_nginx_nginx.conf | 26 - .../postfix_courier/etc_postfix_main.cf | 85 -- .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../etc_postfix_sasl_smtpd.conf | 11 - .../postfix_dovecot/etc_postfix_main.cf | 90 --- .../postfix_dovecot/etc_postfix_master.cf | 4 - .../etc_postfix_mysql-virtual_alias_maps.cf | 5 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 5 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 5 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../postfix_mxaccess/etc_postfix_main.cf | 25 - .../postfix_mxaccess/etc_postfix_mx_access | 9 - .../powerdns/etc_powerdns_pdns-froxlor.conf | 7 - .../powerdns/etc_powerdns_pdns.conf | 17 - .../proftpd/etc_proftpd_modules.conf | 58 -- .../proftpd/etc_proftpd_proftpd.conf | 131 ---- .../proftpd/etc_proftpd_sql.conf | 37 - .../pure-ftpd/etc_default_pure-ftpd-common | 5 - .../pure-ftpd/etc_pure-ftpd_conf_Bind | 1 - .../etc_pure-ftpd_conf_ChrootEveryone | 1 - .../etc_pure-ftpd_conf_CustomerProof | 1 - .../pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime | 1 - .../pure-ftpd/etc_pure-ftpd_conf_MinUID | 1 - .../etc_pure-ftpd_conf_MySQLConfigFile | 1 - .../pure-ftpd/etc_pure-ftpd_conf_NoAnonymous | 1 - .../etc_pure-ftpd_conf_PAMAuthentication | 1 - .../pure-ftpd/etc_pure-ftpd_db_mysql.conf | 11 - .../etc_apache2_mods-enabled_fastcgi.conf | 10 - .../courier/etc_courier_authdaemonrc | 68 -- .../courier/etc_courier_authmysqlrc | 14 - .../ubuntu_trusty/cron/etc_cron.d_froxlor | 10 - ...dovecot_conf.d_01_mail_stack_delivery.conf | 70 -- .../dovecot/etc_dovecot_conf.d_10_auth.conf | 127 --- .../dovecot/etc_dovecot_dovecot-sql.conf.ext | 6 - .../libnss/etc_libnss-mysql-root.cfg | 2 - .../ubuntu_trusty/libnss/etc_libnss-mysql.cfg | 41 - .../ubuntu_trusty/libnss/etc_nsswitch.conf | 20 - .../ubuntu_trusty/lighttpd/etc_lighttpd.conf | 57 -- .../logrotate/etc_logrotated_froxlor | 16 - .../ubuntu_trusty/nginx/etc_init.d_php-fcgi | 41 - .../nginx/etc_nginx_fastcgi.conf | 15 - .../ubuntu_trusty/nginx/etc_nginx_nginx.conf | 26 - .../postfix_courier/etc_postfix_main.cf | 85 -- .../etc_postfix_mysql-virtual_alias_maps.cf | 8 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 7 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../etc_postfix_sasl_smtpd.conf | 11 - .../postfix_dovecot/etc_postfix_main.cf | 90 --- .../postfix_dovecot/etc_postfix_master.cf | 4 - .../etc_postfix_mysql-virtual_alias_maps.cf | 8 - ...c_postfix_mysql-virtual_mailbox_domains.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 7 - ...ostfix_mysql-virtual_sender_permissions.cf | 5 - .../postfix_mxaccess/etc_postfix_main.cf | 25 - .../postfix_mxaccess/etc_postfix_mx_access | 9 - .../powerdns/etc_powerdns_pdns-froxlor.conf | 7 - .../powerdns/etc_powerdns_pdns.conf | 17 - .../proftpd/etc_proftpd_modules.conf | 58 -- .../proftpd/etc_proftpd_proftpd.conf | 131 ---- .../proftpd/etc_proftpd_sql.conf | 37 - .../pure-ftpd/etc_default_pure-ftpd-common | 5 - .../pure-ftpd/etc_pure-ftpd_conf_Bind | 1 - .../etc_pure-ftpd_conf_ChrootEveryone | 1 - .../etc_pure-ftpd_conf_CustomerProof | 1 - .../pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime | 1 - .../pure-ftpd/etc_pure-ftpd_conf_MinUID | 1 - .../etc_pure-ftpd_conf_MySQLConfigFile | 1 - .../pure-ftpd/etc_pure-ftpd_conf_NoAnonymous | 1 - .../etc_pure-ftpd_conf_PAMAuthentication | 1 - .../pure-ftpd/etc_pure-ftpd_db_mysql.conf | 11 - 386 files changed, 17140 deletions(-) delete mode 100644 lib/configfiles/freebsd.inc.php delete mode 100644 lib/configfiles/lucid.inc.php delete mode 100644 lib/configfiles/sle10.inc.php delete mode 100644 lib/configfiles/sle11.inc.php delete mode 100644 lib/configfiles/squeeze.inc.php delete mode 100644 lib/configfiles_index.inc.php delete mode 100644 templates/misc/configfiles/debian_squeeze/apache2/etc_apache2_mods-enabled_fastcgi.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/courier/etc_courier_authdaemonrc delete mode 100644 templates/misc/configfiles/debian_squeeze/courier/etc_courier_authmysqlrc delete mode 100644 templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor delete mode 100644 templates/misc/configfiles/debian_squeeze/dkim/dkim-filter.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot-sql.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul delete mode 100644 templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_auth_30_froxlor-config delete mode 100644 templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_main_10_froxlor-config_options delete mode 100644 templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_router_180_froxlor-config delete mode 100644 templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_transport_30_froxlor-config delete mode 100644 templates/misc/configfiles/debian_squeeze/libnss/etc_nss-mysql-root.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/libnss/etc_nss-mysql.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/libnss/etc_nsswitch.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/lighttpd/etc_lighttpd.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/logrotate/etc_logrotated_froxlor delete mode 100644 templates/misc/configfiles/debian_squeeze/nginx/etc_init.d_php-fcgi delete mode 100644 templates/misc/configfiles/debian_squeeze/nginx/etc_nginx_fastcgi.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/nginx/etc_nginx_nginx.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_sasl_smtpd.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_master.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_mxaccess/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/debian_squeeze/postfix_mxaccess/etc_postfix_mx_access delete mode 100644 templates/misc/configfiles/debian_squeeze/powerdns/etc_powerdns_pdns-froxlor.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/powerdns/etc_powerdns_pdns.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_modules.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_proftpd.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_sql.conf delete mode 100644 templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_default_pure-ftpd-common delete mode 100644 templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_Bind delete mode 100644 templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone delete mode 100644 templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_CustomerProof delete mode 100644 templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime delete mode 100644 templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MinUID delete mode 100644 templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile delete mode 100644 templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous delete mode 100644 templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication delete mode 100644 templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_db_mysql.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/apache2/etc_apache2_mods-enabled_fastcgi.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/courier/etc_courier_authdaemonrc delete mode 100644 templates/misc/configfiles/debian_wheezy/courier/etc_courier_authmysqlrc delete mode 100644 templates/misc/configfiles/debian_wheezy/cron/etc_cron.d_froxlor delete mode 100644 templates/misc/configfiles/debian_wheezy/dkim/opendkim.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-auth.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-mail.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-master.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-imap.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-managesieve.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-pop3.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_90-sieve.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_dovecot-sql.conf.ext delete mode 100644 templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_dovecot.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt delete mode 100644 templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_auth_30_froxlor-config delete mode 100644 templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_main_10_froxlor-config_options delete mode 100644 templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_router_180_froxlor-config delete mode 100644 templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_transport_30_froxlor-config delete mode 100644 templates/misc/configfiles/debian_wheezy/libnss/etc_libnss-mysql-root.cfg delete mode 100644 templates/misc/configfiles/debian_wheezy/libnss/etc_libnss-mysql.cfg delete mode 100644 templates/misc/configfiles/debian_wheezy/libnss/etc_nsswitch.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/lighttpd/etc_lighttpd.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/logrotate/etc_logrotated_froxlor delete mode 100644 templates/misc/configfiles/debian_wheezy/nginx/etc_init.d_php-fcgi delete mode 100644 templates/misc/configfiles/debian_wheezy/nginx/etc_nginx_nginx.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_courier/etc_aliases delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_sasl_smtpd.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_aliases delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_master.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_mxaccess/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/debian_wheezy/postfix_mxaccess/etc_postfix_mx_access delete mode 100644 templates/misc/configfiles/debian_wheezy/powerdns/etc_powerdns_bindbackend.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/powerdns/etc_powerdns_pdns.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_modules.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_proftpd.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_sql.conf delete mode 100644 templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_default_pure-ftpd-common delete mode 100644 templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_Bind delete mode 100644 templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone delete mode 100644 templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_CustomerProof delete mode 100644 templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime delete mode 100644 templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MinUID delete mode 100644 templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile delete mode 100644 templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous delete mode 100644 templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication delete mode 100644 templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_db_mysql.conf delete mode 100644 templates/misc/configfiles/freebsd/bind9/etc_namedb_default-zone delete mode 100644 templates/misc/configfiles/freebsd/bind9/etc_namedb_master_default.zone delete mode 100644 templates/misc/configfiles/freebsd/bind9/etc_namedb_named.conf delete mode 100644 templates/misc/configfiles/freebsd/dkim/dkim-filter.conf delete mode 100644 templates/misc/configfiles/freebsd/dkim/postfix_dkim_addition.cf delete mode 100644 templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot-sql.conf delete mode 100644 templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot.conf delete mode 100644 templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot-sql.conf delete mode 100644 templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf delete mode 100644 templates/misc/configfiles/freebsd/libnss/etc_nsswitch.conf delete mode 100644 templates/misc/configfiles/freebsd/libnss/usr_local_etc_libnss-mysql-root.cfg delete mode 100644 templates/misc/configfiles/freebsd/libnss/usr_local_etc_libnss-mysql.cfg delete mode 100644 templates/misc/configfiles/freebsd/logrotate/etc_logrotated_froxlor delete mode 100644 templates/misc/configfiles/freebsd/nginx/usr_local_etc_nginx_nginx.conf delete mode 100644 templates/misc/configfiles/freebsd/postfix/etc_periodic.conf delete mode 100644 templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/freebsd/postfix_mxaccess/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/freebsd/postfix_mxaccess/etc_postfix_mx_access delete mode 100644 templates/misc/configfiles/freebsd/powerdns/usr_local_etc_pdns_pdns.conf delete mode 100644 templates/misc/configfiles/freebsd/proftpd/etc_proftpd_proftpd.conf delete mode 100644 templates/misc/configfiles/freebsd/pure-ftpd/usr_local_etc_pure-ftpd.conf delete mode 100644 templates/misc/configfiles/freebsd/pure-ftpd/usr_local_etc_pureftpd-mysql.conf delete mode 100644 templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf delete mode 100644 templates/misc/configfiles/gentoo/bind/etc_bind_default.zone delete mode 100644 templates/misc/configfiles/gentoo/courier/etc_courier-imap_imapd delete mode 100644 templates/misc/configfiles/gentoo/courier/etc_courier-imap_imapd-ssl delete mode 100644 templates/misc/configfiles/gentoo/courier/etc_courier-imap_pop3d delete mode 100644 templates/misc/configfiles/gentoo/courier/etc_courier-imap_pop3d-ssl delete mode 100644 templates/misc/configfiles/gentoo/courier/etc_courier_authlib_authdaemonrc delete mode 100644 templates/misc/configfiles/gentoo/courier/etc_courier_authlib_authmysqlrc delete mode 100644 templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor delete mode 100644 templates/misc/configfiles/gentoo/dkim/dkim-filter.conf delete mode 100644 templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot-sql.conf delete mode 100644 templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf delete mode 100644 templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql-root.cfg delete mode 100644 templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql.cfg delete mode 100644 templates/misc/configfiles/gentoo/libnss/etc_nsswitch.conf delete mode 100644 templates/misc/configfiles/gentoo/lighttpd/etc_lighttpd.conf delete mode 100644 templates/misc/configfiles/gentoo/logrotate/etc_logrotated_froxlor delete mode 100644 templates/misc/configfiles/gentoo/nginx/etc_init.d_php-fcgi delete mode 100644 templates/misc/configfiles/gentoo/nginx/etc_nginx_fastcgi.conf delete mode 100644 templates/misc/configfiles/gentoo/nginx/etc_nginx_nginx.conf delete mode 100644 templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_gid_maps.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_limit_maps.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_uid_maps.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_courier/etc_sasl2_smtpd.conf delete mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_master.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_gid_maps.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_limit_maps.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_uid_maps.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_mxaccess/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/gentoo/postfix_mxaccess/etc_postfix_mx_access delete mode 100644 templates/misc/configfiles/gentoo/proftpd/etc_proftpd_proftpd.conf delete mode 100644 templates/misc/configfiles/gentoo/pureftpd/etc_conf.d_pure-ftpd delete mode 100644 templates/misc/configfiles/gentoo/pureftpd/etc_pureftpd-mysql.conf delete mode 100644 templates/misc/configfiles/opensuse_11_x/courier/etc_authlib_authdaemonrc delete mode 100644 templates/misc/configfiles/opensuse_11_x/courier/etc_authlib_authmysqlrc delete mode 100644 templates/misc/configfiles/opensuse_11_x/cron/etc_cron.d_froxlor delete mode 100644 templates/misc/configfiles/opensuse_11_x/dkim/dkim-filter.conf delete mode 100644 templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot-sql.conf delete mode 100644 templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot.conf delete mode 100644 templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul delete mode 100644 templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_auth_30_froxlor-config delete mode 100644 templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_main_10_froxlor-config_options delete mode 100644 templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_router_180_froxlor-config delete mode 100644 templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_transport_30_froxlor-config delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix/etc_sasl2_smtpd.conf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_master.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix_mxaccess/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/opensuse_11_x/postfix_mxaccess/etc_postfix_mx_access delete mode 100644 templates/misc/configfiles/opensuse_11_x/proftpd/etc_proftpd_modules.conf delete mode 100644 templates/misc/configfiles/opensuse_11_x/proftpd/etc_proftpd_proftpd.conf delete mode 100644 templates/misc/configfiles/opensuse_11_x/pure-ftpd/etc_pure-ftpd.conf delete mode 100644 templates/misc/configfiles/opensuse_11_x/pure-ftpd/etc_pure-ftpd_mysql.conf delete mode 100644 templates/misc/configfiles/rhel7/cron/etc_cron.d_froxlor delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-auth.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-logging.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-mail.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-master.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-ssl.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_15-lda.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_15-mailboxes.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-imap.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-lmtp.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-managesieve.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-pop3.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_90-sieve.conf delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_dovecot-sql.conf.ext delete mode 100644 templates/misc/configfiles/rhel7/dovecot/etc_dovecot_dovecot.conf delete mode 100644 templates/misc/configfiles/rhel7/postfix/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/rhel7/postfix/etc_postfix_master.cf delete mode 100644 templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/rhel7/proftpd/etc_proftpd_proftpd.conf delete mode 100644 templates/misc/configfiles/sle_10/courier/etc_authlib_authdaemonrc delete mode 100644 templates/misc/configfiles/sle_10/courier/etc_authlib_authmysqlrc delete mode 100644 templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor delete mode 100644 templates/misc/configfiles/sle_10/dkim/dkim-filter.conf delete mode 100644 templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/sle_10/postfix/usr_lib_sasl2_smtpd.conf delete mode 100644 templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_mx_access delete mode 100644 templates/misc/configfiles/sle_10/proftpd/etc_proftpd_modules.conf delete mode 100644 templates/misc/configfiles/sle_10/proftpd/etc_proftpd_proftpd.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/apache2/etc_apache2_mods-enabled_fastcgi.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/courier/etc_courier_authdaemonrc delete mode 100644 templates/misc/configfiles/ubuntu_lucid/courier/etc_courier_authmysqlrc delete mode 100644 templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor delete mode 100644 templates/misc/configfiles/ubuntu_lucid/dkim/dkim-filter.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_auth.d_01-dovecot-postfix.auth delete mode 100644 templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul delete mode 100644 templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_auth_30_froxlor-config delete mode 100644 templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_main_10_froxlor-config_options delete mode 100644 templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_router_180_froxlor-config delete mode 100644 templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_transport_30_froxlor-config delete mode 100644 templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql-root.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/libnss/etc_nsswitch.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/lighttpd/etc_lighttpd.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/logrotate/etc_logrotated_froxlor delete mode 100644 templates/misc/configfiles/ubuntu_lucid/nginx/etc_init.d_php-fcgi delete mode 100644 templates/misc/configfiles/ubuntu_lucid/nginx/etc_nginx_fastcgi.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/nginx/etc_nginx_nginx.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_sasl_smtpd.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_master.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_mxaccess/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/postfix_mxaccess/etc_postfix_mx_access delete mode 100644 templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns-froxlor.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_modules.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_proftpd.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_sql.conf delete mode 100644 templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_default_pure-ftpd-common delete mode 100644 templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_Bind delete mode 100644 templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone delete mode 100644 templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_CustomerProof delete mode 100644 templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime delete mode 100644 templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MinUID delete mode 100644 templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile delete mode 100644 templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous delete mode 100644 templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication delete mode 100644 templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_db_mysql.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/apache2/etc_apache2_mods-enabled_fastcgi.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/courier/etc_courier_authdaemonrc delete mode 100644 templates/misc/configfiles/ubuntu_precise/courier/etc_courier_authmysqlrc delete mode 100644 templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor delete mode 100644 templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_10_auth.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext delete mode 100644 templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_dovecot-sql.conf.ext delete mode 100644 templates/misc/configfiles/ubuntu_precise/libnss/etc_libnss-mysql-root.cfg delete mode 100644 templates/misc/configfiles/ubuntu_precise/libnss/etc_libnss-mysql.cfg delete mode 100644 templates/misc/configfiles/ubuntu_precise/libnss/etc_nsswitch.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/lighttpd/etc_lighttpd.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/logrotate/etc_logrotated_froxlor delete mode 100644 templates/misc/configfiles/ubuntu_precise/nginx/etc_init.d_php-fcgi delete mode 100644 templates/misc/configfiles/ubuntu_precise/nginx/etc_nginx_fastcgi.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/nginx/etc_nginx_nginx.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_sasl_smtpd.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_master.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_mxaccess/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/ubuntu_precise/postfix_mxaccess/etc_postfix_mx_access delete mode 100644 templates/misc/configfiles/ubuntu_precise/powerdns/etc_powerdns_pdns-froxlor.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/powerdns/etc_powerdns_pdns.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_modules.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_proftpd.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_sql.conf delete mode 100644 templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_default_pure-ftpd-common delete mode 100644 templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_Bind delete mode 100644 templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone delete mode 100644 templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_CustomerProof delete mode 100644 templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime delete mode 100644 templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MinUID delete mode 100644 templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile delete mode 100644 templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous delete mode 100644 templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication delete mode 100644 templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_db_mysql.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/apache2/etc_apache2_mods-enabled_fastcgi.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/courier/etc_courier_authdaemonrc delete mode 100644 templates/misc/configfiles/ubuntu_trusty/courier/etc_courier_authmysqlrc delete mode 100644 templates/misc/configfiles/ubuntu_trusty/cron/etc_cron.d_froxlor delete mode 100644 templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_10_auth.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_dovecot-sql.conf.ext delete mode 100644 templates/misc/configfiles/ubuntu_trusty/libnss/etc_libnss-mysql-root.cfg delete mode 100644 templates/misc/configfiles/ubuntu_trusty/libnss/etc_libnss-mysql.cfg delete mode 100644 templates/misc/configfiles/ubuntu_trusty/libnss/etc_nsswitch.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/lighttpd/etc_lighttpd.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/logrotate/etc_logrotated_froxlor delete mode 100644 templates/misc/configfiles/ubuntu_trusty/nginx/etc_init.d_php-fcgi delete mode 100644 templates/misc/configfiles/ubuntu_trusty/nginx/etc_nginx_fastcgi.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/nginx/etc_nginx_nginx.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_sasl_smtpd.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_master.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_mxaccess/etc_postfix_main.cf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/postfix_mxaccess/etc_postfix_mx_access delete mode 100644 templates/misc/configfiles/ubuntu_trusty/powerdns/etc_powerdns_pdns-froxlor.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/powerdns/etc_powerdns_pdns.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_modules.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_proftpd.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_sql.conf delete mode 100644 templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_default_pure-ftpd-common delete mode 100644 templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_Bind delete mode 100644 templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone delete mode 100644 templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_CustomerProof delete mode 100644 templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime delete mode 100644 templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MinUID delete mode 100644 templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile delete mode 100644 templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous delete mode 100644 templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication delete mode 100644 templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_db_mysql.conf diff --git a/lib/configfiles/freebsd.inc.php b/lib/configfiles/freebsd.inc.php deleted file mode 100644 index b457fc14..00000000 --- a/lib/configfiles/freebsd.inc.php +++ /dev/null @@ -1,429 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Configfiles - * - */ - -// Try to guess user/group from settings' email UID/GID -$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid')); -$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid')); - -/* If one of them are not set, call it 'vmail' and suggest creating user/group - * in scripts. */ -if ($vmail_user === false) { - $vmail_username="vmail"; -} else { - $vmail_username=$vmail_user['name']; -} -if ($vmail_group === false) { - $vmail_groupname="vmail"; -} else { - $vmail_groupname=$vmail_group['name']; -} - -return array( - 'freebsd' => array( - 'label' => 'FreeBSD', - 'services' => array( - 'http' => array( - 'label' => $lng['admin']['configfiles']['http'], - 'daemons' => array( - 'nginx' => array( - 'label' => 'Nginx Webserver', - 'commands_1' => array( - 'cd /usr/ports/www/nginx', - 'make config', - 'set [x] IPv6 protocol (default)', - 'set [x] Enable HTTP module (default)', - 'set [x] Enable http_cache module (default)', - 'set [x] Enable http_gzip_static module', - 'set [x] Enable http_rewrite module (default)', - 'set [x] Enable http_ssl module (default)', - 'set [x] Enable http_stub_status module (default)', - 'make install clean; rehash', - ), - 'commands_2' => array( - $configcommand['vhost'], - $configcommand['diroptions'], - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p '. Settings::Get('system.documentroot_prefix'), - 'mkdir -p '. Settings::Get('system.mod_fcgid_tmpdir'), - 'mkdir -p '. Settings::Get('system.logfiles_directory'), - 'echo "nginx_enable=\"YES\"" >> /etc/rc.conf' - ), - 'files' => array( - 'usr_local_etc_nginx_nginx.conf' => '/usr/local/etc/nginx/nginx.conf', - ), - 'restart' => array( - '/usr/local/etc/rc.d/nginx restart' - ) - ), - 'apache2' => array( - 'label' => 'Apache2 Webserver', - 'commands' => array( - 'cd /usr/ports/www/apache22', - 'make config', - 'make install', - $configcommand['vhost'], - 'chown root:0 ' . Settings::Get('system.apacheconf_vhost'), - 'chmod 0600 ' . Settings::Get('system.apacheconf_vhost'), - $configcommand['diroptions'], - 'chown root:0 ' . Settings::Get('system.apacheconf_diroptions'), - 'chmod 0600 ' . Settings::Get('system.apacheconf_diroptions'), - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'echo "accf_http_load=\"YES\"" >> /boot/loader.conf', - 'echo "accf_data_load=\"YES\"" >> /boot/loader.conf', - 'echo "apache22_enable=\"YES\"" >> /etc/rc.conf', - ), - 'restart' => array( - 'sh /usr/local/etc/rc.d/apache22 restart' - ) - ) - ) - ), - 'dns' => array( - 'label' => $lng['admin']['configfiles']['dns'], - 'daemons' => array( - - // Begin: Bind 9.x Config - 'bind9' => array( - 'label' => 'Bind9 Nameserver', - 'commands_1' => array( - 'cd /usr/ports/dns/bind99', - 'make config', - 'set [x] International Domain Names', - 'set [x] IPv6 protocol (default)', - 'set [x] 64-bit file support', - 'set [x] Replace base BIND with this version', - 'set [x] Enable RPZ NSDNAME policy records', - 'set [x] Enable RPZ NSIP trigger rules', - 'set [x] dig/host/nslookup will do DNSSEC validation', - 'set [x] Build with OpenSSL (Required for DNSSEC) (default)', - 'set [x] Threading support (default)', - 'make install clean; rehash', - ), - 'commands_2' => array( - 'echo "named_enable=\"YES\"" >> /etc/rc.conf', - PHP_EOL, - (strpos(Settings::Get('system.bindconf_directory'), '/etc/namedb') === false) ? '(TIP: Be sure the path below is "/etc/namedb", if not you have configured the bind-directory in a false way in PANEL->SETTINGS->NAMESERVER SETTINGS!)' : null, - 'echo "include \"'. Settings::Get('system.bindconf_directory') .'froxlor_bind.conf\";" >> '. Settings::Get('system.bindconf_directory') .'named.conf', - 'echo "include \"'. Settings::Get('system.bindconf_directory') .'default-zone\";" >> '. Settings::Get('system.bindconf_directory') .'named.conf', - ), - 'files' => array( - 'etc_namedb_named.conf' => Settings::Get('system.bindconf_directory') .'named.conf', - 'etc_namedb_master_default.zone' => Settings::Get('system.bindconf_directory') .'master/default.zone', - 'etc_namedb_default-zone' => Settings::Get('system.bindconf_directory') .'default-zone', - ), - 'restart' => array( - '/etc/rc.d/named restart' - ) - ), - // End: Bind 9.x Config - - 'powerdns' => array( - 'label' => 'PowerDNS', - 'commands_1' => array( - 'cd /usr/ports/dns/powerdns', - 'make config', - 'set MySQL backend', - 'make install', - 'echo "pdns_enable=\"YES\"" >> /etc/rc.conf', - ), - 'files' => array( - 'usr_local_etc_pdns_pdns.conf' => '/usr/local/etc/pdns/pdns.conf' - ), - 'commands' => array( - 'touch ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chown root:0 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chmod 0600 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' - ), - 'restart' => array( - 'sh /usr/local/etc/rc.d/pdns restart' - ) - ), - ) - ), - 'smtp' => array( - 'label' => $lng['admin']['configfiles']['smtp'], - 'daemons' => array( - 'postfix' => array( - 'label' => 'Postfix', - 'commands_1' => array( - 'cd /usr/ports/mail/postfix', - 'make config', - 'set Dovecot SASL authentication method', - 'set Enable SSL and TLS support', - 'set MySQL maps (choose version with WITH_MYSQL_VER)', - 'make install' - ), - 'commands_2' => array( - ($vmail_group === false) ? 'pw groupadd ' . $vmail_groupname . ' -g '.Settings::Get('system.vmail_gid') : '', - ($vmail_user === false) ? 'pw useradd ' . $vmail_username . ' -u '.Settings::Get('system.vmail_uid').' -g '.Settings::Get('system.vmail_gid').' -s/sbin/nologin -d/dev/null' : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'chmod 0750 ' . Settings::Get('system.vmail_homedir') - ), - 'commands_3' => array( - 'echo "sendmail_enable=\"NO\"" >> /etc/rc.conf', - 'echo "sendmail_submit_enable=\"NO\"" >> /etc/rc.conf', - 'echo "sendmail_outbound_enable=\"NO\"" >> /etc/rc.conf', - 'echo "sendmail_msp_queue_enable=\"NO\"" >> /etc/rc.conf', - 'echo "postfix_enable=\"YES\"" >> /etc/rc.conf' - ), - 'files' => array( - 'etc_periodic.conf' => '/etc/periodic.conf', - 'usr_local_etc_postfix_main.cf' => '/usr/local/etc/postfix/main.cf', - 'usr_local_etc_postfix_mysql-virtual_alias_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_alias_maps.cf', - 'usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'usr_local_etc_postfix_mysql-virtual_sender_permissions.cf' => '/usr/local/etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'restart' => array( - 'newaliases', - 'mkdir /var/spool/postfix/etc', - 'cp /etc/resolv.conf /var/spool/postfix/etc', - 'sh /usr/local/etc/rc.d/postfix restart' - ) - ), - 'postgrey' => array( - 'label' => 'Postgrey', - 'commands_1' => array( - 'cd /usr/ports/mail/postgrey', - 'make install clean' - ), - 'commands_2' => array( - 'sed -i.bak \'s/# *check_policy_service *inet:127\.0\.0\.1:10023/ check_policy_service inet:127\.0\.0\.1:10023/\' /usr/local/etc/postfix/main.cf', - 'echo "postgrey_enable=\"YES\"" >> /etc/rc.conf' - ), - 'restart' => array( - '/usr/local/etc/rc.d/postgrey restart', - '/usr/local/etc/rc.d/postfix restart' - ) - ), - 'postfix_mxaccess' => array( - 'label' => 'Postfix MX-Access (anti spam)', - 'files' => array( - 'etc_postfix_mx_access' => '/usr/local/etc/postfix/mx_access', - 'etc_postfix_main.cf' => '/usr/local/etc/postfix/main.cf' - ), - 'commands_1' => array( - 'postmap /usr/local/etc/postfix/mx_access' - ), - 'restart' => array( - '/usr/local/etc/rc.d/postfix restart' - ) - ), - 'dkim' => array( - 'label' => 'DomainKey filter', - 'commands' => array( - 'cd /usr/ports/mail/dkim-milter/', - 'make install clean', - 'touch /usr/local/etc/mail/dkim-filter.conf' - ), - 'files' => array( - 'dkim-filter.conf' => '/usr/local/etc/mail/dkim-filter.conf', - 'postfix_dkim_addition.cf' => '/usr/local/etc/postfix/main.cf' - ), - 'restart' => array( - '/usr/local/etc/rc.d/milter-dkim restart ' - ) - ) - ) - ), - 'mail' => array( - 'label' => $lng['admin']['configfiles']['mail'], - 'daemons' => array( - 'dovecot' => array( - 'label' => 'Dovecot', - 'commands_1' => array( - 'cd /usr/ports/mail/dovecot', - 'make config', - 'set kqueue(2) support ', - 'set SSL support ', - 'set ManageSieve support (optional)', - 'set MySQL support ', - 'make install', - 'echo "dovecot_enable=\"YES\"" >> /etc/rc.conf' - ), - 'files' => array( - 'usr_local_etc_dovecot.conf' => '/usr/local/etc/dovecot.conf', - 'usr_local_etc_dovecot-sql.conf' => '/usr/local/etc/dovecot-sql.conf' - ), - 'commands_2' => array( - 'echo "dovecot unix - n n - - pipe - flags=DRhu user='.$vmail_username.':'.$vmail_groupname.' argv=/usr/local/libexec/dovecot/deliver -f ${sender} -d ${recipient}" >> /usr/local/etc/postfix/master.cf', - 'chmod 0640 /usr/local/etc/dovecot-sql.conf' - ), - 'restart' => array( - 'sh /usr/local/etc/rc.d/dovecot restart' - ) - ), - - // Begin: Dovecot 2.x Config - 'dovecot2' => array( - 'label' => 'Dovecot 2.x', - 'commands_1' => array( - 'cd /usr/ports/mail/dovecot2', - 'make config', - 'set [x] kqueue(2) support (default)', - 'set [x] MySQL database', - 'set [x] SSL protocol (default)', - 'make install clean; rehash', - ), - 'commands_2' => array( - 'echo "dovecot_enable=\"YES\"" >> /etc/rc.conf', - PHP_EOL, - 'pw adduser '. $vmail_username .' -g '. $vmail_groupname .' -u '. Settings::Get('system.vmail_gid') .' -d /nonexistent -s /usr/sbin/nologin -c "User for virtual mailtransport used by Postfix and Dovecot"', - PHP_EOL, - 'chmod 0640 /usr/local/etc/dovecot-sql.conf' - ), - 'files' => array( - 'usr_local_etc_dovecot_dovecot.conf' => '/usr/local/etc/dovecot/dovecot.conf', - 'usr_local_etc_dovecot_dovecot-sql.conf' => '/usr/local/etc/dovecot/dovecot-sql.conf' - ), - 'commands_3' => array( - 'echo "dovecot unix - n n - - pipe'. PHP_EOL .'flags=DRhu user='. $vmail_username .':'. $vmail_groupname .' argv=/usr/lib/dovecot/deliver -f ${sender} -d ${recipient} -a ${recipient}" >> /usr/local/etc/postfix/master.cf', - ), - 'restart' => array( - '/usr/local/etc/rc.d/dovecot restart' - ) - ) - // End: Dovecot 2.x Config - - ) - ), - 'ftp' => array( - 'label' => $lng['admin']['configfiles']['ftp'], - 'daemons' => array( - 'proftpd' => array( - 'label' => 'ProFTPd', - 'commands_1' => array( - 'cd /usr/ports/ftp/proftpd', - 'make config', - 'set MySQL auth', - 'set Include mod_quota', - 'make install clean' - ), - 'commands_2' => array( - 'touch /usr/local/etc/proftpd.conf', - 'chown root:0 /usr/local/etc/proftpd.conf', - 'chmod 0600 /usr/local/etc/proftpd.conf', - 'echo "proftpd_enable=\"YES\"" >> /etc/rc.conf' - ), - 'files' => array( - 'etc_proftpd_proftpd.conf' => '/usr/local/etc/proftpd.conf' - ), - 'restart' => array( - '/usr/local/etc/rc.d/proftpd restart' - ) - ), - 'pure-ftpd' => array ( - 'label' => 'Pure-FTPd', - 'commands_1' => array ( - 'cd /usr/ports/ftp/pure-ftpd', - 'make config', - '# select LARGEFILE,MYSQL,PAM,PRIVSEP,SENDFILE,THROTTLING,TLS,UTF8,VIRTUALCHROOT', - 'make install clean' - ), - 'commands_2' => array( - 'touch /usr/local/etc/pure-ftpd.conf', - 'touch /usr/local/etc/pureftpd-mysql.conf', - 'chown root:0 /usr/local/etc/pure-ftpd.conf', - 'chown root:0 /usr/local/etc/pureftpd-mysql.conf', - 'chmod 0600 /usr/local/etc/pure-ftpd.conf', - 'chmod 0600 /usr/local/etc/pureftpd-mysql.conf', - 'echo "pure-ftpd_enable="YES" >> /etc/rc.conf' - ), - 'files' => array( - 'usr_local_etc_pure-ftpd.conf' => '/usr/local/etc/pure-ftpd.conf', - 'usr_local_etc_pureftpd-mysql.conf' => '/usr/local/etc/pureftpd-mysql.conf' - ), - 'restart' => array( - 'service pure-ftpd restart' - ) - ) - ) - ), - 'etc' => array( - 'label' => $lng['admin']['configfiles']['etc'], - 'daemons' => array( - 'cron' => array( - 'label' => 'Crond (cronscript)', - 'commands' => array( - 'echo "*/5 * * * * root nice -n 5 /usr/local/bin/php -q '.makeCorrectDir(dirname(dirname(dirname(__FILE__)))).'scripts/froxlor_master_cronjob.php" >> /etc/crontab' - ), - 'restart' => array( - Settings::Get('system.crondreload') - ) - ), - 'awstats' => array( - 'label' => 'Awstats', - 'commands' => array( - 'cd /usr/ports/www/awstats/', - 'make install clean', - 'cp /usr/local/www/awstats/cgi-bin/awstats.model.conf '.makeCorrectDir(Settings::Get('system.awstats_conf')), - 'sed -i.bak \'s/^LogFile/# LogFile/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^LogType/# LogType/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^LogFormat/# LogFormat/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^LogSeparator/# LogSeparator/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^SiteDomain/# SiteDomain/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself' - ) - ), - 'libnss' => array( - 'label' => 'libnss (system login with mysql)', - 'commands_1' => array( - 'cd /usr/ports/net/libnss-mysql', - 'make install clean', - 'echo "nscd_enable=\"YES\"" >> /etc/rc.conf' - ), - 'files' => array( - 'usr_local_etc_libnss-mysql.cfg' => '/usr/local/etc/libnss-mysql.cfg', - 'usr_local_etc_libnss-mysql-root.cfg' => '/usr/local/etc/libnss-mysql-root.cfg', - 'etc_nsswitch.conf' => '/etc/nsswitch.conf' - ), - 'commands_2' => array( - 'chmod 600 /usr/local/etc/libnss-mysql.cfg /usr/local/etc/libnss-mysql-root.cfg' - ), - 'restart' => array( - 'sh /etc/rc.d/nscd restart' - ) - ), - 'logrotate' => array( - 'label' => 'Logrotate', - 'commands_1' => array( - 'cd /usr/ports/sysutils/logrotate/', - 'make install clean clean-depends', - 'touch /etc/logrotate.d/froxlor', - 'chmod 644 /etc/logrotate.d/froxlor' - ), - 'files' => array( - 'etc_logrotated_froxlor' => '/etc/logrotate.d/froxlor' - ), - 'commands_2' => array( - '# create cronjob-entry (daily-recommended)', - '0 2 * * * /usr/local/sbin/logrotate -f /etc/logrotate.d/froxlor' - ) - ) - ) - ) - ) - ) -); diff --git a/lib/configfiles/lucid.inc.php b/lib/configfiles/lucid.inc.php deleted file mode 100644 index 3535d537..00000000 --- a/lib/configfiles/lucid.inc.php +++ /dev/null @@ -1,419 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Configfiles - * - */ - -// Try to guess user/group from settings' email UID/GID -$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid')); -$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid')); - -/* If one of them are not set, call it 'vmail' and suggest creating user/group - * in scripts. */ -if ($vmail_user === false) { - $vmail_username="vmail"; -} else { - $vmail_username=$vmail_user['name']; -} -if ($vmail_group === false) { - $vmail_groupname="vmail"; -} else { - $vmail_groupname=$vmail_group['name']; -} - -return array( - 'ubuntu_lucid' => array( - 'label' => 'Ubuntu 10.04 (Lucid) [deprecated]', - 'services' => array( - 'http' => array( - 'label' => $lng['admin']['configfiles']['http'], - 'daemons' => array( - 'apache2' => array( - 'label' => 'Apache 2', - 'commands' => array( - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'a2dismod userdir' - ), - 'files' => ((int)Settings::Get('phpfpm.enabled') == 1) ? - array( - 'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf' - ) - : - null, - 'restart' => array( - '/etc/init.d/apache2 restart' - ), - ), - 'lighttpd' => array( - 'label' => 'Lighttpd Webserver', - 'commands_1' => array( - 'apt-get install lighttpd', - ), - 'files' => array( - 'etc_lighttpd.conf' => '/etc/lighttpd/lighttpd.conf', - ), - 'commands_2' => array( - $configcommand['vhost'], - $configcommand['diroptions'], - $configcommand['v_inclighty'], - $configcommand['d_inclighty'], - 'lighty-disable-mod cgi', - 'lighty-disable-mod fastcgi', - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir') - ), - 'restart' => array( - '/etc/init.d/lighttpd restart' - ), - ), - 'nginx' => array( - 'label' => 'Nginx Webserver', - 'commands_1' => array( - 'apt-get install nginx php5-cgi', - ), - 'files' => array( - 'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf', - 'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi' - ), - 'commands_2' => array( - 'rm /etc/nginx/sites-enabled/default', - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod u+x /etc/init.d/php-fcgi' - ), - 'restart' => array( - '/etc/init.d/php-fcgi start', - '/etc/init.d/nginx restart' - ) - ), - ), - ), - 'dns' => array( - 'label' => $lng['admin']['configfiles']['dns'], - 'daemons' => array( - 'bind' => array( - 'label' => 'Bind9', - 'commands' => array( - 'apt-get install bind9', - 'echo "include \"' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf\";" >> /etc/bind/named.conf', - 'touch ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chown root:bind ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chmod 0644 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' - ), - 'restart' => array( - '/etc/init.d/bind9 restart' - ) - ), - 'powerdns' => array( - 'label' => 'PowerDNS', - 'files' => array( - 'etc_powerdns_pdns.conf' => '/etc/powerdns/pdns.conf', - 'etc_powerdns_pdns-froxlor.conf' => '/etc/powerdns/pdns_froxlor.conf', - ), - 'restart' => array( - '/etc/init.d/pdns restart' - ) - ), - ) - ), - 'smtp' => array( - 'label' => $lng['admin']['configfiles']['smtp'], - 'daemons' => array( - 'postfix_courier' => array( - 'label' => 'Postfix/Courier', - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql', - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'touch /etc/postfix/sasl/smtpd.conf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/sasl/smtpd.conf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0600 /etc/postfix/sasl/smtpd.conf', - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf', - 'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf' - ), - 'restart' => array( - 'newaliases', - '/etc/init.d/postfix restart' - ) - ), - 'dkim' => array( - 'label' => 'DomainKey filter', - 'commands_1' => array( - 'apt-get install dkim-filter', - 'mkdir -p /etc/postfix/dkim' - ), - 'files' => array( - 'dkim-filter.conf' => '/etc/dkim-filter.conf' - ), - 'commands_2' => array( - 'echo "milter_default_action = accept" >> /etc/postfix/main.cf', - 'echo "milter_protocol = 2" >> /etc/postfix/main.cf', - 'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf', - 'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf' - ), - 'restart' => array( - '/etc/init.d/dkim-filter restart', - '/etc/init.d/postfix restart' - ) - ), - 'postfix_dovecot' => array( - 'label' => 'Postfix/Dovecot', - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'apt-get install postfix postfix-mysql', - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:root /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0644 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_master.cf' => '/etc/postfix/master.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'restart' => array( - '/etc/init.d/postfix restart', - 'newaliases' - ) - ), - 'postfix_mxaccess' => array( - 'label' => 'Postfix MX-Access (anti spam)', - 'files' => array( - 'etc_postfix_mx_access' => '/etc/postfix/mx_access', - 'etc_postfix_main.cf' => '/etc/postfix/main.cf' - ), - 'commands_1' => array( - 'postmap /etc/postfix/mx_access' - ), - 'restart' => array( - '/etc/init.d/postfix restart' - ) - ), - 'exim4' => array( - 'label' => 'Exim4', - 'commands_1' => array( - 'dpkg-reconfigure exim4-config', - '# choose "no configuration at this time" and "splitted configuration files" in the dialog' - ), - 'files' => array( - 'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul', - 'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config', - 'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options', - 'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config', - 'etc_exim4_conf.d_transport_30_froxlor-config' => '/etc/exim4/conf.d/transport/30_froxlor-config' - ), - 'commands_2' => array( - 'chmod o-rx /var/lib/exim4', - 'chmod o-rx /etc/exim4/conf.d/main/10_froxlor-config_options' - ), - 'restart' => array( - '/etc/init.d/exim4 restart' - ) - ) - ) - ), - 'mail' => array( - 'label' => $lng['admin']['configfiles']['mail'], - 'daemons' => array( - 'courier' => array( - 'label' => 'Courier', - 'commands' => array( - 'apt-get install courier-pop courier-imap courier-authlib-mysql' - ), - 'files' => array( - 'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc', - 'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc' - ), - 'restart' => array( - '/etc/init.d/courier-authdaemon restart', - '/etc/init.d/courier-pop restart' - ) - ), - 'dovecot' => array( - 'label' => 'Dovecot', - 'commands_1' => array( - 'apt-get install dovecot-imapd dovecot-pop3d dovecot-postfix' - ), - 'files' => array( - 'etc_dovecot_auth.d_01-dovecot-postfix.auth' => '/etc/dovecot/auth.d/01-dovecot-postfix.auth', - 'etc_dovecot_conf.d_01-dovecot-postfix.conf' => '/etc/dovecot/conf.d/01-dovecot-postfix.conf', - 'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf' - ), - 'commands_2' => array( - 'chmod 0640 /etc/dovecot/dovecot-sql.conf' - ), - 'restart' => array( - '/etc/init.d/dovecot restart' - ) - ) - ) - ), - 'ftp' => array( - 'label' => $lng['admin']['configfiles']['ftp'], - 'daemons' => array( - 'proftpd' => array( - 'label' => 'ProFTPd', - 'commands' => array( - 'apt-get install proftpd-basic proftpd-mod-mysql' - ), - 'files' => array( - 'etc_proftpd_sql.conf' => '/etc/proftpd/sql.conf', - 'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf', - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'restart' => array( - '/etc/init.d/proftpd restart' - ) - ), - 'pure-ftpd' => array( - 'label' => 'Pure FTPd', - 'commands_1' => array( - 'apt-get install pure-ftpd-common pure-ftpd-mysql' - ), - 'files' => array( - 'etc_pure-ftpd_conf_MinUID' => '/etc/pure-ftpd/conf/MinUID', - 'etc_pure-ftpd_conf_MySQLConfigFile' => '/etc/pure-ftpd/conf/MySQLConfigFile', - 'etc_pure-ftpd_conf_NoAnonymous' => '/etc/pure-ftpd/conf/NoAnonymous', - 'etc_pure-ftpd_conf_MaxIdleTime' => '/etc/pure-ftpd/conf/MaxIdleTime', - 'etc_pure-ftpd_conf_ChrootEveryone' => '/etc/pure-ftpd/conf/ChrootEveryone', - 'etc_pure-ftpd_conf_PAMAuthentication' => '/etc/pure-ftpd/conf/PAMAuthentication', - 'etc_pure-ftpd_db_mysql.conf' => '/etc/pure-ftpd/db/mysql.conf', - 'etc_pure-ftpd_conf_CustomerProof' => '/etc/pure-ftpd/conf/CustomerProof', - 'etc_pure-ftpd_conf_Bind' => '/etc/pure-ftpd/conf/Bind', - 'etc_default_pure-ftpd-common' => '/etc/default/pure-ftpd-common' - ), - 'commands_2' => array( - 'chmod 0640 /etc/pure-ftpd/db/mysql.conf' - ), - 'restart' => array( - '/etc/init.d/pure-ftpd-mysql restart' - ) - ), - ) - ), - 'etc' => array( - 'label' => $lng['admin']['configfiles']['etc'], - 'daemons' => array( - 'cron' => array( - 'label' => 'Crond (cronscript)', - 'files' => array( - 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' - ), - 'restart' => array( - Settings::Get('system.crondreload') - ) - ), - 'awstats' => array( - 'label' => 'Awstats', - 'commands' => array( - 'apt-get install awstats', - 'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl '.makeCorrectDir(Settings::Get('system.awstats_path')), - 'mv '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.conf').' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself', - 'rm /etc/cron.d/awstats' - ), - ), - 'libnss' => array( - 'label' => 'libnss (system login with mysql)', - 'commands' => array( - 'apt-get install libnss-mysql nscd', - 'chmod 600 /etc/nss-mysql.conf /etc/nss-mysql-root.conf' - ), - 'files' => array( - 'etc_nss-mysql.conf' => '/etc/nss-mysql.conf', - 'etc_nss-mysql-root.conf' => '/etc/nss-mysql-root.conf', - 'etc_nsswitch.conf' => '/etc/nsswitch.conf', - ), - 'restart' => array( - '/etc/init.d/nscd restart' - ) - ), - 'logrotate' => array( - 'label' => 'Logrotate', - 'commands_1' => array( - 'apt-get install logrotate', - 'touch /etc/logrotate.d/froxlor', - 'chmod 644 /etc/logrotate.d/froxlor' - ), - 'files' => array( - 'etc_logrotated_froxlor' => '/etc/logrotate.d/froxlor' - ), - 'commands_2' => array( - '# apt automatically adds a daily cronjob for logrotate', - '# you do not have to do anything else :)' - ) - ) - ) - ) - ) - ) -); diff --git a/lib/configfiles/sle10.inc.php b/lib/configfiles/sle10.inc.php deleted file mode 100644 index a86ac1e9..00000000 --- a/lib/configfiles/sle10.inc.php +++ /dev/null @@ -1,188 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Configfiles - * - */ - -// Try to guess user/group from settings' email UID/GID -$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid')); -$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid')); - -/* If one of them are not set, call it 'vmail' and suggest creating user/group - * in scripts. */ -if ($vmail_user === false) { - $vmail_username="vmail"; -} else { - $vmail_username=$vmail_user['name']; -} -if ($vmail_group === false) { - $vmail_groupname="vmail"; -} else { - $vmail_groupname=$vmail_group['name']; -} - -return array( - 'sle_10' => array( - 'label' => 'SUSE Linux Enterprise 10 (deprecated)', - 'services' => array( - 'http' => array( - 'label' => $lng['admin']['configfiles']['http'], - 'daemons' => array( - 'apache' => array( - 'label' => 'Apache', - 'commands' => array( - $configcommand['vhost'], - $configcommand['diroptions'], - $configcommand['include'], - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '' - ), - 'restart' => array( - '/etc/init.d/apache2 restart' - ) - ), - ) - ), - 'dns' => array( - 'label' => $lng['admin']['configfiles']['dns'], - 'daemons' => array( - 'bind' => array( - 'label' => 'Bind9', - 'commands' => array( - 'echo "include \"' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf\";" >> /etc/named.conf', - 'touch ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chown named:0 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chmod 0600 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' - ), - 'restart' => array( - '/etc/init.d/named restart' - ) - ), - ) - ), - 'smtp' => array( - 'label' => $lng['admin']['configfiles']['smtp'], - 'daemons' => array( - 'postfix' => array( - 'label' => 'Postfix', - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf', - 'usr_lib_sasl2_smtpd.conf' => '/usr/lib/sasl2/smtpd.conf' - ), - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'touch /usr/lib/sasl2/smtpd.conf', - 'chmod 660 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 660 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 660 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 660 /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 660 /usr/lib/sasl2/smtpd.conf', - 'chgrp postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chgrp postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chgrp postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chgrp postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chgrp postfix /usr/lib/sasl2/smtpd.conf' - ), - 'restart' => array( - 'newaliases', - '/etc/init.d/postfix restart' - ) - ), - 'postfix_mxaccess' => array( - 'label' => 'Postfix MX-Access (anti spam)', - 'files' => array( - 'etc_postfix_mx_access' => '/etc/postfix/mx_access', - 'etc_postfix_main.cf' => '/etc/postfix/main.cf' - ), - 'commands_1' => array( - 'postmap /etc/postfix/mx_access' - ), - 'restart' => array( - '/etc/init.d/postfix restart' - ) - ) - ) - ), - 'mail' => array( - 'label' => $lng['admin']['configfiles']['mail'], - 'daemons' => array( - 'courier' => array( - 'label' => 'Courier', - 'files' => array( - 'etc_authlib_authdaemonrc' => '/etc/authlib/authdaemonrc', - 'etc_authlib_authmysqlrc' => '/etc/authlib/authmysqlrc' - ), - 'restart' => array( - '/etc/init.d/courier-authdaemon restart', - '/etc/init.d/courier-pop restart' - ) - ), - ) - ), - 'ftp' => array( - 'label' => $lng['admin']['configfiles']['ftp'], - 'daemons' => array( - 'proftpd' => array( - 'label' => 'ProFTPd', - 'files' => array( - 'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf', - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'restart' => array( - '/etc/init.d/proftpd restart' - ) - ), - ) - ), - 'etc' => array( - 'label' => $lng['admin']['configfiles']['etc'], - 'daemons' => array( - 'cron' => array( - 'label' => 'Crond (cronscript)', - 'files' => array( - 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' - ), - 'restart' => array( - Settings::Get('system.crondreload') - ) - ), - 'awstats' => array( - 'label' => 'Awstats', - 'commands' => array( - 'mv '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.conf').' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself' - ) - ) - ) - ) - ) - ) -); diff --git a/lib/configfiles/sle11.inc.php b/lib/configfiles/sle11.inc.php deleted file mode 100644 index 74ecaf07..00000000 --- a/lib/configfiles/sle11.inc.php +++ /dev/null @@ -1,267 +0,0 @@ - (2010-2011) - * @author Wolfgang Rosenauer (2011) - * @author Froxlor team (2011-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Configfiles - * - */ - -// Try to guess user/group from settings' email UID/GID -$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid')); -$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid')); - -/* If one of them are not set, call it 'vmail' and suggest creating user/group - * in scripts. */ -if ($vmail_user === false) { - $vmail_username="vmail"; -} else { - $vmail_username=$vmail_user['name']; -} -if ($vmail_group === false) { - $vmail_groupname="vmail"; -} else { - $vmail_groupname=$vmail_group['name']; -} - -return array( - 'sle_11' => array( - 'label' => 'SUSE Linux Enterprise 11', - 'services' => array( - 'http' => array( - 'label' => $lng['admin']['configfiles']['http'], - 'daemons' => array( - 'apache' => array( - 'label' => 'Apache', - 'commands' => array( - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - 'Maybe add to /etc/apache2/httpd.conf', - 'Alias /mail /srv/www/htdocs/roundcubemail', - 'Alias /webmail /srv/www/htdocs/squirrelmail', - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '' - ), - 'restart' => array( - ' '. - '/etc/init.d/apache2 restart' - ) - ), - ) - ), - 'dns' => array( - 'label' => $lng['admin']['configfiles']['dns'], - 'daemons' => array( - 'bind' => array( - 'label' => 'Bind9', - 'commands' => array( - 'Add froxlor_bind.conf to the NAMED_CONF_INCLUDE_FILES in /etc/sysconfig/named' - ), - 'restart' => array( - '/etc/init.d/named restart' - ) - ), - ) - ), - 'smtp' => array( - 'label' => $lng['admin']['configfiles']['smtp'], - 'daemons' => array( - 'postfix' => array( - 'label' => 'Postfix', - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql_virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql_virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql_virtual_mailbox_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' - ), - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R ' . $vmail_username . ':' . $vmail_groupname . ' ' . Settings::Get('system.vmail_homedir'), - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/sasl2/smtpd.conf', - 'chmod 660 /etc/postfix/mysql_virtual_alias_maps.cf', - 'chmod 660 /etc/postfix/mysql_virtual_mailbox_domains.cf', - 'chmod 660 /etc/postfix/mysql_virtual_mailbox_maps.cf', - 'chmod 660 /etc/sasl2/smtpd.conf', - 'chgrp postfix /etc/postfix/mysql_virtual_alias_maps.cf', - 'chgrp postfix /etc/postfix/mysql_virtual_mailbox_domains.cf', - 'chgrp postfix /etc/postfix/mysql_virtual_mailbox_maps.cf', - 'chgrp postfix /etc/sasl2/smtpd.conf' - ), - 'restart' => array( - '/etc/init.d/postfix restart' - ) - ), - 'postfix_mxaccess' => array( - 'label' => 'Postfix MX-Access (anti spam)', - 'files' => array( - 'etc_postfix_mx_access' => '/etc/postfix/mx_access', - 'etc_postfix_main.cf' => '/etc/postfix/main.cf' - ), - 'commands_1' => array( - 'postmap /etc/postfix/mx_access' - ), - 'restart' => array( - '/etc/init.d/postfix restart' - ) - ), - 'postfix_dovecot' => array( - 'label' => 'Postfix/Dovecot', - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'zypper install postfix postfix-mysql', - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_master.cf' => '/etc/postfix/master.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'restart' => array( - '/etc/init.d/postfix restart', - 'newaliases' - ) - ), - 'exim4' => array( - 'label' => 'Exim4', - 'commands_1' => array( - 'zypper install exim' - ), - 'files' => array( - 'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul', - 'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config', - 'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options', - 'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config', - 'etc_exim4_conf.d_transport_30_froxlor-config' => '/etc/exim4/conf.d/transport/30_froxlor-config' - ), - 'commands_2' => array( - 'chmod o-rx /var/lib/exim4', - 'chmod o-rx /etc/exim4/conf.d/main/10_froxlor-config_options' - ), - 'restart' => array( - '/etc/init.d/exim4 restart' - ) - ) - ) - ), - 'mail' => array( - 'label' => $lng['admin']['configfiles']['mail'], - 'daemons' => array( - 'courier' => array( - 'label' => 'Courier', - 'commands' => array( - 'zypper install courier-imap courier-authlib-mysql' - ), - 'files' => array( - 'etc_authlib_authdaemonrc' => '/etc/authlib/authdaemonrc', - 'etc_authlib_authmysqlrc' => '/etc/authlib/authmysqlrc' - ), - 'restart' => array( - '/etc/init.d/courier-authdaemon restart', - '/etc/init.d/courier-pop restart' - ) - ), - 'dovecot' => array( - 'label' => 'Dovecot 1.1', - 'commands_1' => array( - 'zypper install dovecot11' - ), - 'files' => array( - 'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf', - 'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf' - ), - 'commands_2' => array( - 'chmod 0640 /etc/dovecot/dovecot-sql.conf' - - ), - 'restart' => array( - '/etc/init.d/dovecot restart' - ) - ) - ) - ), - 'ftp' => array( - 'label' => $lng['admin']['configfiles']['ftp'], - 'daemons' => array( - 'proftpd' => array( - 'label' => 'ProFTPd', - 'files' => array( - 'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf', - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'restart' => array( - '/etc/init.d/proftpd restart' - ) - ), - 'pure-ftpd' => array( - 'label' => 'Pure-FTPd', - 'files' => array( - 'etc_pure-ftpd.conf' => '/etc/pure-ftpd/pure-ftpd.conf', - 'etc_pure-ftpd_mysql.conf' => '/etc/pure-ftpd/pure-ftpd-mysql.conf' - ), - 'restart' => array( - '/etc/init.d/pure-ftpd restart' - ) - ), - ) - ), - 'etc' => array( - 'label' => $lng['admin']['configfiles']['etc'], - 'daemons' => array( - 'cron' => array( - 'label' => 'Crond (cronscript)', - 'files' => array( - 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' - ), - 'restart' => array( - Settings::Get('system.crondreload') - ) - ), - 'awstats' => array( - 'label' => 'Awstats', - 'commands' => array( - 'cp /usr/share/doc/packages/awstats/awstats.model.conf /etc/awstats/', - 'sed -i.bak \'s/^DirData/# DirData/\''.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself' - ) - ) - ) - ) - ) - ) -); diff --git a/lib/configfiles/squeeze.inc.php b/lib/configfiles/squeeze.inc.php deleted file mode 100644 index b4e081c1..00000000 --- a/lib/configfiles/squeeze.inc.php +++ /dev/null @@ -1,418 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Configfiles - * - */ - -// Try to guess user/group from settings' email UID/GID -$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid')); -$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid')); - -/* If one of them are not set, call it 'vmail' and suggest creating user/group - * in scripts. */ -if ($vmail_user === false) { - $vmail_username="vmail"; -} else { - $vmail_username=$vmail_user['name']; -} -if ($vmail_group === false) { - $vmail_groupname="vmail"; -} else { - $vmail_groupname=$vmail_group['name']; -} - -return array( - 'debian_squeeze' => array( - 'label' => 'Debian 6.0 (Squeeze) [deprecated]', - 'services' => array( - 'http' => array( - 'label' => $lng['admin']['configfiles']['http'], - 'daemons' => array( - 'apache2' => array( - 'label' => 'Apache 2', - 'commands' => array( - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'a2dismod userdir' - ), - 'files' => ((int)Settings::Get('phpfpm.enabled') == 1) ? - array( - 'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf' - ) - : - null, - 'restart' => array( - '/etc/init.d/apache2 restart' - ), - ), - 'lighttpd' => array( - 'label' => 'Lighttpd Webserver', - 'commands_1' => array( - 'apt-get install lighttpd', - ), - 'files' => array( - 'etc_lighttpd.conf' => '/etc/lighttpd/lighttpd.conf', - ), - 'commands_2' => array( - $configcommand['vhost'], - $configcommand['diroptions'], - $configcommand['v_inclighty'], - $configcommand['d_inclighty'], - 'lighty-disable-mod cgi', - 'lighty-disable-mod fastcgi', - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir') - ), - 'restart' => array( - '/etc/init.d/lighttpd restart' - ) - ), - 'nginx' => array( - 'label' => 'Nginx Webserver', - 'commands_1' => array( - 'apt-get install nginx php5-cgi', - ), - 'files' => array( - 'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf', - 'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi' - ), - 'commands_2' => array( - 'rm /etc/nginx/sites-enabled/default', - 'mkdir -p ' . Settings::Get('system.documentroot_prefix'), - 'mkdir -p ' . Settings::Get('system.logfiles_directory'), - (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '', - 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), - 'chmod u+x /etc/init.d/php-fcgi' - ), - 'restart' => array( - '/etc/init.d/php-fcgi start', - '/etc/init.d/nginx restart' - ) - ) - ) - ), - 'dns' => array( - 'label' => $lng['admin']['configfiles']['dns'], - 'daemons' => array( - 'bind' => array( - 'label' => 'Bind9', - 'commands' => array( - 'apt-get install bind9', - 'echo "include \"' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf\";" >> /etc/bind/named.conf', - 'touch ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chown root:bind ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf', - 'chmod 0644 ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' - ), - 'restart' => array( - '/etc/init.d/bind9 restart' - ) - ), - 'powerdns' => array( - 'label' => 'PowerDNS', - 'files' => array( - 'etc_powerdns_pdns.conf' => '/etc/powerdns/pdns.conf', - 'etc_powerdns_pdns-froxlor.conf' => '/etc/powerdns/pdns_froxlor.conf', - ), - 'restart' => array( - '/etc/init.d/pdns restart' - ) - ), - ) - ), - 'smtp' => array( - 'label' => $lng['admin']['configfiles']['smtp'], - 'daemons' => array( - 'postfix_courier' => array( - 'label' => 'Postfix/Courier', - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' '.$vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . Settings::Get('system.vmail_homedir'), - 'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql', - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'touch /etc/postfix/sasl/smtpd.conf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/sasl/smtpd.conf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0600 /etc/postfix/sasl/smtpd.conf', - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf', - 'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf' - ), - 'restart' => array( - 'newaliases', - '/etc/init.d/postfix restart' - ) - ), - 'dkim' => array( - 'label' => 'DomainKey filter', - 'commands_1' => array( - 'apt-get install dkim-filter', - 'mkdir -p /etc/postfix/dkim' - ), - 'files' => array( - 'dkim-filter.conf' => '/etc/dkim-filter.conf' - ), - 'commands_2' => array( - 'echo "milter_default_action = accept" >> /etc/postfix/main.cf', - 'echo "milter_protocol = 2" >> /etc/postfix/main.cf', - 'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf', - 'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf' - ), - 'restart' => array( - '/etc/init.d/dkim-filter restart', - '/etc/init.d/postfix restart' - ) - ), - 'postfix_dovecot' => array( - 'label' => 'Postfix/Dovecot', - 'commands' => array( - ($vmail_group === false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' . $vmail_groupname : '', - ($vmail_user === false) ? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '', - 'mkdir -p ' . Settings::Get('system.vmail_homedir'), - 'chown -R ' . $vmail_username . ':' . $vmail_groupname . ' ' . Settings::Get('system.vmail_homedir'), - 'apt-get install postfix postfix-mysql', - 'mkdir -p /var/spool/postfix/etc/pam.d', - 'mkdir -p /var/spool/postfix/var/run/mysqld', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chown root:root /etc/postfix/main.cf', - 'chown root:root /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf', - 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0644 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'files' => array( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_master.cf' => '/etc/postfix/master.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf' - ), - 'restart' => array( - '/etc/init.d/postfix restart', - 'newaliases' - ) - ), - 'postfix_mxaccess' => array( - 'label' => 'Postfix MX-Access (anti spam)', - 'files' => array( - 'etc_postfix_mx_access' => '/etc/postfix/mx_access', - 'etc_postfix_main.cf' => '/etc/postfix/main.cf' - ), - 'commands_1' => array( - 'postmap /etc/postfix/mx_access' - ), - 'restart' => array( - '/etc/init.d/postfix restart' - ) - ), - 'exim4' => array( - 'label' => 'Exim4', - 'commands_1' => array( - 'dpkg-reconfigure exim4-config', - '# choose "no configuration at this time" and "splitted configuration files" in the dialog' - ), - 'files' => array( - 'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul', - 'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config', - 'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options', - 'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config', - 'etc_exim4_conf.d_transport_30_froxlor-config' => '/etc/exim4/conf.d/transport/30_froxlor-config' - ), - 'commands_2' => array( - 'chmod o-rx /var/lib/exim4', - 'chmod o-rx /etc/exim4/conf.d/main/10_froxlor-config_options' - ), - 'restart' => array( - '/etc/init.d/exim4 restart' - ) - ) - ) - ), - 'mail' => array( - 'label' => $lng['admin']['configfiles']['mail'], - 'daemons' => array( - 'courier' => array( - 'label' => 'Courier', - 'commands' => array( - 'apt-get install courier-pop courier-imap courier-authlib-mysql' - ), - 'files' => array( - 'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc', - 'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc' - ), - 'restart' => array( - '/etc/init.d/courier-authdaemon restart', - '/etc/init.d/courier-pop restart' - ) - ), - 'dovecot' => array( - 'label' => 'Dovecot', - 'commands_1' => array( - 'apt-get install dovecot-imapd dovecot-pop3d' - ), - 'files' => array( - 'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf', - 'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf' - ), - 'commands_2' => array( - 'chmod 0640 /etc/dovecot/dovecot-sql.conf' - ), - 'restart' => array( - '/etc/init.d/dovecot restart' - ) - ) - ) - ), - 'ftp' => array( - 'label' => $lng['admin']['configfiles']['ftp'], - 'daemons' => array( - 'proftpd' => array( - 'label' => 'ProFTPd', - 'commands' => array( - 'apt-get install proftpd-basic proftpd-mod-mysql' - ), - 'files' => array( - 'etc_proftpd_sql.conf' => '/etc/proftpd/sql.conf', - 'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf', - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'restart' => array( - '/etc/init.d/proftpd restart' - ) - ), - 'pure-ftpd' => array( - 'label' => 'Pure FTPd', - 'commands_1' => array( - 'apt-get install pure-ftpd-common pure-ftpd-mysql' - ), - 'files' => array( - 'etc_pure-ftpd_conf_MinUID' => '/etc/pure-ftpd/conf/MinUID', - 'etc_pure-ftpd_conf_MySQLConfigFile' => '/etc/pure-ftpd/conf/MySQLConfigFile', - 'etc_pure-ftpd_conf_NoAnonymous' => '/etc/pure-ftpd/conf/NoAnonymous', - 'etc_pure-ftpd_conf_MaxIdleTime' => '/etc/pure-ftpd/conf/MaxIdleTime', - 'etc_pure-ftpd_conf_ChrootEveryone' => '/etc/pure-ftpd/conf/ChrootEveryone', - 'etc_pure-ftpd_conf_PAMAuthentication' => '/etc/pure-ftpd/conf/PAMAuthentication', - 'etc_pure-ftpd_db_mysql.conf' => '/etc/pure-ftpd/db/mysql.conf', - 'etc_pure-ftpd_conf_CustomerProof' => '/etc/pure-ftpd/conf/CustomerProof', - 'etc_pure-ftpd_conf_Bind' => '/etc/pure-ftpd/conf/Bind', - 'etc_default_pure-ftpd-common' => '/etc/default/pure-ftpd-common' - ), - 'commands_2' => array( - 'chmod 0640 /etc/pure-ftpd/db/mysql.conf' - ), - 'restart' => array( - '/etc/init.d/pure-ftpd-mysql restart' - ) - ), - ) - ), - 'etc' => array( - 'label' => $lng['admin']['configfiles']['etc'], - 'daemons' => array( - 'cron' => array( - 'label' => 'Crond (cronscript)', - 'files' => array( - 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' - ), - 'restart' => array( - Settings::Get('system.crondreload') - ) - ), - 'awstats' => array( - 'label' => 'Awstats', - 'commands' => array( - 'apt-get install awstats', - 'cp /usr/share/awstats/tools/awstats_buildstaticpages.pl '.makeCorrectDir(Settings::Get('system.awstats_path')), - 'mv '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.conf').' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - 'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'), - '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself', - 'rm /etc/cron.d/awstats' - ), - ), - 'libnss' => array( - 'label' => 'libnss (system login with mysql)', - 'commands' => array( - 'apt-get install libnss-mysql nscd', - 'chmod 600 /etc/nss-mysql.conf /etc/nss-mysql-root.conf' - ), - 'files' => array( - 'etc_nss-mysql.conf' => '/etc/nss-mysql.conf', - 'etc_nss-mysql-root.conf' => '/etc/nss-mysql-root.conf', - 'etc_nsswitch.conf' => '/etc/nsswitch.conf', - ), - 'restart' => array( - '/etc/init.d/nscd restart' - ) - ), - 'logrotate' => array( - 'label' => 'Logrotate', - 'commands_1' => array( - 'apt-get install logrotate', - 'touch /etc/logrotate.d/froxlor', - 'chmod 644 /etc/logrotate.d/froxlor' - ), - 'files' => array( - 'etc_logrotated_froxlor' => '/etc/logrotate.d/froxlor' - ), - 'commands_2' => array( - '# apt automatically adds a daily cronjob for logrotate', - '# you do not have to do anything else :)' - ) - ) - ) - ) - ) - ) -); diff --git a/lib/configfiles_index.inc.php b/lib/configfiles_index.inc.php deleted file mode 100644 index 44308f06..00000000 --- a/lib/configfiles_index.inc.php +++ /dev/null @@ -1,58 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Lib - * - */ - -$configcommand = array(); - -$vhostDir = new frxDirectory(Settings::Get('system.apacheconf_vhost')); -$optsDir = new frxDirectory(Settings::Get('system.apacheconf_diroptions')); - -if ($vhostDir->isConfigDir()) { - $configcommand['vhost'] = 'mkdir -p ' . Settings::Get('system.apacheconf_vhost'); - $configcommand['v_inclighty'] = 'echo -e \'\\ninclude_shell "cat ' . makeCorrectDir(Settings::Get('system.apacheconf_vhost')) . '*.conf"\' >> /etc/lighttpd/lighttpd.conf'; - // this is only used for SUSE - can we check whether this is still needed? - $configcommand['include'] = 'echo -e "\\nInclude ' . makeCorrectDir(Settings::Get('system.apacheconf_vhost')) . '*.conf" >> ' . makeCorrectFile(makeCorrectDir('/etc/apache2/httpd.conf')); -} else { - $configcommand['vhost'] = 'touch ' . Settings::Get('system.apacheconf_vhost'); - $configcommand['v_inclighty'] = 'echo -e \'\\ninclude "' . Settings::Get('system.apacheconf_vhost') . '"\' >> /etc/lighttpd/lighttpd.conf'; - // this is only used for SUSE - can we check whether this is still needed? - $configcommand['include'] = 'echo -e "\\nInclude ' . Settings::Get('system.apacheconf_vhost') . '" >> ' . makeCorrectFile('/etc/apache2/httpd.conf'); -} - -if ($optsDir->isConfigDir()) { - $configcommand['diroptions'] = 'mkdir -p ' . Settings::Get('system.apacheconf_diroptions'); - $configcommand['d_inclighty'] = 'echo -e \'\\ninclude_shell "cat ' . makeCorrectDir(Settings::Get('system.apacheconf_diroptions')) . '*.conf"\' >> /etc/lighttpd/lighttpd.conf'; -} else { - $configcommand['diroptions'] = 'touch ' . Settings::Get('system.apacheconf_diroptions'); - $configcommand['d_inclighty'] = 'echo -e \'\\ninclude "' . Settings::Get('system.apacheconf_diroptions') . '"\' >> /etc/lighttpd/lighttpd.conf'; -} - -$cfgPath = 'lib/configfiles/'; -$configfiles = array(); -$configfiles = array_merge( - include $cfgPath . 'rhel7.inc.php', - include $cfgPath . 'wheezy.inc.php', - include $cfgPath . 'squeeze.inc.php', - include $cfgPath . 'trusty.inc.php', - include $cfgPath . 'precise.inc.php', - include $cfgPath . 'lucid.inc.php', - include $cfgPath . 'gentoo.inc.php', - include $cfgPath . 'sle11.inc.php', - include $cfgPath . 'sle10.inc.php', - include $cfgPath . 'freebsd.inc.php' -); diff --git a/templates/misc/configfiles/debian_squeeze/apache2/etc_apache2_mods-enabled_fastcgi.conf b/templates/misc/configfiles/debian_squeeze/apache2/etc_apache2_mods-enabled_fastcgi.conf deleted file mode 100644 index db1a4557..00000000 --- a/templates/misc/configfiles/debian_squeeze/apache2/etc_apache2_mods-enabled_fastcgi.conf +++ /dev/null @@ -1,10 +0,0 @@ - - FastCgiIpcDir - - - Order Deny,Allow - Deny from All - # Prevent accessing this path directly - Allow from env=REDIRECT_STATUS - - diff --git a/templates/misc/configfiles/debian_squeeze/courier/etc_courier_authdaemonrc b/templates/misc/configfiles/debian_squeeze/courier/etc_courier_authdaemonrc deleted file mode 100644 index 29346e54..00000000 --- a/templates/misc/configfiles/debian_squeeze/courier/etc_courier_authdaemonrc +++ /dev/null @@ -1,68 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $ -# -# Copyright 2000-2001 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:0 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authcustom authcram authuserdb authldap authmysql authpam - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:1 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authcustom authcram authuserdb authldap authmysql authpam" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: version:0 -# -# When you have multiple versions of authdaemond.* installed, authdaemond -# just picks the first one it finds. Set "version" to override that. -# For example: version=authdaemond.plain - -version="" - -##NAME: authdaemonvar:0 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/run/courier/authdaemon diff --git a/templates/misc/configfiles/debian_squeeze/courier/etc_courier_authmysqlrc b/templates/misc/configfiles/debian_squeeze/courier/etc_courier_authmysqlrc deleted file mode 100644 index 8e5eef90..00000000 --- a/templates/misc/configfiles/debian_squeeze/courier/etc_courier_authmysqlrc +++ /dev/null @@ -1,14 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 3306 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD uid -MYSQL_GID_FIELD gid -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD homedir -MYSQL_MAILDIR_FIELD maildir -MYSQL_QUOTA_FIELD (quota*1024*1024) -MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3) diff --git a/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor b/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor deleted file mode 100644 index ef6033d4..00000000 --- a/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the froxlor package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/debian_squeeze/dkim/dkim-filter.conf b/templates/misc/configfiles/debian_squeeze/dkim/dkim-filter.conf deleted file mode 100644 index ddb594b7..00000000 --- a/templates/misc/configfiles/debian_squeeze/dkim/dkim-filter.conf +++ /dev/null @@ -1,11 +0,0 @@ -# -# !!! DO NOT REPLACE THE ORIGINAL CONFIG WITH THIS FILE !!! -# -# Instead, just set the shown values in the file to the -# given values ;-) -# - -Syslog yes -Domain /etc/postfix/dkim/domains -KeyList /etc/postfix/dkim/dkim-keys.conf -Socket inet:8891@localhost diff --git a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot-sql.conf deleted file mode 100644 index fcf7c314..00000000 --- a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot-sql.conf +++ /dev/null @@ -1,5 +0,0 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve') -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') diff --git a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf deleted file mode 100644 index 3a4606ac..00000000 --- a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf +++ /dev/null @@ -1,87 +0,0 @@ -protocols = imap pop3 -listen = * -mail_access_groups = vmail -mail_debug = no -## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS -disable_plaintext_auth = no - -### SSL Settings -### After setting this options, set disable_plaintext_auth to yes (see above) -### and add imaps pop3s to the protocols -#ssl_cert_file = /etc/ssl/server/.pem -#ssl_key_file = /etc/ssl/server/.key -## This is an example with CACerts class3 cert! -#ssl_ca_file = /path/to/cacert.class3.crt -#ssl_cipher_list = ALL:!LOW:!SSLv2 - -protocol imap { - mail_plugins = quota imap_quota - # IMAP logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - imap_logout_format = in=%i out=%o -} - -protocol pop3 { - # leave this uncommented if you are migrating from Courier also see Migration from Courier - pop3_uidl_format = UID%u-%v - mail_plugins = quota - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s -} - -protocol lda { - # postmaster is the one in charge of the mail system. MUST be set to a valid address! - postmaster_address = postmaster@ - auth_socket_path = /var/run/dovecot/auth-master - mail_plugins = quota - sendmail_path = /usr/sbin/sendmail -} - -auth default { - mechanisms = plain login - passdb sql { - args = /etc/dovecot/dovecot-sql.conf - } - - userdb prefetch { - } - - userdb sql { - args = /etc/dovecot/dovecot-sql.conf - } - - user = vmail - socket listen { - # Postfix uses the client socket for SMTP Auth - client { - # Assuming the default Postfix $queue_directory setting - path = /var/spool/postfix/private/auth - mode = 0660 - # Assuming the default Postfix user and group - user = postfix - group = postfix - } - # Note that we're setting a master socket. SMTP AUTH for Postfix and Exim uses client sockets. - master { - path = /var/run/dovecot/auth-master - mode = 0660 - user = vmail - group = vmail - } - - } -} -plugin { - quota = maildir -} diff --git a/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul b/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul deleted file mode 100644 index 93bf877e..00000000 --- a/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul +++ /dev/null @@ -1,125 +0,0 @@ -### acl/30_exim4-config_check_rcpt -################################# - -acl_check_rcpt: - accept - hosts = : - - warn - hosts = +relay_from_hosts - control = submission/sender_retain - - .ifdef CHECK_RCPT_LOCAL_LOCALPARTS - deny - domains = +local_domains:+froxlor_domain - local_parts = CHECK_RCPT_LOCAL_LOCALPARTS - message = restricted characters in address - .endif - - .ifdef CHECK_RCPT_REMOTE_LOCALPARTS - deny - domains = !+local_domains - local_parts = CHECK_RCPT_REMOTE_LOCALPARTS - message = restricted characters in address - .endif - - accept - .ifndef CHECK_RCPT_POSTMASTER - local_parts = postmaster - .else - local_parts = CHECK_RCPT_POSTMASTER - .endif - domains = +local_domains:+froxlor_domain - - deny - message = sender envelope address $sender_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_local_deny_exceptions - senders = ${if exists{CONFDIR/local_sender_blacklist}\ - {CONFDIR/local_sender_blacklist}\ - {}} - - deny - message = sender IP address $sender_host_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_local_deny_exceptions - hosts = ${if exists{CONFDIR/local_host_blacklist}\ - {CONFDIR/local_host_blacklist}\ - {}} - - .ifdef CHECK_RCPT_VERIFY_SENDER - deny - message = Sender verification failed - !acl = acl_local_deny_exceptions - !verify = sender - .endif - - deny - !acl = acl_local_deny_exceptions - senders = ${if exists{CONFDIR/local_sender_callout}\ - {CONFDIR/local_sender_callout}\ - {}} - !verify = sender/callout - - deny - !acl = acl_local_deny_exceptions - recipients = ${if exists{CONFDIR/local_rcpt_callout}\ - {CONFDIR/local_rcpt_callout}\ - {}} - !verify = recipient/callout - - .ifdef CHECK_RCPT_REVERSE_DNS - warn - message = X-Host-Lookup-Failed: Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}}) - condition = ${if and{{def:sender_host_address}{!def:sender_host_name}}\ - {yes}{no}} - .endif - - .ifdef CHECK_RCPT_IP_DNSBLS - warn - message = X-Warning: $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - dnslists = CHECK_RCPT_IP_DNSBLS - .endif - - .ifdef CHECK_RCPT_DOMAIN_DNSBLS - warn - message = X-Warning: $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - !senders = ${if exists{CONFDIR/local_domain_dnsbl_whitelist}\ - {CONFDIR/local_domain_dnsbl_whitelist}\ - {}} - dnslists = CHECK_RCPT_DOMAIN_DNSBLS/$sender_address_domain - .endif - - .ifdef CHECK_RCPT_LOCAL_ACL_FILE - .include CHECK_RCPT_LOCAL_ACL_FILE - .endif - - accept - domains = +local_domains:+froxlor_domain - endpass - message = unknown user - verify = recipient - - accept - domains = +relay_to_domains - endpass - .ifdef CHECK_RCPT_GIVE_UNKNOWN_USER - message = ${if eq{$acl_verify_message}{Unrouteable address}{unknown user}{$acl_verify_message}} - .else - message = unrouteable address - .endif - verify = recipient - - ############ - # If control reaches this point, the domain is neither in +local_domains - # nor in +relay_to_domains. - ############ - - accept - hosts = +relay_from_hosts - - accept - authenticated = * - - deny - message = relay not permitted \ No newline at end of file diff --git a/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_auth_30_froxlor-config b/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_auth_30_froxlor-config deleted file mode 100644 index b0b13de8..00000000 --- a/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_auth_30_froxlor-config +++ /dev/null @@ -1,30 +0,0 @@ -### auth/30_froxlor-config -################################# - -plain_server: - driver = plaintext - public_name = PLAIN - server_condition = "${if and { \ - {!eq{$2}{}} \ - {!eq{$3}{}} \ - {crypteq{$3}{${lookup mysql{FROXLOR_AUTH_PLAIN}{$value}fail}}} \ - } {yes}{no}}" - server_set_id = $2 - server_prompts = : -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} -# .endif - -login_server: - driver = plaintext - public_name = LOGIN - server_prompts = "Username:: : Password::" - server_condition = "${if and { \ - {!eq{$1}{}} \ - {!eq{$2}{}} \ - {crypteq{$2}{${lookup mysql{FROXLOR_AUTH_LOGIN}{$value}fail}}} \ - } {yes}{no}}" - server_set_id = $1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} -# .endif \ No newline at end of file diff --git a/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_main_10_froxlor-config_options b/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_main_10_froxlor-config_options deleted file mode 100644 index 8a070db6..00000000 --- a/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_main_10_froxlor-config_options +++ /dev/null @@ -1,20 +0,0 @@ -hide mysql_servers = /// - -FROXLOR_LOCAL_DOMAIN = SELECT domain FROM panel_domains WHERE domain = '${quote_mysql:$domain}' AND isemaildomain = '1' - -FROXLOR_MAILALIAS = SELECT REPLACE(destination,' ',',') FROM mail_virtual WHERE \ - (( email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' ) \ - OR ( email = '@${quote_mysql:$domain}' AND iscatchall > 0 )) \ - AND destination <> '' AND destination <> ' ' ORDER BY iscatchall ASC LIMIT 1 - -FROXLOR_MAILUSER = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE \ - email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' AND postfix = 'y' - -FROXLOR_PARENT_DOMAIN = SELECT parent.domain FROM `panel_domains` AS parent INNER JOIN panel_domains AS alias \ - ON alias.domain = '${quote_mysql:$domain}' AND parent.id = alias.aliasdomain - -FROXLOR_AUTH_PLAIN = SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$2}' - -FROXLOR_AUTH_LOGIN = SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$1}' - -domainlist froxlor_domain = mysql;FROXLOR_LOCAL_DOMAIN \ No newline at end of file diff --git a/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_router_180_froxlor-config b/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_router_180_froxlor-config deleted file mode 100644 index dbb6a020..00000000 --- a/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_router_180_froxlor-config +++ /dev/null @@ -1,13 +0,0 @@ -froxlor_mailalias: - debug_print = "R: froxlor_mailalias for $local_part@$domain" - driver = redirect - domains = +froxlor_domain - data = ${lookup mysql {FROXLOR_MAILALIAS}{$value}fail} - -froxlor_mailuser: - debug_print = "R: froxlor_mailuser for $local_part@$domain" - driver = redirect - domains = +froxlor_domain - data = ${lookup mysql {FROXLOR_MAILUSER}{$value}fail} - directory_transport = maildir_froxlor - no_more \ No newline at end of file diff --git a/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_transport_30_froxlor-config b/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_transport_30_froxlor-config deleted file mode 100644 index 6f00c2f7..00000000 --- a/templates/misc/configfiles/debian_squeeze/exim4/etc_exim4_conf.d_transport_30_froxlor-config +++ /dev/null @@ -1,13 +0,0 @@ -maildir_froxlor: - debug_print = "T: maildir_froxlor for $local_part@$domain" - driver = appendfile - create_directory - delivery_date_add - envelope_to_add - return_path_add - maildir_format - directory_mode = 0770 - mode = 0660 - mode_fail_narrower = false - user = 2000 - group = 2000 \ No newline at end of file diff --git a/templates/misc/configfiles/debian_squeeze/libnss/etc_nss-mysql-root.conf b/templates/misc/configfiles/debian_squeeze/libnss/etc_nss-mysql-root.conf deleted file mode 100644 index 3c880f47..00000000 --- a/templates/misc/configfiles/debian_squeeze/libnss/etc_nss-mysql-root.conf +++ /dev/null @@ -1,16 +0,0 @@ -conf.version = 2; -shadow.host = inet::3306; -shadow.database = ; -shadow.db_user = ; -shadow.db_password = ; -shadow.table = ftp_users u; -shadow.where_clause = ; -shadow.userid_column = u.customerid; -shadow.user_column = u.username; -shadow.password_column = u.password; -shadow.lastchange_column = FLOOR(UNIX_TIMESTAMP()/86400-1); -shadow.min_column = 0; -shadow.max_column = 99999; -shadow.warn_column = 7; -shadow.inact_column = -1; -shadow.expire_column = -1; diff --git a/templates/misc/configfiles/debian_squeeze/libnss/etc_nss-mysql.conf b/templates/misc/configfiles/debian_squeeze/libnss/etc_nss-mysql.conf deleted file mode 100644 index 26dd9928..00000000 --- a/templates/misc/configfiles/debian_squeeze/libnss/etc_nss-mysql.conf +++ /dev/null @@ -1,24 +0,0 @@ -conf.version = 2; -users.host = inet::3306; -users.database = ; -users.db_user = ; -users.db_password = ; -users.table = ftp_users u; -users.where_clause = u.login_enabled = 'Y'; -users.user_column = u.username; -users.password_column = u.password; -users.userid_column = u.customerid; -users.uid_column = u.uid; -users.gid_column = u.gid; -users.realname_column = u.username; -users.homedir_column = u.homedir; -users.shell_column = u.shell; -groups.group_info_table = ftp_groups g; -groups.where_clause = ; -groups.group_name_column = g.groupname; -groups.groupid_column = g.id; -groups.gid_column = g.gid; -groups.password_column = "x"; -groups.members_table = ftp_groups ug; -groups.member_userid_column = ug.customerid; -groups.member_groupid_column = ug.id; diff --git a/templates/misc/configfiles/debian_squeeze/libnss/etc_nsswitch.conf b/templates/misc/configfiles/debian_squeeze/libnss/etc_nsswitch.conf deleted file mode 100644 index 22a74dda..00000000 --- a/templates/misc/configfiles/debian_squeeze/libnss/etc_nsswitch.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Make sure that `passwd`, `group` and `shadow` have mysql in their lines -# You should place mysql at the end, so that it is queried after the other mechanisams -# -passwd: compat mysql -group: compat mysql -shadow: compat mysql - -hosts: files dns -networks: files dns - -services: db files -protocols: db files -rpc: db files -ethers: db files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files \ No newline at end of file diff --git a/templates/misc/configfiles/debian_squeeze/lighttpd/etc_lighttpd.conf b/templates/misc/configfiles/debian_squeeze/lighttpd/etc_lighttpd.conf deleted file mode 100644 index 14e7e42f..00000000 --- a/templates/misc/configfiles/debian_squeeze/lighttpd/etc_lighttpd.conf +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# Default lighttpd.conf for Froxlor. -############################################################################### -var.basedir = "/var/www" -var.logdir = "/var/log/lighttpd" -var.statedir = "/var/lib/lighttpd" - -server.modules = ( - "mod_rewrite", - "mod_redirect", - "mod_alias", - "mod_access", - "mod_auth", - "mod_fastcgi", - "mod_cgi", - "mod_accesslog" -) - -server.username = "www-data" -server.groupname = "www-data" -server.document-root = var.basedir -server.pid-file = "/var/run/lighttpd.pid" -accesslog.filename = var.logdir + "/access.log" -server.errorlog = var.logdir + "/error.log" - -server.indexfiles = ("index.php", "index.html", - "index.htm", "default.htm") - -server.name = "" -server.port = 80 -server.bind = "" -url.access-deny = ("~", ".inc") - -fastcgi.server = ( -".php" => ( - "localhost" => ( - "socket" => "/tmp/lighttpd-fcgi-sock-lighttpd", - "broken-scriptfilename" => "enable", - "bin-path" => "/usr/bin/php5-cgi", - "min-procs" => 1, - "max-procs" => 1, - "max-load-per-proc" => 4, - "idle-timeout" => 60, - "bin-environment" => ( - "UID" => "www-data", - "GID" => "www-data", - "PHP_FCGI_CHILDREN" => "0", - "PHP_FCGI_MAX_REQUESTS" => "10000" - ), - "bin-copy-environment" => ( "" ) - ) - ) -) - -#### external configuration files -## mimetype mapping -include_shell "/usr/share/lighttpd/create-mime.assign.pl" diff --git a/templates/misc/configfiles/debian_squeeze/logrotate/etc_logrotated_froxlor b/templates/misc/configfiles/debian_squeeze/logrotate/etc_logrotated_froxlor deleted file mode 100644 index d7f7deeb..00000000 --- a/templates/misc/configfiles/debian_squeeze/logrotate/etc_logrotated_froxlor +++ /dev/null @@ -1,16 +0,0 @@ -# -# Froxlor logrotate snipet -# -*.log { - missingok - weekly - rotate 4 - compress - delaycompress - notifempty - create - sharedscripts - postrotate - > /dev/null 2>&1 || true - endscript -} diff --git a/templates/misc/configfiles/debian_squeeze/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/debian_squeeze/nginx/etc_init.d_php-fcgi deleted file mode 100644 index 29e0cc4a..00000000 --- a/templates/misc/configfiles/debian_squeeze/nginx/etc_init.d_php-fcgi +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -BIND="127.0.0.1:8888" -USER="www-data" -PHP_FCGI_CHILDREN="15" -PHP_FCGI_MAX_REQUESTS="1000" - -PHP_CGI="/usr/bin/php-cgi" -PHP_CGI_NAME="$(basename ${PHP_CGI})" -PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}" -RETVAL="0" - -start() { - echo -n "Starting PHP FastCGI: " - start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $PHP_CGI_ARGS - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} -stop() { - echo -n "Stopping PHP FastCGI: " - killall -q -w -u ${USER} ${PHP_CGI} - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "Usage: php-fastcgi {start|stop|restart}" - exit 1 - ;; -esac -exit "$RETVAL" diff --git a/templates/misc/configfiles/debian_squeeze/nginx/etc_nginx_fastcgi.conf b/templates/misc/configfiles/debian_squeeze/nginx/etc_nginx_fastcgi.conf deleted file mode 100644 index 10bcaba4..00000000 --- a/templates/misc/configfiles/debian_squeeze/nginx/etc_nginx_fastcgi.conf +++ /dev/null @@ -1,15 +0,0 @@ -fastcgi_param GATEWAY_INTERFACE CGI/1.1; -fastcgi_param SERVER_SOFTWARE nginx; -fastcgi_param QUERY_STRING $query_string; -fastcgi_param REQUEST_METHOD $request_method; -fastcgi_param CONTENT_TYPE $content_type; -fastcgi_param CONTENT_LENGTH $content_length; -fastcgi_param REQUEST_URI $request_uri; -fastcgi_param DOCUMENT_URI $document_uri; -fastcgi_param DOCUMENT_ROOT $document_root; -fastcgi_param SERVER_PROTOCOL $server_protocol; -fastcgi_param REMOTE_ADDR $remote_addr; -fastcgi_param REMOTE_PORT $remote_port; -fastcgi_param SERVER_ADDR $server_addr; -fastcgi_param SERVER_PORT $server_port; -fastcgi_param SERVER_NAME $server_name; diff --git a/templates/misc/configfiles/debian_squeeze/nginx/etc_nginx_nginx.conf b/templates/misc/configfiles/debian_squeeze/nginx/etc_nginx_nginx.conf deleted file mode 100644 index 7c49dc89..00000000 --- a/templates/misc/configfiles/debian_squeeze/nginx/etc_nginx_nginx.conf +++ /dev/null @@ -1,25 +0,0 @@ -user www-data; -worker_processes 4; - -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - access_log /var/log/nginx/access.log; - - sendfile on; - tcp_nodelay on; - - keepalive_timeout 65; - - gzip on; - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; -} diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf deleted file mode 100644 index 7bf3b4be..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf +++ /dev/null @@ -1,85 +0,0 @@ -## General Postfix configuration -# should be the default domain from your provider eg. "server100.provider.tld" -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes - -# Virtual delivery settings -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = $smtpd_tls_cert_file -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index 090b6465..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index b51c6397..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_sasl_smtpd.conf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_sasl_smtpd.conf deleted file mode 100644 index de3699d8..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_sasl_smtpd.conf +++ /dev/null @@ -1,11 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: plain login cram-md5 digest-md5 -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: SELECT password FROM mail_users WHERE username='%u@%r' OR email='%u@%r' \ No newline at end of file diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf deleted file mode 100644 index d3a9b332..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf +++ /dev/null @@ -1,91 +0,0 @@ -## General Postfix configuration -# should be the default domain from your provider eg. "server100.provider.tld" -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes -## Dovecot Settings for deliver, SASL Auth and virtual transport -smtpd_sasl_type = dovecot -mailbox_command = /usr/lib/dovecot/deliver -virtual_transport = dovecot -dovecot_destination_recipient_limit = 1 -smtpd_sasl_path = private/auth - -# Virtual delivery settings -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = $smtpd_tls_cert_file -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_master.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_master.cf deleted file mode 100644 index 678bb9cd..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_master.cf +++ /dev/null @@ -1,4 +0,0 @@ -# Add this lines to be able to use dovecot as delivery agent -# Dovecot LDA -dovecot unix - n n - - pipe - flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient} diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index 090b6465..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index a962d086..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/debian_squeeze/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/debian_squeeze/postfix_mxaccess/etc_postfix_main.cf deleted file mode 100644 index 82b23a03..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_mxaccess/etc_postfix_main.cf +++ /dev/null @@ -1,25 +0,0 @@ -# -# ATTENTION - this is not the full postfix-main.cf file -# -# it only provides additional configuration-entries! -# - -# -# look for the follow statement -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient - -# -# and extend it with the following line -# so it looks like this -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient, - check_recipient_mx_access cidr:/etc/postfix/mx_access diff --git a/templates/misc/configfiles/debian_squeeze/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/debian_squeeze/postfix_mxaccess/etc_postfix_mx_access deleted file mode 100644 index 18a1ec5f..00000000 --- a/templates/misc/configfiles/debian_squeeze/postfix_mxaccess/etc_postfix_mx_access +++ /dev/null @@ -1,9 +0,0 @@ -0.0.0.0/8 REJECT Domain MX in broadcast network -10.0.0.0/8 REJECT Domain MX in RFC 1918 private network -169.254.0.0/16 REJECT Domain MX in link local network -172.16.0.0/12 REJECT Domain MX in RFC 1918 private network -192.0.2.0/24 REJECT Domain MX in TEST-NET network -192.168.0.0/16 REJECT Domain MX in RFC 1918 private network -224.0.0.0/4 REJECT Domain MX in class D multicast network -240.0.0.0/5 REJECT Domain MX in class E reserved network -248.0.0.0/5 REJECT Domain MX in reserved network diff --git a/templates/misc/configfiles/debian_squeeze/powerdns/etc_powerdns_pdns-froxlor.conf b/templates/misc/configfiles/debian_squeeze/powerdns/etc_powerdns_pdns-froxlor.conf deleted file mode 100644 index 5e12377d..00000000 --- a/templates/misc/configfiles/debian_squeeze/powerdns/etc_powerdns_pdns-froxlor.conf +++ /dev/null @@ -1,7 +0,0 @@ -allow-axfr-ips= -#local-ipv6=YOUR_IPv6_(if_any) -bind-config=named.conf -bind-check-interval=180 -log-dns-details=yes -local-address=,127.0.0.1 - diff --git a/templates/misc/configfiles/debian_squeeze/powerdns/etc_powerdns_pdns.conf b/templates/misc/configfiles/debian_squeeze/powerdns/etc_powerdns_pdns.conf deleted file mode 100644 index 56d4b2a0..00000000 --- a/templates/misc/configfiles/debian_squeeze/powerdns/etc_powerdns_pdns.conf +++ /dev/null @@ -1,17 +0,0 @@ -allow-recursion=127.0.0.1 -config-dir=/etc/powerdns -daemon=yes -guardian=yes -launch=bind -lazy-recursion=yes -local-port=53 -master=yes -module-dir=/usr/lib/powerdns -setgid=pdns -setuid=pdns -socket-dir=/var/run -version-string=powerdns -bind-config=named.conf -bind-check-interval=300 -include=/etc/powerdns/pdns_froxlor.conf - diff --git a/templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_modules.conf b/templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_modules.conf deleted file mode 100644 index da6fb9c6..00000000 --- a/templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_modules.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# This file is used to manage DSO modules and features. -# - -# This is the directory where DSO modules reside - -ModulePath /usr/lib/proftpd - -# Allow only user root to load and unload modules, but allow everyone -# to see which modules have been loaded - -ModuleControlsACLs insmod,rmmod allow user root -ModuleControlsACLs lsmod allow user * - -LoadModule mod_ctrls_admin.c -LoadModule mod_tls.c - -# Install proftpd-mod-mysql or proftpd-mod-pgsql to use this -LoadModule mod_sql.c - -# Install proftpd-mod-ldap to use this -#LoadModule mod_ldap.c - -# -# 'SQLBackend mysql' or 'SQLBackend postgres' directives are required -# to have SQL authorization working. You can also comment out the -# unused module here, in alternative. -# - -# Install proftpd-mod-mysql to use this -LoadModule mod_sql_mysql.c - -# Install proftpd-mod-pgsql to use this -#LoadModule mod_sql_postgres.c - -#LoadModule mod_radius.c -LoadModule mod_quotatab.c -LoadModule mod_quotatab_file.c - -# Install proftpd-mod-ldap to use this -#LoadModule mod_quotatab_ldap.c - -# Install proftpd-mod-pgsql or proftpd-mod-mysql to use this -LoadModule mod_quotatab_sql.c -LoadModule mod_quotatab_radius.c -LoadModule mod_wrap.c -LoadModule mod_rewrite.c -LoadModule mod_load.c -LoadModule mod_ban.c -LoadModule mod_wrap2.c -LoadModule mod_wrap2_file.c -# Install proftpd-mod-pgsql or proftpd-mod-mysql to use this -#LoadModule mod_wrap2_sql.c -LoadModule mod_dynmasq.c - - -# keep this module the last one -LoadModule mod_ifsession.c diff --git a/templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index d50330c4..00000000 --- a/templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,131 +0,0 @@ -# -# /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file. -# To really apply changes reload proftpd after modifications. -# - -# Includes DSO modules -Include /etc/proftpd/modules.conf - -# Set off to disable IPv6 support which is annoying on IPv4 only boxes. -UseIPv6 on - -ServerName " FTP Server" -ServerType standalone -DeferWelcome off - -MultilineRFC2228 on -DefaultServer on -ShowSymlinks on - -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 1200 - -DisplayLogin welcome.msg -DisplayChdir .message true -ListOptions "-l" - -DenyFilter \*.*/ - -# Use this to jail all users in their homes -# DefaultRoot ~ - -# Users require a valid shell listed in /etc/shells to login. -# Use this directive to release that constrain. -# RequireValidShell off - -# Port 21 is the standard FTP port. -Port 21 - -# In some cases you have to specify passive ports range to by-pass -# firewall limitations. Ephemeral ports can be used for that, but -# feel free to use a more narrow range. -# PassivePorts 49152 65534 - -# If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public -# address and opening the passive ports used on your firewall as well. -# MasqueradeAddress 1.2.3.4 - -# This is useful for masquerading address with dynamic IPs: -# refresh any configured MasqueradeAddress directives every 8 hours - -# DynMasqRefresh 28800 - - -# To prevent DoS attacks, set the maximum number of child processes -# to 30. If you need to allow more than 30 concurrent connections -# at once, simply increase this value. Note that this ONLY works -# in standalone mode, in inetd mode you should use an inetd server -# that allows you to limit maximum number of processes per service -# (such as xinetd) -MaxInstances 30 - -# Set the user and group that the server normally runs at. -User proftpd -Group nogroup - -# Umask 022 is a good standard umask to prevent new files and dirs -# (second parm) from being group and world writable. -Umask 022 022 -# Normally, we want files to be overwriteable. -AllowOverwrite on - -# Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: -# PersistentPasswd off - -# This is required to use both PAM-based authentication and local passwords -# AuthOrder mod_auth_pam.c* mod_auth_unix.c - -# Be warned: use of this directive impacts CPU average load! -# Uncomment this if you like to see progress and transfer rate with ftpwho -# in downloads. That is not needed for uploads rates. -# -# UseSendFile off - -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - -# Allow up- and downloads to be continued -AllowRetrieveRestart On -AllowStoreRestart On - - -QuotaEngine on - - - -Ratios off - - - -# Delay engine reduces impact of the so-called Timing Attack described in -# http://security.lss.hr/index.php?page=details&ID=LSS-2004-10-02 -# It is on by default. - -DelayEngine off - - - -ControlsEngine off -ControlsMaxClients 2 -ControlsLog /var/log/proftpd/controls.log -ControlsInterval 5 -ControlsSocket /var/run/proftpd/proftpd.sock - - - -AdminControlsEngine off - - -# -# Alternative authentication frameworks -# -#Include /etc/proftpd/ldap.conf -Include /etc/proftpd/sql.conf - -# -# This is used for FTPS connections -# -#Include /etc/proftpd/tls.conf - diff --git a/templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_sql.conf b/templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_sql.conf deleted file mode 100644 index d05bdb3f..00000000 --- a/templates/misc/configfiles/debian_squeeze/proftpd/etc_proftpd_sql.conf +++ /dev/null @@ -1,37 +0,0 @@ - -DefaultRoot ~ -RequireValidShell off -AuthOrder mod_sql.c - -SQLBackend mysql -SQLEngine on -SQLAuthenticate on - -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -QuotaEngine on -QuotaShowQuotas on -QuotaDisplayUnits Mb -QuotaLock /var/lock/ftpd.quotatab.lock -QuotaLimitTable sql:/get-quota-limit -QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally -SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" -SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" -SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies -SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies - - diff --git a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_default_pure-ftpd-common b/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_default_pure-ftpd-common deleted file mode 100644 index b2653904..00000000 --- a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_default_pure-ftpd-common +++ /dev/null @@ -1,5 +0,0 @@ -STANDALONE_OR_INETD=standalone -VIRTUALCHROOT=false -UPLOADSCRIPT= -UPLOADUID= -UPLOADGID= diff --git a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_Bind b/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_Bind deleted file mode 100644 index aabe6ec3..00000000 --- a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_Bind +++ /dev/null @@ -1 +0,0 @@ -21 diff --git a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone b/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone deleted file mode 100644 index 7cfab5b0..00000000 --- a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_CustomerProof b/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_CustomerProof deleted file mode 100644 index d00491fd..00000000 --- a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_CustomerProof +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime b/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime deleted file mode 100644 index 60d3b2f4..00000000 --- a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime +++ /dev/null @@ -1 +0,0 @@ -15 diff --git a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MinUID b/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MinUID deleted file mode 100644 index 83b33d23..00000000 --- a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MinUID +++ /dev/null @@ -1 +0,0 @@ -1000 diff --git a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile b/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile deleted file mode 100644 index be85bafe..00000000 --- a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile +++ /dev/null @@ -1 +0,0 @@ -/etc/pure-ftpd/db/mysql.conf diff --git a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous b/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous deleted file mode 100644 index 7cfab5b0..00000000 --- a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication b/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication deleted file mode 100644 index 7ecb56eb..00000000 --- a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication +++ /dev/null @@ -1 +0,0 @@ -no diff --git a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_db_mysql.conf b/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_db_mysql.conf deleted file mode 100644 index 22ecee5c..00000000 --- a/templates/misc/configfiles/debian_squeeze/pure-ftpd/etc_pure-ftpd_db_mysql.conf +++ /dev/null @@ -1,11 +0,0 @@ -MYSQLServer -MYSQLUser -MYSQLPassword -MYSQLDatabase -MYSQLCrypt any - -MYSQLGetPW SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetUID SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetGID SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y" -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) diff --git a/templates/misc/configfiles/debian_wheezy/apache2/etc_apache2_mods-enabled_fastcgi.conf b/templates/misc/configfiles/debian_wheezy/apache2/etc_apache2_mods-enabled_fastcgi.conf deleted file mode 100644 index db1a4557..00000000 --- a/templates/misc/configfiles/debian_wheezy/apache2/etc_apache2_mods-enabled_fastcgi.conf +++ /dev/null @@ -1,10 +0,0 @@ - - FastCgiIpcDir - - - Order Deny,Allow - Deny from All - # Prevent accessing this path directly - Allow from env=REDIRECT_STATUS - - diff --git a/templates/misc/configfiles/debian_wheezy/courier/etc_courier_authdaemonrc b/templates/misc/configfiles/debian_wheezy/courier/etc_courier_authdaemonrc deleted file mode 100644 index e91853d7..00000000 --- a/templates/misc/configfiles/debian_wheezy/courier/etc_courier_authdaemonrc +++ /dev/null @@ -1,103 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.13 2005/10/05 00:07:32 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authpgsql authldap authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authuserdb authpam authpgsql authldap authmysql authcustom authpipe" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/run/courier/authdaemon - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" - -##NAME: LDAP_TLS_OPTIONS:0 -# -# Options documented in ldap.conf(5) can be set here, prefixed with 'LDAP'. -# Examples: -# -#LDAPTLS_CACERT=/path/to/cacert.pem -#LDAPTLS_REQCERT=demand -#LDAPTLS_CERT=/path/to/clientcert.pem -#LDAPTLS_KEY=/path/to/clientkey.pem diff --git a/templates/misc/configfiles/debian_wheezy/courier/etc_courier_authmysqlrc b/templates/misc/configfiles/debian_wheezy/courier/etc_courier_authmysqlrc deleted file mode 100644 index fd3da81c..00000000 --- a/templates/misc/configfiles/debian_wheezy/courier/etc_courier_authmysqlrc +++ /dev/null @@ -1,288 +0,0 @@ -##VERSION: $Id: authmysqlrc,v 1.20 2007/10/07 02:50:45 mrsam Exp $ -# -# Copyright 2000-2007 Double Precision, Inc. See COPYING for -# distribution information. -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# authmysqlrc created from authmysqlrc.dist by sysconftool -# -# DO NOT INSTALL THIS FILE with world read permissions. This file -# might contain the MySQL admin password! -# -# Each line in this file must follow the following format: -# -# field[spaces|tabs]value -# -# That is, the name of the field, followed by spaces or tabs, followed by -# field value. Trailing spaces are prohibited. - - -##NAME: LOCATION:0 -# -# The server name, userid, and password used to log in. - -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD - -##NAME: SSLINFO:0 -# -# The SSL information. -# -# To use SSL-encrypted connections, define the following variables (available -# in MySQL 4.0, or higher): -# -# -# MYSQL_SSL_KEY /path/to/file -# MYSQL_SSL_CERT /path/to/file -# MYSQL_SSL_CACERT /path/to/file -# MYSQL_SSL_CAPATH /path/to/file -# MYSQL_SSL_CIPHERS ALL:!DES - -##NAME: MYSQL_SOCKET:0 -# -# MYSQL_SOCKET can be used with MySQL version 3.22 or later, it specifies the -# filesystem pipe used for the connection -# -# MYSQL_SOCKET /var/run/mysqld/mysqld.sock - -##NAME: MYSQL_PORT:0 -# -# MYSQL_PORT can be used with MySQL version 3.22 or later to specify a port to -# connect to. - -MYSQL_PORT 0 - -##NAME: MYSQL_OPT:0 -# -# Leave MYSQL_OPT as 0, unless you know what you're doing. - -MYSQL_OPT 0 - -##NAME: MYSQL_DATABASE:0 -# -# The name of the MySQL database we will open: - -MYSQL_DATABASE - -#NAME: MYSQL_CHARACTER_SET:0 -# -# This is optional. MYSQL_CHARACTER_SET installs a character set. This option -# can be used with MySQL version 4.1 or later. MySQL supports 70+ collations -# for 30+ character sets. See MySQL documentations for more detalis. -# -# MYSQL_CHARACTER_SET latin1 - -##NAME: MYSQL_USER_TABLE:0 -# -# The name of the table containing your user data. See README.authmysqlrc -# for the required fields in this table. - -MYSQL_USER_TABLE mail_users - -##NAME: MYSQL_CRYPT_PWFIELD:0 -# -# Either MYSQL_CRYPT_PWFIELD or MYSQL_CLEAR_PWFIELD must be defined. Both -# are OK too. crypted passwords go into MYSQL_CRYPT_PWFIELD, cleartext -# passwords go into MYSQL_CLEAR_PWFIELD. Cleartext passwords allow -# CRAM-MD5 authentication to be implemented. - -MYSQL_CRYPT_PWFIELD password_enc - -##NAME: MYSQL_CLEAR_PWFIELD:0 -# -# -# MYSQL_CLEAR_PWFIELD clear - -##NAME: MYSQL_DEFAULT_DOMAIN:0 -# -# If DEFAULT_DOMAIN is defined, and someone tries to log in as 'user', -# we will look up 'user@DEFAULT_DOMAIN' instead. -# -# -# DEFAULT_DOMAIN example.com - -##NAME: MYSQL_UID_FIELD:0 -# -# Other fields in the mysql table: -# -# MYSQL_UID_FIELD - contains the numerical userid of the account -# -MYSQL_UID_FIELD uid - -##NAME: MYSQL_GID_FIELD:0 -# -# Numerical groupid of the account - -MYSQL_GID_FIELD gid - -##NAME: MYSQL_LOGIN_FIELD:0 -# -# The login id, default is id. Basically the query is: -# -# SELECT MYSQL_UID_FIELD, MYSQL_GID_FIELD, ... WHERE id='loginid' -# - -MYSQL_LOGIN_FIELD username - -##NAME: MYSQL_HOME_FIELD:0 -# - -MYSQL_HOME_FIELD homedir - -##NAME: MYSQL_NAME_FIELD:0 -# -# The user's name (optional) - -#MYSQL_NAME_FIELD name - -##NAME: MYSQL_MAILDIR_FIELD:0 -# -# This is an optional field, and can be used to specify an arbitrary -# location of the maildir for the account, which normally defaults to -# $HOME/Maildir (where $HOME is read from MYSQL_HOME_FIELD). -# -# You still need to provide a MYSQL_HOME_FIELD, even if you uncomment this -# out. -# -MYSQL_MAILDIR_FIELD maildir - -##NAME: MYSQL_DEFAULTDELIVERY:0 -# -# Courier mail server only: optional field specifies custom mail delivery -# instructions for this account (if defined) -- essentially overrides -# DEFAULTDELIVERY from ${sysconfdir}/courierd -# -# MYSQL_DEFAULTDELIVERY defaultdelivery - -##NAME: MYSQL_QUOTA_FIELD:0 -# -# Define MYSQL_QUOTA_FIELD to be the name of the field that can optionally -# specify a maildir quota. See README.maildirquota for more information -# -MYSQL_QUOTA_FIELD (quota*1024*1024) - -##NAME: MYSQL_AUXOPTIONS:0 -# -# Auxiliary options. The MYSQL_AUXOPTIONS field should be a char field that -# contains a single string consisting of comma-separated "ATTRIBUTE=NAME" -# pairs. These names are additional attributes that define various per-account -# "options", as given in INSTALL's description of the "Account OPTIONS" -# setting. -# -# MYSQL_AUXOPTIONS_FIELD auxoptions -# -# You might want to try something like this, if you'd like to use a bunch -# of individual fields, instead of a single text blob: -# -MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3) -# -# This will let you define fields called "disableimap", etc, with the end result -# being something that the OPTIONS parser understands. - - -##NAME: MYSQL_WHERE_CLAUSE:0 -# -# This is optional, MYSQL_WHERE_CLAUSE can be basically set to an arbitrary -# fixed string that is appended to the WHERE clause of our query -# -# MYSQL_WHERE_CLAUSE server='mailhost.example.com' - -##NAME: MYSQL_SELECT_CLAUSE:0 -# -# (EXPERIMENTAL) -# This is optional, MYSQL_SELECT_CLAUSE can be set when you have a database, -# which is structuraly different from proposed. The fixed string will -# be used to do a SELECT operation on database, which should return fields -# in order specified bellow: -# -# username, cryptpw, clearpw, uid, gid, home, maildir, quota, fullname, options -# -# The username field should include the domain (see example below). -# -# Enabling this option causes ignorance of any other field-related -# options, excluding default domain. -# -# There are two variables, which you can use. Substitution will be made -# for them, so you can put entered username (local part) and domain name -# in the right place of your query. These variables are: -# $(local_part), $(domain), $(service) -# -# If a $(domain) is empty (not given by the remote user) the default domain -# name is used in its place. -# -# $(service) will expand out to the service being authenticated: imap, imaps, -# pop3 or pop3s. Courier mail server only: service will also expand out to -# "courier", when searching for local mail account's location. In this case, -# if the "maildir" field is not empty it will be used in place of -# DEFAULTDELIVERY. Courier mail server will also use esmtp when doing -# authenticated ESMTP. -# -# This example is a little bit modified adaptation of vmail-sql -# database scheme: -# -# MYSQL_SELECT_CLAUSE SELECT CONCAT(popbox.local_part, '@', popbox.domain_name), \ -# CONCAT('{MD5}', popbox.password_hash), \ -# popbox.clearpw, \ -# domain.uid, \ -# domain.gid, \ -# CONCAT(domain.path, '/', popbox.mbox_name), \ -# '', \ -# domain.quota, \ -# '', \ -# CONCAT("disableimap=",disableimap,",disablepop3=", \ -# disablepop3,",disablewebmail=",disablewebmail, \ -# ",sharedgroup=",sharedgroup) \ -# FROM popbox, domain \ -# WHERE popbox.local_part = '$(local_part)' \ -# AND popbox.domain_name = '$(domain)' \ -# AND popbox.domain_name = domain.domain_name - - -##NAME: MYSQL_ENUMERATE_CLAUSE:1 -# -# {EXPERIMENTAL} -# Optional custom SQL query used to enumerate accounts for authenumerate, -# in order to compile a list of accounts for shared folders. The query -# should return the following fields: name, uid, gid, homedir, maildir, options -# -# Example: -# MYSQL_ENUMERATE_CLAUSE SELECT CONCAT(popbox.local_part, '@', popbox.domain_name), \ -# domain.uid, \ -# domain.gid, \ -# CONCAT(domain.path, '/', popbox.mbox_name), \ -# '', \ -# CONCAT('sharedgroup=', sharedgroup) \ -# FROM popbox, domain \ -# WHERE popbox.local_part = '$(local_part)' \ -# AND popbox.domain_name = '$(domain)' \ -# AND popbox.domain_name = domain.domain_name - - - -##NAME: MYSQL_CHPASS_CLAUSE:0 -# -# (EXPERIMENTAL) -# This is optional, MYSQL_CHPASS_CLAUSE can be set when you have a database, -# which is structuraly different from proposed. The fixed string will -# be used to do an UPDATE operation on database. In other words, it is -# used, when changing password. -# -# There are four variables, which you can use. Substitution will be made -# for them, so you can put entered username (local part) and domain name -# in the right place of your query. There variables are: -# $(local_part) , $(domain) , $(newpass) , $(newpass_crypt) -# -# If a $(domain) is empty (not given by the remote user) the default domain -# name is used in its place. -# $(newpass) contains plain password -# $(newpass_crypt) contains its crypted form -# -# MYSQL_CHPASS_CLAUSE UPDATE popbox \ -# SET clearpw='$(newpass)', \ -# password_hash='$(newpass_crypt)' \ -# WHERE local_part='$(local_part)' \ -# AND domain_name='$(domain)' -# diff --git a/templates/misc/configfiles/debian_wheezy/cron/etc_cron.d_froxlor b/templates/misc/configfiles/debian_wheezy/cron/etc_cron.d_froxlor deleted file mode 100644 index ef6033d4..00000000 --- a/templates/misc/configfiles/debian_wheezy/cron/etc_cron.d_froxlor +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the froxlor package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/debian_wheezy/dkim/opendkim.conf b/templates/misc/configfiles/debian_wheezy/dkim/opendkim.conf deleted file mode 100644 index 6e2ba79d..00000000 --- a/templates/misc/configfiles/debian_wheezy/dkim/opendkim.conf +++ /dev/null @@ -1,36 +0,0 @@ -# This is a basic configuration that can easily be adapted to suit a standard -# installation. For more advanced options, see opendkim.conf(5) and/or -# /usr/share/doc/opendkim/examples/opendkim.conf.sample. - -# Log to syslog -Syslog yes -# Required to use local socket with MTAs that access the socket as a non- -# privileged user (e.g. Postfix) -UMask 002 - -# Sign for example.com with key in /etc/mail/dkim.key using -# selector '2007' (e.g. 2007._domainkey.example.com) -#Domain example.com -#KeyFile /etc/mail/dkim.key -#Selector 2007 - -Domain /etc/postfix/dkim/domains -KeyList /etc/postfix/dkim/dkim-keys.conf - -# Commonly-used options; the commented-out versions show the defaults. -#Canonicalization simple -#Mode sv -#SubDomains no -#ADSPDiscard no - -# Always oversign From (sign using actual From and a null From to prevent -# malicious signatures header fields (From and/or others) between the signer -# and the verifier. From is oversigned by default in the Debian pacakge -# because it is often the identity key used by reputation systems and thus -# somewhat security sensitive. -OversignHeaders From - -# List domains to use for RFC 6541 DKIM Authorized Third-Party Signatures -# (ATPS) (experimental) - -#ATPSDomains example.com \ No newline at end of file diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-auth.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-auth.conf deleted file mode 100644 index c94436f3..00000000 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-auth.conf +++ /dev/null @@ -1,127 +0,0 @@ -## -## Authentication processes -## - -# Disable LOGIN command and all other plaintext authentications unless -# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP -# matches the local IP (ie. you're connecting from the same computer), the -# connection is considered secure and plaintext authentication is allowed. -disable_plaintext_auth = no - -# Authentication cache size (e.g. 10M). 0 means it's disabled. Note that -# bsdauth, PAM and vpopmail require cache_key to be set for caching to be used. -#auth_cache_size = 0 -# Time to live for cached data. After TTL expires the cached record is no -# longer used, *except* if the main database lookup returns internal failure. -# We also try to handle password changes automatically: If user's previous -# authentication was successful, but this one wasn't, the cache isn't used. -# For now this works only with plaintext authentication. -#auth_cache_ttl = 1 hour -# TTL for negative hits (user not found, password mismatch). -# 0 disables caching them completely. -#auth_cache_negative_ttl = 1 hour - -# Space separated list of realms for SASL authentication mechanisms that need -# them. You can leave it empty if you don't want to support multiple realms. -# Many clients simply use the first one listed here, so keep the default realm -# first. -#auth_realms = - -# Default realm/domain to use if none was specified. This is used for both -# SASL realms and appending @domain to username in plaintext logins. -#auth_default_realm = - -# List of allowed characters in username. If the user-given username contains -# a character not listed in here, the login automatically fails. This is just -# an extra check to make sure user can't exploit any potential quote escaping -# vulnerabilities with SQL/LDAP databases. If you want to allow all characters, -# set this value to empty. -#auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ - -# Username character translations before it's looked up from databases. The -# value contains series of from -> to characters. For example "#@/@" means -# that '#' and '/' characters are translated to '@'. -#auth_username_translation = - -# Username formatting before it's looked up from databases. You can use -# the standard variables here, eg. %Lu would lowercase the username, %n would -# drop away the domain if it was given, or "%n-AT-%d" would change the '@' into -# "-AT-". This translation is done after auth_username_translation changes. -#auth_username_format = %Lu - -# If you want to allow master users to log in by specifying the master -# username within the normal username string (ie. not using SASL mechanism's -# support for it), you can specify the separator character here. The format -# is then . UW-IMAP uses "*" as the -# separator, so that could be a good choice. -#auth_master_user_separator = - -# Username to use for users logging in with ANONYMOUS SASL mechanism -#auth_anonymous_username = anonymous - -# Maximum number of dovecot-auth worker processes. They're used to execute -# blocking passdb and userdb queries (eg. MySQL and PAM). They're -# automatically created and destroyed as needed. -#auth_worker_max_count = 30 - -# Host name to use in GSSAPI principal names. The default is to use the -# name returned by gethostname(). Use "$ALL" (with quotes) to allow all keytab -# entries. -#auth_gssapi_hostname = - -# Kerberos keytab to use for the GSSAPI mechanism. Will use the system -# default (usually /etc/krb5.keytab) if not specified. You may need to change -# the auth service to run as root to be able to read this file. -#auth_krb5_keytab = - -# Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and -# ntlm_auth helper. -#auth_use_winbind = no - -# Path for Samba's ntlm_auth helper binary. -#auth_winbind_helper_path = /usr/bin/ntlm_auth - -# Time to delay before replying to failed authentications. -#auth_failure_delay = 2 secs - -# Require a valid SSL client certificate or the authentication fails. -#auth_ssl_require_client_cert = no - -# Take the username from client's SSL certificate, using -# X509_NAME_get_text_by_NID() which returns the subject's DN's -# CommonName. -#auth_ssl_username_from_cert = no - -# Space separated list of wanted authentication mechanisms: -# plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey -# gss-spnego -# NOTE: See also disable_plaintext_auth setting. -auth_mechanisms = plain login - -## -## Password and user databases -## - -# -# Password database is used to verify user's password (and nothing more). -# You can have multiple passdbs and userdbs. This is useful if you want to -# allow both system users (/etc/passwd) and virtual users to login without -# duplicating the system users into virtual database. -# -# -# -# User database specifies where mails are located and what user/group IDs -# own them. For single-UID configuration use "static" userdb. -# -# - -#!include auth-deny.conf.ext -#!include auth-master.conf.ext - -#!include auth-system.conf.ext -!include auth-sql.conf.ext -#!include auth-ldap.conf.ext -#!include auth-passwdfile.conf.ext -#!include auth-checkpassword.conf.ext -#!include auth-vpopmail.conf.ext -#!include auth-static.conf.ext diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-mail.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-mail.conf deleted file mode 100644 index cb81b559..00000000 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-mail.conf +++ /dev/null @@ -1,362 +0,0 @@ -## -## Mailbox locations and namespaces -## - -# Location for users' mailboxes. The default is empty, which means that Dovecot -# tries to find the mailboxes automatically. This won't work if the user -# doesn't yet have any mail, so you should explicitly tell Dovecot the full -# location. -# -# If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u) -# isn't enough. You'll also need to tell Dovecot where the other mailboxes are -# kept. This is called the "root mail directory", and it must be the first -# path given in the mail_location setting. -# -# There are a few special variables you can use, eg.: -# -# %u - username -# %n - user part in user@domain, same as %u if there's no domain -# %d - domain part in user@domain, empty if there's no domain -# %h - home directory -# -# See doc/wiki/Variables.txt for full list. Some examples: -# -# mail_location = maildir:~/Maildir -# mail_location = mbox:~/mail:INBOX=/var/mail/%u -# mail_location = mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%n -# -# -# -mail_location = mbox:~/mail:INBOX=/var/mail/%u - -# If you need to set multiple mailbox locations or want to change default -# namespace settings, you can do it by defining namespace sections. -# -# You can have private, shared and public namespaces. Private namespaces -# are for user's personal mails. Shared namespaces are for accessing other -# users' mailboxes that have been shared. Public namespaces are for shared -# mailboxes that are managed by sysadmin. If you create any shared or public -# namespaces you'll typically want to enable ACL plugin also, otherwise all -# users can access all the shared mailboxes, assuming they have permissions -# on filesystem level to do so. -namespace inbox { - # Namespace type: private, shared or public - #type = private - - # Hierarchy separator to use. You should use the same separator for all - # namespaces or some clients get confused. '/' is usually a good one. - # The default however depends on the underlying mail storage format. - #separator = - - # Prefix required to access this namespace. This needs to be different for - # all namespaces. For example "Public/". - #prefix = - - # Physical location of the mailbox. This is in same format as - # mail_location, which is also the default for it. - #location = - - # There can be only one INBOX, and this setting defines which namespace - # has it. - inbox = yes - - # If namespace is hidden, it's not advertised to clients via NAMESPACE - # extension. You'll most likely also want to set list=no. This is mostly - # useful when converting from another server with different namespaces which - # you want to deprecate but still keep working. For example you can create - # hidden namespaces with prefixes "~/mail/", "~%u/mail/" and "mail/". - #hidden = no - - # Show the mailboxes under this namespace with LIST command. This makes the - # namespace visible for clients that don't support NAMESPACE extension. - # "children" value lists child mailboxes, but hides the namespace prefix. - #list = yes - - # Namespace handles its own subscriptions. If set to "no", the parent - # namespace handles them (empty prefix should always have this as "yes") - #subscriptions = yes -} - -# Example shared namespace configuration -#namespace { - #type = shared - #separator = / - - # Mailboxes are visible under "shared/user@domain/" - # %%n, %%d and %%u are expanded to the destination user. - #prefix = shared/%%u/ - - # Mail location for other users' mailboxes. Note that %variables and ~/ - # expands to the logged in user's data. %%n, %%d, %%u and %%h expand to the - # destination user's data. - #location = maildir:%%h/Maildir:INDEX=~/Maildir/shared/%%u - - # Use the default namespace for saving subscriptions. - #subscriptions = no - - # List the shared/ namespace only if there are visible shared mailboxes. - #list = children -#} -# Should shared INBOX be visible as "shared/user" or "shared/user/INBOX"? -#mail_shared_explicit_inbox = yes - -# System user and group used to access mails. If you use multiple, userdb -# can override these by returning uid or gid fields. You can use either numbers -# or names. -#mail_uid = -#mail_gid = - -# Group to enable temporarily for privileged operations. Currently this is -# used only with INBOX when either its initial creation or dotlocking fails. -# Typically this is set to "mail" to give access to /var/mail. -#mail_privileged_group = - -# Grant access to these supplementary groups for mail processes. Typically -# these are used to set up access to shared mailboxes. Note that it may be -# dangerous to set these if users can create symlinks (e.g. if "mail" group is -# set here, ln -s /var/mail ~/mail/var could allow a user to delete others' -# mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it). -mail_access_groups = vmail - -# Allow full filesystem access to clients. There's no access checks other than -# what the operating system does for the active UID/GID. It works with both -# maildir and mboxes, allowing you to prefix mailboxes names with eg. /path/ -# or ~user/. -#mail_full_filesystem_access = no - -## -## Mail processes -## - -# Don't use mmap() at all. This is required if you store indexes to shared -# filesystems (NFS or clustered filesystem). -#mmap_disable = no - -# Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL -# since version 3, so this should be safe to use nowadays by default. -#dotlock_use_excl = yes - -# When to use fsync() or fdatasync() calls: -# optimized (default): Whenever necessary to avoid losing important data -# always: Useful with e.g. NFS when write()s are delayed -# never: Never use it (best performance, but crashes can lose data) -#mail_fsync = optimized - -# Mail storage exists in NFS. Set this to yes to make Dovecot flush NFS caches -# whenever needed. If you're using only a single mail server this isn't needed. -#mail_nfs_storage = no -# Mail index files also exist in NFS. Setting this to yes requires -# mmap_disable=yes and fsync_disable=no. -#mail_nfs_index = no - -# Locking method for index files. Alternatives are fcntl, flock and dotlock. -# Dotlocking uses some tricks which may create more disk I/O than other locking -# methods. NFS users: flock doesn't work, remember to change mmap_disable. -#lock_method = fcntl - -# Directory in which LDA/LMTP temporarily stores incoming mails >128 kB. -#mail_temp_dir = /tmp - -# Valid UID range for users, defaults to 500 and above. This is mostly -# to make sure that users can't log in as daemons or other system users. -# Note that denying root logins is hardcoded to dovecot binary and can't -# be done even if first_valid_uid is set to 0. -#first_valid_uid = 500 -#last_valid_uid = 0 - -# Valid GID range for users, defaults to non-root/wheel. Users having -# non-valid GID as primary group ID aren't allowed to log in. If user -# belongs to supplementary groups with non-valid GIDs, those groups are -# not set. -#first_valid_gid = 1 -#last_valid_gid = 0 - -# Maximum allowed length for mail keyword name. It's only forced when trying -# to create new keywords. -#mail_max_keyword_length = 50 - -# ':' separated list of directories under which chrooting is allowed for mail -# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too). -# This setting doesn't affect login_chroot, mail_chroot or auth chroot -# settings. If this setting is empty, "/./" in home dirs are ignored. -# WARNING: Never add directories here which local users can modify, that -# may lead to root exploit. Usually this should be done only if you don't -# allow shell access for users. -#valid_chroot_dirs = - -# Default chroot directory for mail processes. This can be overridden for -# specific users in user database by giving /./ in user's home directory -# (eg. /home/./user chroots into /home). Note that usually there is no real -# need to do chrooting, Dovecot doesn't allow users to access files outside -# their mail directory anyway. If your home directories are prefixed with -# the chroot directory, append "/." to mail_chroot. -#mail_chroot = - -# UNIX socket path to master authentication server to find users. -# This is used by imap (for shared users) and lda. -#auth_socket_path = /var/run/dovecot/auth-userdb - -# Directory where to look up mail plugins. -#mail_plugin_dir = /usr/lib/dovecot/modules - -# Space separated list of plugins to load for all services. Plugins specific to -# IMAP, LDA, etc. are added to this list in their own .conf files. -#mail_plugins = - -## -## Mailbox handling optimizations -## - -# The minimum number of mails in a mailbox before updates are done to cache -# file. This allows optimizing Dovecot's behavior to do less disk writes at -# the cost of more disk reads. -#mail_cache_min_mail_count = 0 - -# When IDLE command is running, mailbox is checked once in a while to see if -# there are any new mails or other changes. This setting defines the minimum -# time to wait between those checks. Dovecot can also use dnotify, inotify and -# kqueue to find out immediately when changes occur. -#mailbox_idle_check_interval = 30 secs - -# Save mails with CR+LF instead of plain LF. This makes sending those mails -# take less CPU, especially with sendfile() syscall with Linux and FreeBSD. -# But it also creates a bit more disk I/O which may just make it slower. -# Also note that if other software reads the mboxes/maildirs, they may handle -# the extra CRs wrong and cause problems. -#mail_save_crlf = no - -# Max number of mails to keep open and prefetch to memory. This only works with -# some mailbox formats and/or operating systems. -#mail_prefetch_count = 0 - -# How often to scan for stale temporary files and delete them (0 = never). -# These should exist only after Dovecot dies in the middle of saving mails. -#mail_temp_scan_interval = 1w - -## -## Maildir-specific settings -## - -# By default LIST command returns all entries in maildir beginning with a dot. -# Enabling this option makes Dovecot return only entries which are directories. -# This is done by stat()ing each entry, so it causes more disk I/O. -# (For systems setting struct dirent->d_type, this check is free and it's -# done always regardless of this setting) -#maildir_stat_dirs = no - -# When copying a message, do it with hard links whenever possible. This makes -# the performance much better, and it's unlikely to have any side effects. -#maildir_copy_with_hardlinks = yes - -# Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only -# when its mtime changes unexpectedly or when we can't find the mail otherwise. -#maildir_very_dirty_syncs = no - -# If enabled, Dovecot doesn't use the S= in the Maildir filenames for -# getting the mail's physical size, except when recalculating Maildir++ quota. -# This can be useful in systems where a lot of the Maildir filenames have a -# broken size. The performance hit for enabling this is very small. -#maildir_broken_filename_sizes = no - -## -## mbox-specific settings -## - -# Which locking methods to use for locking mbox. There are four available: -# dotlock: Create .lock file. This is the oldest and most NFS-safe -# solution. If you want to use /var/mail/ like directory, the users -# will need write access to that directory. -# dotlock_try: Same as dotlock, but if it fails because of permissions or -# because there isn't enough disk space, just skip it. -# fcntl : Use this if possible. Works with NFS too if lockd is used. -# flock : May not exist in all systems. Doesn't work with NFS. -# lockf : May not exist in all systems. Doesn't work with NFS. -# -# You can use multiple locking methods; if you do the order they're declared -# in is important to avoid deadlocks if other MTAs/MUAs are using multiple -# locking methods as well. Some operating systems don't allow using some of -# them simultaneously. -#mbox_read_locks = fcntl -#mbox_write_locks = dotlock fcntl - -# Maximum time to wait for lock (all of them) before aborting. -#mbox_lock_timeout = 5 mins - -# If dotlock exists but the mailbox isn't modified in any way, override the -# lock file after this much time. -#mbox_dotlock_change_timeout = 2 mins - -# When mbox changes unexpectedly we have to fully read it to find out what -# changed. If the mbox is large this can take a long time. Since the change -# is usually just a newly appended mail, it'd be faster to simply read the -# new mails. If this setting is enabled, Dovecot does this but still safely -# fallbacks to re-reading the whole mbox file whenever something in mbox isn't -# how it's expected to be. The only real downside to this setting is that if -# some other MUA changes message flags, Dovecot doesn't notice it immediately. -# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK -# commands. -#mbox_dirty_syncs = yes - -# Like mbox_dirty_syncs, but don't do full syncs even with SELECT, EXAMINE, -# EXPUNGE or CHECK commands. If this is set, mbox_dirty_syncs is ignored. -#mbox_very_dirty_syncs = no - -# Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK -# commands and when closing the mailbox). This is especially useful for POP3 -# where clients often delete all mails. The downside is that our changes -# aren't immediately visible to other MUAs. -#mbox_lazy_writes = yes - -# If mbox size is smaller than this (e.g. 100k), don't write index files. -# If an index file already exists it's still read, just not updated. -#mbox_min_index_size = 0 - -# Mail header selection algorithm to use for MD5 POP3 UIDLs when -# pop3_uidl_format=%m. For backwards compatibility we use apop3d inspired -# algorithm, but it fails if the first Received: header isn't unique in all -# mails. An alternative algorithm is "all" that selects all headers. -#mbox_md5 = apop3d - -## -## mdbox-specific settings -## - -# Maximum dbox file size until it's rotated. -#mdbox_rotate_size = 2M - -# Maximum dbox file age until it's rotated. Typically in days. Day begins -# from midnight, so 1d = today, 2d = yesterday, etc. 0 = check disabled. -#mdbox_rotate_interval = 0 - -# When creating new mdbox files, immediately preallocate their size to -# mdbox_rotate_size. This setting currently works only in Linux with some -# filesystems (ext4, xfs). -#mdbox_preallocate_space = no - -## -## Mail attachments -## - -# sdbox and mdbox support saving mail attachments to external files, which -# also allows single instance storage for them. Other backends don't support -# this for now. - -# WARNING: This feature hasn't been tested much yet. Use at your own risk. - -# Directory root where to store mail attachments. Disabled, if empty. -#mail_attachment_dir = - -# Attachments smaller than this aren't saved externally. It's also possible to -# write a plugin to disable saving specific attachments externally. -#mail_attachment_min_size = 128k - -# Filesystem backend to use for saving attachments: -# posix : No SiS done by Dovecot (but this might help FS's own deduplication) -# sis posix : SiS with immediate byte-by-byte comparison during saving -# sis-queue posix : SiS with delayed comparison and deduplication -#mail_attachment_fs = sis posix - -# Hash format to use in attachment filenames. You can add any text and -# variables: %{md4}, %{md5}, %{sha1}, %{sha256}, %{sha512}, %{size}. -# Variables can be truncated, e.g. %{sha256:80} returns only first 80 bits -#mail_attachment_hash = %{sha1} diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-master.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-master.conf deleted file mode 100644 index 72ed2a15..00000000 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-master.conf +++ /dev/null @@ -1,126 +0,0 @@ -#default_process_limit = 100 -#default_client_limit = 1000 - -# Default VSZ (virtual memory size) limit for service processes. This is mainly -# intended to catch and kill processes that leak memory before they eat up -# everything. -#default_vsz_limit = 256M - -# Login user is internally used by login processes. This is the most untrusted -# user in Dovecot system. It shouldn't have access to anything at all. -#default_login_user = dovenull - -# Internal user is used by unprivileged processes. It should be separate from -# login user, so that login processes can't disturb other processes. -#default_internal_user = dovecot - -service imap-login { - inet_listener imap { - #port = 143 - } - inet_listener imaps { - #port = 993 - #ssl = yes - } - - # Number of connections to handle before starting a new process. Typically - # the only useful values are 0 (unlimited) or 1. 1 is more secure, but 0 - # is faster. - #service_count = 1 - - # Number of processes to always keep waiting for more connections. - #process_min_avail = 0 - - # If you set service_count=0, you probably need to grow this. - #vsz_limit = $default_vsz_limit -} - -service pop3-login { - inet_listener pop3 { - #port = 110 - } - inet_listener pop3s { - #port = 995 - #ssl = yes - } -} - -service lmtp { - unix_listener lmtp { - #mode = 0666 - } - - # Create inet listener only if you can't use the above UNIX socket - #inet_listener lmtp { - # Avoid making LMTP visible for the entire internet - #address = - #port = - #} -} - -service imap { - # Most of the memory goes to mmap()ing files. You may need to increase this - # limit if you have huge mailboxes. - #vsz_limit = $default_vsz_limit - - # Max. number of IMAP processes (connections) - #process_limit = 1024 -} - -service pop3 { - # Max. number of POP3 processes (connections) - #process_limit = 1024 -} - -service auth { - # auth_socket_path points to this userdb socket by default. It's typically - # used by dovecot-lda, doveadm, possibly imap process, etc. Users that have - # full permissions to this socket are able to get a list of all usernames and - # get the results of everyone's userdb lookups. - # - # The default 0666 mode allows anyone to connect to the socket, but the - # userdb lookups will succeed only if the userdb returns an "uid" field that - # matches the caller process's UID. Also if caller's uid or gid matches the - # socket's uid or gid the lookup succeeds. Anything else causes a failure. - # - # To give the caller full permissions to lookup all users, set the mode to - # something else than 0666 and Dovecot lets the kernel enforce the - # permissions (e.g. 0777 allows everyone full permissions). - unix_listener auth-userdb { - #mode = 0666 - #user = - #group = - } - - # Postfix smtp-auth - unix_listener /var/spool/postfix/private/auth { - mode = 0660 - user = postfix - group = postfix - } - # Exim4 smtp-auth - unix_listener auth-client { - mode = 0660 - user = mail - } - - # Auth process is run as this user. - #user = $default_internal_user -} - -service auth-worker { - # Auth worker process is run as root by default, so that it can access - # /etc/shadow. If this isn't necessary, the user should be changed to - # $default_internal_user. - #user = root -} - -service dict { - # If dict proxy is used, mail processes should have access to its socket. - # For example: mode=0660, group=vmail and global mail_access_groups=vmail - unix_listener dict { - #mode = 0600 - #user = - #group = - } -} diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf deleted file mode 100644 index ebbffa20..00000000 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf +++ /dev/null @@ -1,48 +0,0 @@ -## -## LDA specific settings (also used by LMTP) -## - -# Address to use when sending rejection mails. -# Default is postmaster@. -postmaster_address = postmaster@ - -# Hostname to use in various parts of sent mails, eg. in Message-Id. -# Default is the system's real hostname. -#hostname = - -# If user is over quota, return with temporary failure instead of -# bouncing the mail. -#quota_full_tempfail = no - -# Binary to use for sending mails. -#sendmail_path = /usr/sbin/sendmail - -# If non-empty, send mails via this SMTP host[:port] instead of sendmail. -#submission_host = - -# Subject: header to use for rejection mails. You can use the same variables -# as for rejection_reason below. -#rejection_subject = Rejected: %s - -# Human readable error message for rejection mails. You can use variables: -# %n = CRLF, %r = reason, %s = original subject, %t = recipient -#rejection_reason = Your message to <%t> was automatically rejected:%n%r - -# Delimiter character between local-part and detail in email address. -#recipient_delimiter = + - -# Header where the original recipient address (SMTP's RCPT TO: address) is taken -# from if not available elsewhere. With dovecot-lda -a parameter overrides this. -# A commonly used header for this is X-Original-To. -#lda_original_recipient_header = - -# Should saving a mail to a nonexistent mailbox automatically create it? -#lda_mailbox_autocreate = no - -# Should automatically created mailboxes be also automatically subscribed? -#lda_mailbox_autosubscribe = no - -protocol lda { - # Space separated list of plugins to load (default is global mail_plugins). - mail_plugins = $mail_plugins quota sieve -} diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-imap.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-imap.conf deleted file mode 100644 index 5a22bc2d..00000000 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-imap.conf +++ /dev/null @@ -1,58 +0,0 @@ -## -## IMAP specific settings -## - -protocol imap { - # Maximum IMAP command line length. Some clients generate very long command - # lines with huge mailboxes, so you may need to raise this if you get - # "Too long argument" or "IMAP command line too large" errors often. - #imap_max_line_length = 64k - - # Maximum number of IMAP connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 - - # Space separated list of plugins to load (default is global mail_plugins). - mail_plugins = $mail_plugins quota imap_quota - - # IMAP logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - imap_logout_format = in=%i out=%o - - # Override the IMAP CAPABILITY response. If the value begins with '+', - # add the given capabilities on top of the defaults (e.g. +XFOO XBAR). - #imap_capability = - - # How long to wait between "OK Still here" notifications when client is - # IDLEing. - #imap_idle_notify_interval = 2 mins - - # ID field names and values to send to clients. Using * as the value makes - # Dovecot use the default value. The following fields have default values - # currently: name, version, os, os-version, support-url, support-email. - #imap_id_send = - - # ID fields sent by client to log. * means everything. - #imap_id_log = - - # Workarounds for various client bugs: - # delay-newmail: - # Send EXISTS/RECENT new mail notifications only when replying to NOOP - # and CHECK commands. Some clients ignore them otherwise, for example OSX - # Mail ( - #service_count = 1 - - # Number of processes to always keep waiting for more connections. - #process_min_avail = 0 - - # If you set service_count=0, you probably need to grow this. - #vsz_limit = 64M -} - -service managesieve { - # Max. number of ManageSieve processes (connections) - #process_limit = 1024 -} - -# Service configuration - -protocol sieve { - # Maximum ManageSieve command line length in bytes. ManageSieve usually does - # not involve overly long command lines, so this setting will not normally - # need adjustment - #managesieve_max_line_length = 65536 - - # Maximum number of ManageSieve connections allowed for a user from each IP - # address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 - - # Space separated list of plugins to load (none known to be useful so far). - # Do NOT try to load IMAP plugins here. - #mail_plugins = - - # MANAGESIEVE logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - #managesieve_logout_format = bytes=%i/%o - - # To fool ManageSieve clients that are focused on CMU's timesieved you can - # specify the IMPLEMENTATION capability that Dovecot reports to clients. - # For example: 'Cyrus timsieved v2.2.13' - #managesieve_implementation_string = Dovecot Pigeonhole - - # Explicitly specify the SIEVE and NOTIFY capability reported by the server - # before login. If left unassigned these will be reported dynamically - # according to what the Sieve interpreter supports by default (after login - # this may differ depending on the user). - #managesieve_sieve_capability = - #managesieve_notify_capability = - - # The maximum number of compile errors that are returned to the client upon - # script upload or script verification. - #managesieve_max_compile_errors = 5 - - # Refer to 90-sieve.conf for script quota configuration and configuration of - # Sieve execution limits. -} diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-pop3.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-pop3.conf deleted file mode 100644 index fd154dbe..00000000 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-pop3.conf +++ /dev/null @@ -1,91 +0,0 @@ -## -## POP3 specific settings -## - -protocol pop3 { - # Don't try to set mails non-recent or seen with POP3 sessions. This is - # mostly intended to reduce disk I/O. With maildir it doesn't move files - # from new/ to cur/, with mbox it doesn't write Status-header. - #pop3_no_flag_updates = no - - # Support LAST command which exists in old POP3 specs, but has been removed - # from new ones. Some clients still wish to use this though. Enabling this - # makes RSET command clear all \Seen flags from messages. - #pop3_enable_last = no - - # If mail has X-UIDL header, use it as the mail's UIDL. - #pop3_reuse_xuidl = no - - # Keep the mailbox locked for the entire POP3 session. - #pop3_lock_session = no - - # POP3 requires message sizes to be listed as if they had CR+LF linefeeds. - # Many POP3 servers violate this by returning the sizes with LF linefeeds, - # because it's faster to get. When this setting is enabled, Dovecot still - # tries to do the right thing first, but if that requires opening the - # message, it fallbacks to the easier (but incorrect) size. - #pop3_fast_size_lookups = no - - # POP3 UIDL (unique mail identifier) format to use. You can use following - # variables, along with the variable modifiers described in - # doc/wiki/Variables.txt (e.g. %Uf for the filename in uppercase) - # - # %v - Mailbox's IMAP UIDVALIDITY - # %u - Mail's IMAP UID - # %m - MD5 sum of the mailbox headers in hex (mbox only) - # %f - filename (maildir only) - # %g - Mail's GUID - # - # If you want UIDL compatibility with other POP3 servers, use: - # UW's ipop3d : %08Xv%08Xu - # Courier : %f or %v-%u (both might be used simultaneosly) - # Cyrus (<= 2.1.3) : %u - # Cyrus (>= 2.1.4) : %v.%u - # Dovecot v0.99.x : %v.%u - # tpop3d : %Mf - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv - - # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes - # won't change those UIDLs. Currently this works only with Maildir. - #pop3_save_uidl = no - - # What to do about duplicate UIDLs if they exist? - # allow: Show duplicates to clients. - # rename: Append a temporary -2, -3, etc. counter after the UIDL. - #pop3_uidl_duplicates = allow - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 - - # Space separated list of plugins to load (default is global mail_plugins). - mail_plugins = $mail_plugins quota - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_90-sieve.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_90-sieve.conf deleted file mode 100644 index 41737fe4..00000000 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_90-sieve.conf +++ /dev/null @@ -1,104 +0,0 @@ -## -## Settings for the Sieve interpreter -## - -# Do not forget to enable the Sieve plugin in 15-lda.conf and 20-lmtp.conf -# by adding it to the respective mail_plugins= settings. - -plugin { - # The path to the user's main active script. If ManageSieve is used, this the - # location of the symbolic link controlled by ManageSieve. - sieve = ~/sieve/.dovecot.sieve - - # The default Sieve script when the user has none. This is a path to a global - # sieve script file, which gets executed ONLY if user's private Sieve script - # doesn't exist. Be sure to pre-compile this script manually using the sievec - # command line tool. - # --> See sieve_before fore executing scripts before the user's personal - # script. - #sieve_default = /var/lib/dovecot/sieve/default.sieve - - # Directory for :personal include scripts for the include extension. This - # is also where the ManageSieve service stores the user's scripts. - sieve_dir = ~/sieve - - # Directory for :global include scripts for the include extension. - #sieve_global_dir = - - # Path to a script file or a directory containing script files that need to be - # executed before the user's script. If the path points to a directory, all - # the Sieve scripts contained therein (with the proper .sieve extension) are - # executed. The order of execution within a directory is determined by the - # file names, using a normal 8bit per-character comparison. Multiple script - # file or directory paths can be specified by appending an increasing number. - #sieve_before = - #sieve_before2 = - #sieve_before3 = (etc...) - - # Identical to sieve_before, only the specified scripts are executed after the - # user's script (only when keep is still in effect!). Multiple script file or - # directory paths can be specified by appending an increasing number. - #sieve_after = - #sieve_after2 = - #sieve_after2 = (etc...) - - # Which Sieve language extensions are available to users. By default, all - # supported extensions are available, except for deprecated extensions or - # those that are still under development. Some system administrators may want - # to disable certain Sieve extensions or enable those that are not available - # by default. This setting can use '+' and '-' to specify differences relative - # to the default. For example `sieve_extensions = +imapflags' will enable the - # deprecated imapflags extension in addition to all extensions were already - # enabled by default. - #sieve_extensions = +notify +imapflags - - # Which Sieve language extensions are ONLY available in global scripts. This - # can be used to restrict the use of certain Sieve extensions to administrator - # control, for instance when these extensions can cause security concerns. - # This setting has higher precedence than the `sieve_extensions' setting - # (above), meaning that the extensions enabled with this setting are never - # available to the user's personal script no matter what is specified for the - # `sieve_extensions' setting. The syntax of this setting is similar to the - # `sieve_extensions' setting, with the difference that extensions are - # enabled or disabled for exclusive use in global scripts. Currently, no - # extensions are marked as such by default. - #sieve_global_extensions = - - # The Pigeonhole Sieve interpreter can have plugins of its own. Using this - # setting, the used plugins can be specified. Check the Dovecot wiki - # (wiki2.dovecot.org) or the pigeonhole website - # (http://pigeonhole.dovecot.org) for available plugins. - #sieve_plugins = - - # The separator that is expected between the :user and :detail - # address parts introduced by the subaddress extension. This may - # also be a sequence of characters (e.g. '--'). The current - # implementation looks for the separator from the left of the - # localpart and uses the first one encountered. The :user part is - # left of the separator and the :detail part is right. This setting - # is also used by Dovecot's LMTP service. - #recipient_delimiter = + - - # The maximum size of a Sieve script. The compiler will refuse to compile any - # script larger than this limit. If set to 0, no limit on the script size is - # enforced. - #sieve_max_script_size = 1M - - # The maximum number of actions that can be performed during a single script - # execution. If set to 0, no limit on the total number of actions is enforced. - #sieve_max_actions = 32 - - # The maximum number of redirect actions that can be performed during a single - # script execution. If set to 0, no redirect actions are allowed. - #sieve_max_redirects = 4 - - # The maximum number of personal Sieve scripts a single user can have. If set - # to 0, no limit on the number of scripts is enforced. - # (Currently only relevant for ManageSieve) - #sieve_quota_max_scripts = 0 - - # The maximum amount of disk storage a single user's scripts may occupy. If - # set to 0, no limit on the used amount of disk storage is enforced. - # (Currently only relevant for ManageSieve) - #sieve_quota_max_storage = 0 -} diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext deleted file mode 100644 index 20045d1e..00000000 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext +++ /dev/null @@ -1,30 +0,0 @@ -# Authentication for SQL users. Included from auth.conf. -# -# - -passdb { - driver = sql - - # Path for SQL configuration file, see example-config/dovecot-sql.conf.ext - args = /etc/dovecot/dovecot-sql.conf.ext -} - -# "prefetch" user database means that the passdb already provided the -# needed information and there's no need to do a separate userdb lookup. -# -userdb { - driver = prefetch -} - -userdb { - driver = sql - args = /etc/dovecot/dovecot-sql.conf.ext -} - -# If you don't have any user-specific settings, you can avoid the user_query -# by using userdb static instead of userdb sql, for example: -# -#userdb { - #driver = static - #args = uid=vmail gid=vmail home=/var/vmail/%u -#} diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_dovecot-sql.conf.ext b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_dovecot-sql.conf.ext deleted file mode 100644 index 138e6463..00000000 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_dovecot-sql.conf.ext +++ /dev/null @@ -1,138 +0,0 @@ -# This file is opened as root, so it should be owned by root and mode 0600. -# -# http://wiki2.dovecot.org/AuthDatabase/SQL -# -# For the sql passdb module, you'll need a database with a table that -# contains fields for at least the username and password. If you want to -# use the user@domain syntax, you might want to have a separate domain -# field as well. -# -# If your users all have the same uig/gid, and have predictable home -# directories, you can use the static userdb module to generate the home -# dir based on the username and domain. In this case, you won't need fields -# for home, uid, or gid in the database. -# -# If you prefer to use the sql userdb module, you'll want to add fields -# for home, uid, and gid. Here is an example table: -# -# CREATE TABLE users ( -# username VARCHAR(128) NOT NULL, -# domain VARCHAR(128) NOT NULL, -# password VARCHAR(64) NOT NULL, -# home VARCHAR(255) NOT NULL, -# uid INTEGER NOT NULL, -# gid INTEGER NOT NULL, -# active CHAR(1) DEFAULT 'Y' NOT NULL -# ); - -# Database driver: mysql, pgsql, sqlite -driver = mysql - -# Database connection string. This is driver-specific setting. -# -# HA / round-robin load-balancing is supported by giving multiple host -# settings, like: host=sql1.host.org host=sql2.host.org -# -# pgsql: -# For available options, see the PostgreSQL documention for the -# PQconnectdb function of libpq. -# Use maxconns=n (default 5) to change how many connections Dovecot can -# create to pgsql. -# -# mysql: -# Basic options emulate PostgreSQL option names: -# host, port, user, password, dbname -# -# But also adds some new settings: -# client_flags - See MySQL manual -# ssl_ca, ssl_ca_path - Set either one or both to enable SSL -# ssl_cert, ssl_key - For sending client-side certificates to server -# ssl_cipher - Set minimum allowed cipher security (default: HIGH) -# option_file - Read options from the given file instead of -# the default my.cnf location -# option_group - Read options from the given group (default: client) -# -# You can connect to UNIX sockets by using host: host=/var/run/mysql.sock -# Note that currently you can't use spaces in parameters. -# -# sqlite: -# The path to the database file. -# -# Examples: -# connect = host=192.168.1.1 dbname=users -# connect = host=sql.example.com dbname=virtual user=virtual password=blarg -# connect = /etc/dovecot/authdb.sqlite -# -connect = host= dbname= user= password= - -# Default password scheme. -# -# List of supported schemes is in -# http://wiki2.dovecot.org/Authentication/PasswordSchemes -# -default_pass_scheme = CRYPT - -# passdb query to retrieve the password. It can return fields: -# password - The user's password. This field must be returned. -# user - user@domain from the database. Needed with case-insensitive lookups. -# username and domain - An alternative way to represent the "user" field. -# -# The "user" field is often necessary with case-insensitive lookups to avoid -# e.g. "name" and "nAme" logins creating two different mail directories. If -# your user and domain names are in separate fields, you can return "username" -# and "domain" fields instead of "user". -# -# The query can also return other fields which have a special meaning, see -# http://wiki2.dovecot.org/PasswordDatabase/ExtraFields -# -# Commonly used available substitutions (see http://wiki2.dovecot.org/Variables -# for full list): -# %u = entire user@domain -# %n = user part of user@domain -# %d = domain part of user@domain -# -# Note that these can be used only as input to SQL query. If the query outputs -# any of these substitutions, they're not touched. Otherwise it would be -# difficult to have eg. usernames containing '%' characters. -# -# Example: -# password_query = SELECT userid AS user, pw AS password \ -# FROM users WHERE userid = '%u' AND active = 'Y' -# -#password_query = \ -# SELECT username, domain, password \ -# FROM users WHERE username = '%n' AND domain = '%d' - -# userdb query to retrieve the user information. It can return fields: -# uid - System UID (overrides mail_uid setting) -# gid - System GID (overrides mail_gid setting) -# home - Home directory -# mail - Mail location (overrides mail_location setting) -# -# None of these are strictly required. If you use a single UID and GID, and -# home or mail directory fits to a template string, you could use userdb static -# instead. For a list of all fields that can be returned, see -# http://wiki2.dovecot.org/UserDatabase/ExtraFields -# -# Examples: -# user_query = SELECT home, uid, gid FROM users WHERE userid = '%u' -# user_query = SELECT dir AS home, user AS uid, group AS gid FROM users where userid = '%u' -# user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u' -# -#user_query = \ -# SELECT home, uid, gid \ -# FROM users WHERE username = '%n' AND domain = '%d' -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') - -# If you wish to avoid two SQL lookups (passdb + userdb), you can use -# userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll -# also have to return userdb fields in password_query prefixed with "userdb_" -# string. For example: -#password_query = \ -# SELECT userid AS user, password, \ -# home AS userdb_home, uid AS userdb_uid, gid AS userdb_gid \ -# FROM users WHERE userid = '%u' -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve') - -# Query to get a list of all usernames. -#iterate_query = SELECT username AS user FROM users diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_dovecot.conf deleted file mode 100644 index 5b571c18..00000000 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_dovecot.conf +++ /dev/null @@ -1,98 +0,0 @@ -## Dovecot configuration file - -# If you're in a hurry, see http://wiki2.dovecot.org/QuickConfiguration - -# "doveconf -n" command gives a clean output of the changed settings. Use it -# instead of copy&pasting files when posting to the Dovecot mailing list. - -# '#' character and everything after it is treated as comments. Extra spaces -# and tabs are ignored. If you want to use either of these explicitly, put the -# value inside quotes, eg.: key = "# char and trailing whitespace " - -# Default values are shown for each setting, it's not required to uncomment -# those. These are exceptions to this though: No sections (e.g. namespace {}) -# or plugin settings are added by default, they're listed only as examples. -# Paths are also just examples with the real defaults being based on configure -# options. The paths listed here are for configure --prefix=/usr -# --sysconfdir=/etc --localstatedir=/var - -# Enable installed protocols -!include_try /usr/share/dovecot/protocols.d/*.protocol - -# A comma separated list of IPs or hosts where to listen in for connections. -# "*" listens in all IPv4 interfaces, "::" listens in all IPv6 interfaces. -# If you want to specify non-default ports or anything more complex, -# edit conf.d/master.conf. -#listen = *, :: - -# Base directory where to store runtime data. -#base_dir = /var/run/dovecot/ - -# Name of this instance. In multi-instance setup doveadm and other commands -# can use -i to select which instance is used (an alternative -# to -c ). The instance name is also added to Dovecot processes -# in ps output. -#instance_name = dovecot - -# Greeting message for clients. -#login_greeting = Dovecot ready. - -# Space separated list of trusted network ranges. Connections from these -# IPs are allowed to override their IP addresses and ports (for logging and -# for authentication checks). disable_plaintext_auth is also ignored for -# these networks. Typically you'd specify your IMAP proxy servers here. -#login_trusted_networks = - -# Sepace separated list of login access check sockets (e.g. tcpwrap) -#login_access_sockets = - -# With proxy_maybe=yes if proxy destination matches any of these IPs, don't do -# proxying. This isn't necessary normally, but may be useful if the destination -# IP is e.g. a load balancer's IP. -#auth_proxy_self = - -# Show more verbose process titles (in ps). Currently shows user name and -# IP address. Useful for seeing who are actually using the IMAP processes -# (eg. shared mailboxes or if same uid is used for multiple accounts). -#verbose_proctitle = no - -# Should all processes be killed when Dovecot master process shuts down. -# Setting this to "no" means that Dovecot can be upgraded without -# forcing existing client connections to close (although that could also be -# a problem if the upgrade is e.g. because of a security fix). -#shutdown_clients = yes - -# If non-zero, run mail commands via this many connections to doveadm server, -# instead of running them directly in the same process. -#doveadm_worker_count = 0 -# UNIX socket or host:port used for connecting to doveadm server -#doveadm_socket_path = doveadm-server - -# Space separated list of environment variables that are preserved on Dovecot -# startup and passed down to all of its child processes. You can also give -# key=value pairs to always set specific settings. -#import_environment = TZ - -## -## Dictionary server settings -## - -# Dictionary can be used to store key=value lists. This is used by several -# plugins. The dictionary can be accessed either directly or though a -# dictionary server. The following dict block maps dictionary names to URIs -# when the server is used. These can then be referenced using URIs in format -# "proxy::". - -dict { - #quota = mysql:/etc/dovecot/dovecot-dict-sql.conf.ext - #expire = sqlite:/etc/dovecot/dovecot-dict-sql.conf.ext -} - -# Most of the actual configuration gets included below. The filenames are -# first sorted by their ASCII value and parsed in that order. The 00-prefixes -# in filenames are intended to make it easier to understand the ordering. -!include conf.d/*.conf - -# A config file can also tried to be included without giving an error if -# it's not found: -!include_try local.conf diff --git a/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt b/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt deleted file mode 100644 index b7374bbc..00000000 --- a/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt +++ /dev/null @@ -1,358 +0,0 @@ - -### acl/30_exim4-config_check_rcpt -################################# - -# This access control list is used for every RCPT command in an incoming -# SMTP message. The tests are run in order until the address is either -# accepted or denied. -# -acl_check_rcpt: - - # Accept if the source is local SMTP (i.e. not over TCP/IP). We do this by - # testing for an empty sending host field. - accept - hosts = : - control = dkim_disable_verify - - # Do not try to verify DKIM signatures of incoming mail if DC_minimaldns - # or DISABLE_DKIM_VERIFY are set. -.ifdef DC_minimaldns - warn - control = dkim_disable_verify -.else -.ifdef DISABLE_DKIM_VERIFY - warn - control = dkim_disable_verify -.endif -.endif - - # The following section of the ACL is concerned with local parts that contain - # certain non-alphanumeric characters. Dots in unusual places are - # handled by this ACL as well. - # - # Non-alphanumeric characters other than dots are rarely found in genuine - # local parts, but are often tried by people looking to circumvent - # relaying restrictions. Therefore, although they are valid in local - # parts, these rules disallow certain non-alphanumeric characters, as - # a precaution. - # - # Empty components (two dots in a row) are not valid in RFC 2822, but Exim - # allows them because they have been encountered. (Consider local parts - # constructed as "firstinitial.secondinitial.familyname" when applied to - # a name without a second initial.) However, a local part starting - # with a dot or containing /../ can cause trouble if it is used as part of a - # file name (e.g. for a mailing list). This is also true for local parts that - # contain slashes. A pipe symbol can also be troublesome if the local part is - # incorporated unthinkingly into a shell command line. - # - # These ACL components will block recipient addresses that are valid - # from an RFC2822 point of view. We chose to have them blocked by - # default for security reasons. - # - # If you feel that your site should have less strict recipient - # checking, please feel free to change the default values of the macros - # defined in main/01_exim4-config_listmacrosdefs or override them from a - # local configuration file. - # - # Two different rules are used. The first one has a quite strict - # default, and is applied to messages that are addressed to one of the - # local domains handled by this host. - - # The default value of CHECK_RCPT_LOCAL_LOCALPARTS is defined in - # main/01_exim4-config_listmacrosdefs: - # CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%!/|`#&?] - # This blocks local parts that begin with a dot or contain a quite - # broad range of non-alphanumeric characters. - .ifdef CHECK_RCPT_LOCAL_LOCALPARTS - deny - domains = +local_domains:+froxlor_domain - local_parts = CHECK_RCPT_LOCAL_LOCALPARTS - message = restricted characters in address - .endif - - - # The second rule applies to all other domains, and its default is - # considerably less strict. - - # The default value of CHECK_RCPT_REMOTE_LOCALPARTS is defined in - # main/01_exim4-config_listmacrosdefs: - # CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%!`#&?] : ^.*/\\.\\./ - - # It allows local users to send outgoing messages to sites - # that use slashes and vertical bars in their local parts. It blocks - # local parts that begin with a dot, slash, or vertical bar, but allows - # these characters within the local part. However, the sequence /../ is - # barred. The use of some other non-alphanumeric characters is blocked. - # Single quotes might probably be dangerous as well, but they're - # allowed by the default regexps to avoid rejecting mails to Ireland. - # The motivation here is to prevent local users (or local users' malware) - # from mounting certain kinds of attack on remote sites. - .ifdef CHECK_RCPT_REMOTE_LOCALPARTS - deny - domains = !+local_domains - local_parts = CHECK_RCPT_REMOTE_LOCALPARTS - message = restricted characters in address - .endif - - - # Accept mail to postmaster in any local domain, regardless of the source, - # and without verifying the sender. - # - accept - .ifndef CHECK_RCPT_POSTMASTER - local_parts = postmaster - .else - local_parts = CHECK_RCPT_POSTMASTER - .endif - domains = +local_domains : +relay_to_domains : +froxlor_domain - - - # Deny unless the sender address can be verified. - # - # This is disabled by default so that DNSless systems don't break. If - # your system can do DNS lookups without delay or cost, you might want - # to enable this feature. - # - # This feature does not work in smarthost and satellite setups as - # with these setups all domains pass verification. See spec.txt chapter - # 39.31 with the added information that a smarthost/satellite setup - # routes all non-local e-mail to the smarthost. - .ifdef CHECK_RCPT_VERIFY_SENDER - deny - message = Sender verification failed - !acl = acl_local_deny_exceptions - !verify = sender - .endif - - # Verify senders listed in local_sender_callout with a callout. - # - # In smarthost and satellite setups, this causes the callout to be - # done to the smarthost. Verification will thus only be reliable if the - # smarthost does reject illegal addresses in the SMTP dialog. - deny - !acl = acl_local_deny_exceptions - senders = ${if exists{CONFDIR/local_sender_callout}\ - {CONFDIR/local_sender_callout}\ - {}} - !verify = sender/callout - - - # Accept if the message comes from one of the hosts for which we are an - # outgoing relay. It is assumed that such hosts are most likely to be MUAs, - # so we set control=submission to make Exim treat the message as a - # submission. It will fix up various errors in the message, for example, the - # lack of a Date: header line. If you are actually relaying out out from - # MTAs, you may want to disable this. If you are handling both relaying from - # MTAs and submissions from MUAs you should probably split them into two - # lists, and handle them differently. - - # Recipient verification is omitted here, because in many cases the clients - # are dumb MUAs that don't cope well with SMTP error responses. If you are - # actually relaying out from MTAs, you should probably add recipient - # verification here. - - # Note that, by putting this test before any DNS black list checks, you will - # always accept from these hosts, even if they end up on a black list. The - # assumption is that they are your friends, and if they get onto black - # list, it is a mistake. - accept - hosts = +relay_from_hosts - control = submission/sender_retain - control = dkim_disable_verify - - - # Accept if the message arrived over an authenticated connection, from - # any host. Again, these messages are usually from MUAs, so recipient - # verification is omitted, and submission mode is set. And again, we do this - # check before any black list tests. - accept - authenticated = * - control = submission/sender_retain - control = dkim_disable_verify - - - # Insist that any other recipient address that we accept is either in one of - # our local domains, or is in a domain for which we explicitly allow - # relaying. Any other domain is rejected as being unacceptable for relaying. - require - message = relay not permitted - domains = +local_domains : +relay_to_domains - - - # We also require all accepted addresses to be verifiable. This check will - # do local part verification for local domains, but only check the domain - # for remote domains. - require - verify = recipient - - - # Verify recipients listed in local_rcpt_callout with a callout. - # This is especially handy for forwarding MX hosts (secondary MX or - # mail hubs) of domains that receive a lot of spam to non-existent - # addresses. The only way to check local parts for remote relay - # domains is to use a callout (add /callout), but please read the - # documentation about callouts before doing this. - deny - !acl = acl_local_deny_exceptions - recipients = ${if exists{CONFDIR/local_rcpt_callout}\ - {CONFDIR/local_rcpt_callout}\ - {}} - !verify = recipient/callout - - - # CONFDIR/local_sender_blacklist holds a list of envelope senders that - # should have their access denied to the local host. Incoming messages - # with one of these senders are rejected at RCPT time. - # - # The explicit white lists are honored as well as negative items in - # the black list. See exim4-config_files(5) for details. - deny - message = sender envelope address $sender_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_local_deny_exceptions - senders = ${if exists{CONFDIR/local_sender_blacklist}\ - {CONFDIR/local_sender_blacklist}\ - {}} - - - # deny bad sites (IP address) - # CONFDIR/local_host_blacklist holds a list of host names, IP addresses - # and networks (CIDR notation) that should have their access denied to - # The local host. Messages coming in from a listed host will have all - # RCPT statements rejected. - # - # The explicit white lists are honored as well as negative items in - # the black list. See exim4-config_files(5) for details. - deny - message = sender IP address $sender_host_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_local_deny_exceptions - hosts = ${if exists{CONFDIR/local_host_blacklist}\ - {CONFDIR/local_host_blacklist}\ - {}} - - - # Warn if the sender host does not have valid reverse DNS. - # - # If your system can do DNS lookups without delay or cost, you might want - # to enable this. - # If sender_host_address is defined, it's a remote call. If - # sender_host_name is not defined, then reverse lookup failed. Use - # this instead of !verify = reverse_host_lookup to catch deferrals - # as well as outright failures. - .ifdef CHECK_RCPT_REVERSE_DNS - warn - condition = ${if and{{def:sender_host_address}{!def:sender_host_name}}\ - {yes}{no}} - add_header = X-Host-Lookup-Failed: Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}}) - .endif - - - # Use spfquery to perform a pair of SPF checks (for details, see - # http://www.openspf.org/) - # - # This is quite costly in terms of DNS lookups (~6 lookups per mail). Do not - # enable if that's an issue. Also note that if you enable this, you must - # install "spf-tools-perl" which provides the spfquery command. - # Missing spf-tools-perl will trigger the "Unexpected error in - # SPF check" warning. - .ifdef CHECK_RCPT_SPF - deny - message = [SPF] $sender_host_address is not allowed to send mail from \ - ${if def:sender_address_domain {$sender_address_domain}{$sender_helo_name}}. \ - Please see \ - http://www.openspf.org/Why?scope=${if def:sender_address_domain \ - {mfrom}{helo}};identity=${if def:sender_address_domain \ - {$sender_address}{$sender_helo_name}};ip=$sender_host_address - log_message = SPF check failed. - !acl = acl_local_deny_exceptions - condition = ${run{/usr/bin/spfquery.mail-spf-perl --ip \ - ${quote:$sender_host_address} --identity \ - ${if def:sender_address_domain \ - {--scope mfrom --identity ${quote:$sender_address}}\ - {--scope helo --identity ${quote:$sender_helo_name}}}}\ - {no}{${if eq {$runrc}{1}{yes}{no}}}} - - defer - message = Temporary DNS error while checking SPF record. Try again later. - !acl = acl_local_deny_exceptions - condition = ${if eq {$runrc}{5}{yes}{no}} - - warn - condition = ${if <={$runrc}{6}{yes}{no}} - add_header = Received-SPF: ${if eq {$runrc}{0}{pass}\ - {${if eq {$runrc}{2}{softfail}\ - {${if eq {$runrc}{3}{neutral}\ - {${if eq {$runrc}{4}{permerror}\ - {${if eq {$runrc}{6}{none}{error}}}}}}}}}\ - } client-ip=$sender_host_address; \ - ${if def:sender_address_domain \ - {envelope-from=${sender_address}; }{}}\ - helo=$sender_helo_name - - warn - log_message = Unexpected error in SPF check. - condition = ${if >{$runrc}{6}{yes}{no}} - .endif - - - # Check against classic DNS "black" lists (DNSBLs) which list - # sender IP addresses - .ifdef CHECK_RCPT_IP_DNSBLS - warn - dnslists = CHECK_RCPT_IP_DNSBLS - add_header = X-Warning: $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - .endif - - - # Check against DNSBLs which list sender domains, with an option to locally - # whitelist certain domains that might be blacklisted. - # - # Note: If you define CHECK_RCPT_DOMAIN_DNSBLS, you must append - # "/$sender_address_domain" after each domain. For example: - # CHECK_RCPT_DOMAIN_DNSBLS = rhsbl.foo.org/$sender_address_domain \ - # : rhsbl.bar.org/$sender_address_domain - .ifdef CHECK_RCPT_DOMAIN_DNSBLS - warn - !senders = ${if exists{CONFDIR/local_domain_dnsbl_whitelist}\ - {CONFDIR/local_domain_dnsbl_whitelist}\ - {}} - dnslists = CHECK_RCPT_DOMAIN_DNSBLS - add_header = X-Warning: $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - .endif - - - # This hook allows you to hook in your own ACLs without having to - # modify this file. If you do it like we suggest, you'll end up with - # a small performance penalty since there is an additional file being - # accessed. This doesn't happen if you leave the macro unset. - .ifdef CHECK_RCPT_LOCAL_ACL_FILE - .include CHECK_RCPT_LOCAL_ACL_FILE - .endif - - - ############################################################################# - # This check is commented out because it is recognized that not every - # sysadmin will want to do it. If you enable it, the check performs - # Client SMTP Authorization (csa) checks on the sending host. These checks - # do DNS lookups for SRV records. The CSA proposal is currently (May 2005) - # an Internet draft. You can, of course, add additional conditions to this - # ACL statement to restrict the CSA checks to certain hosts only. - # - # require verify = csa - ############################################################################# - - - # Accept if the address is in a domain for which we are an incoming relay, - # but again, only if the recipient can be verified. - - accept - domains = +relay_to_domains : +froxlor_domain - endpass - verify = recipient - - - # At this point, the address has passed all the checks that have been - # configured, so we accept it unconditionally. - - accept diff --git a/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_auth_30_froxlor-config b/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_auth_30_froxlor-config deleted file mode 100644 index 76c7e54a..00000000 --- a/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_auth_30_froxlor-config +++ /dev/null @@ -1,44 +0,0 @@ - -### auth/30_froxlor-config -################################# - -plain_server: - driver = plaintext - public_name = PLAIN - server_condition = "${if and { \ - {!eq{$2}{}} \ - {!eq{$3}{}} \ - {crypteq{$3}{${lookup mysql{FROXLOR_AUTH_PLAIN}{$value}fail}}} \ - } {yes}{no}}" - server_set_id = $2 - server_prompts = : -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} -# .endif - -login_server: - driver = plaintext - public_name = LOGIN - server_prompts = "Username:: : Password::" - server_condition = "${if and { \ - {!eq{$1}{}} \ - {!eq{$2}{}} \ - {crypteq{$2}{${lookup mysql{FROXLOR_AUTH_LOGIN}{$value}fail}}} \ - } {yes}{no}}" - server_set_id = $1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} -# .endif - -# comment the stuff above and use settings below if using dovecot -#dovecot_login: -# driver = dovecot -# public_name = LOGIN -# server_socket = /var/run/dovecot/auth-client -# server_set_id = $auth1 - -#dovecot_plain: -# driver = dovecot -# public_name = PLAIN -# server_socket = /var/run/dovecot/auth-client -# server_set_id = $auth1 \ No newline at end of file diff --git a/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_main_10_froxlor-config_options b/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_main_10_froxlor-config_options deleted file mode 100644 index 8a070db6..00000000 --- a/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_main_10_froxlor-config_options +++ /dev/null @@ -1,20 +0,0 @@ -hide mysql_servers = /// - -FROXLOR_LOCAL_DOMAIN = SELECT domain FROM panel_domains WHERE domain = '${quote_mysql:$domain}' AND isemaildomain = '1' - -FROXLOR_MAILALIAS = SELECT REPLACE(destination,' ',',') FROM mail_virtual WHERE \ - (( email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' ) \ - OR ( email = '@${quote_mysql:$domain}' AND iscatchall > 0 )) \ - AND destination <> '' AND destination <> ' ' ORDER BY iscatchall ASC LIMIT 1 - -FROXLOR_MAILUSER = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE \ - email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' AND postfix = 'y' - -FROXLOR_PARENT_DOMAIN = SELECT parent.domain FROM `panel_domains` AS parent INNER JOIN panel_domains AS alias \ - ON alias.domain = '${quote_mysql:$domain}' AND parent.id = alias.aliasdomain - -FROXLOR_AUTH_PLAIN = SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$2}' - -FROXLOR_AUTH_LOGIN = SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$1}' - -domainlist froxlor_domain = mysql;FROXLOR_LOCAL_DOMAIN \ No newline at end of file diff --git a/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_router_180_froxlor-config b/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_router_180_froxlor-config deleted file mode 100644 index dbb6a020..00000000 --- a/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_router_180_froxlor-config +++ /dev/null @@ -1,13 +0,0 @@ -froxlor_mailalias: - debug_print = "R: froxlor_mailalias for $local_part@$domain" - driver = redirect - domains = +froxlor_domain - data = ${lookup mysql {FROXLOR_MAILALIAS}{$value}fail} - -froxlor_mailuser: - debug_print = "R: froxlor_mailuser for $local_part@$domain" - driver = redirect - domains = +froxlor_domain - data = ${lookup mysql {FROXLOR_MAILUSER}{$value}fail} - directory_transport = maildir_froxlor - no_more \ No newline at end of file diff --git a/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_transport_30_froxlor-config b/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_transport_30_froxlor-config deleted file mode 100644 index 6f00c2f7..00000000 --- a/templates/misc/configfiles/debian_wheezy/exim4/etc_exim4_conf.d_transport_30_froxlor-config +++ /dev/null @@ -1,13 +0,0 @@ -maildir_froxlor: - debug_print = "T: maildir_froxlor for $local_part@$domain" - driver = appendfile - create_directory - delivery_date_add - envelope_to_add - return_path_add - maildir_format - directory_mode = 0770 - mode = 0660 - mode_fail_narrower = false - user = 2000 - group = 2000 \ No newline at end of file diff --git a/templates/misc/configfiles/debian_wheezy/libnss/etc_libnss-mysql-root.cfg b/templates/misc/configfiles/debian_wheezy/libnss/etc_libnss-mysql-root.cfg deleted file mode 100644 index 64989771..00000000 --- a/templates/misc/configfiles/debian_wheezy/libnss/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username -password diff --git a/templates/misc/configfiles/debian_wheezy/libnss/etc_libnss-mysql.cfg b/templates/misc/configfiles/debian_wheezy/libnss/etc_libnss-mysql.cfg deleted file mode 100644 index 263b17b9..00000000 --- a/templates/misc/configfiles/debian_wheezy/libnss/etc_libnss-mysql.cfg +++ /dev/null @@ -1,41 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT members \ - FROM ftp_groups \ - WHERE gid='%1$u' -gidsbymem SELECT CONCAT_WS(',', gid) as gid \ - FROM ftp_groups \ - WHERE FIND_IN_SET('%1$s', members) - -host -database -username -password -port 3306 diff --git a/templates/misc/configfiles/debian_wheezy/libnss/etc_nsswitch.conf b/templates/misc/configfiles/debian_wheezy/libnss/etc_nsswitch.conf deleted file mode 100644 index 22a74dda..00000000 --- a/templates/misc/configfiles/debian_wheezy/libnss/etc_nsswitch.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Make sure that `passwd`, `group` and `shadow` have mysql in their lines -# You should place mysql at the end, so that it is queried after the other mechanisams -# -passwd: compat mysql -group: compat mysql -shadow: compat mysql - -hosts: files dns -networks: files dns - -services: db files -protocols: db files -rpc: db files -ethers: db files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files \ No newline at end of file diff --git a/templates/misc/configfiles/debian_wheezy/lighttpd/etc_lighttpd.conf b/templates/misc/configfiles/debian_wheezy/lighttpd/etc_lighttpd.conf deleted file mode 100644 index 30f6d5d9..00000000 --- a/templates/misc/configfiles/debian_wheezy/lighttpd/etc_lighttpd.conf +++ /dev/null @@ -1,28 +0,0 @@ -server.modules = ( - "mod_access", - "mod_alias", - "mod_compress", - "mod_redirect", - "mod_rewrite", -) - -server.document-root = "/var/www" -server.upload-dirs = ( "/var/cache/lighttpd/uploads" ) -server.errorlog = "/var/log/lighttpd/error.log" -server.pid-file = "/var/run/lighttpd.pid" -server.username = "www-data" -server.groupname = "www-data" -server.port = 80 - - -index-file.names = ( "index.php", "index.html", "index.lighttpd.html" ) -url.access-deny = ( "~", ".inc" ) -static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) - -compress.cache-dir = "/var/cache/lighttpd/compress/" -compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" ) - -# default listening port for IPv6 falls back to the IPv4 port -include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port -include_shell "/usr/share/lighttpd/create-mime.assign.pl" -include_shell "/usr/share/lighttpd/include-conf-enabled.pl" \ No newline at end of file diff --git a/templates/misc/configfiles/debian_wheezy/logrotate/etc_logrotated_froxlor b/templates/misc/configfiles/debian_wheezy/logrotate/etc_logrotated_froxlor deleted file mode 100644 index d7f7deeb..00000000 --- a/templates/misc/configfiles/debian_wheezy/logrotate/etc_logrotated_froxlor +++ /dev/null @@ -1,16 +0,0 @@ -# -# Froxlor logrotate snipet -# -*.log { - missingok - weekly - rotate 4 - compress - delaycompress - notifempty - create - sharedscripts - postrotate - > /dev/null 2>&1 || true - endscript -} diff --git a/templates/misc/configfiles/debian_wheezy/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/debian_wheezy/nginx/etc_init.d_php-fcgi deleted file mode 100644 index 29e0cc4a..00000000 --- a/templates/misc/configfiles/debian_wheezy/nginx/etc_init.d_php-fcgi +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -BIND="127.0.0.1:8888" -USER="www-data" -PHP_FCGI_CHILDREN="15" -PHP_FCGI_MAX_REQUESTS="1000" - -PHP_CGI="/usr/bin/php-cgi" -PHP_CGI_NAME="$(basename ${PHP_CGI})" -PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}" -RETVAL="0" - -start() { - echo -n "Starting PHP FastCGI: " - start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $PHP_CGI_ARGS - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} -stop() { - echo -n "Stopping PHP FastCGI: " - killall -q -w -u ${USER} ${PHP_CGI} - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "Usage: php-fastcgi {start|stop|restart}" - exit 1 - ;; -esac -exit "$RETVAL" diff --git a/templates/misc/configfiles/debian_wheezy/nginx/etc_nginx_nginx.conf b/templates/misc/configfiles/debian_wheezy/nginx/etc_nginx_nginx.conf deleted file mode 100644 index c027ac5b..00000000 --- a/templates/misc/configfiles/debian_wheezy/nginx/etc_nginx_nginx.conf +++ /dev/null @@ -1,95 +0,0 @@ -user www-data; -worker_processes 4; -pid /var/run/nginx.pid; - -events { - worker_connections 768; - # multi_accept on; -} - -http { - - ## - # Basic Settings - ## - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - # server_tokens off; - - # server_names_hash_bucket_size 64; - # server_name_in_redirect off; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - ## - # Logging Settings - ## - - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log; - - ## - # Gzip Settings - ## - - gzip on; - gzip_disable "msie6"; - - # gzip_vary on; - # gzip_proxied any; - # gzip_comp_level 6; - # gzip_buffers 16 8k; - # gzip_http_version 1.1; - # gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; - - ## - # nginx-naxsi config - ## - # Uncomment it if you installed nginx-naxsi - ## - - #include /etc/nginx/naxsi_core.rules; - - ## - # nginx-passenger config - ## - # Uncomment it if you installed nginx-passenger - ## - - #passenger_root /usr; - #passenger_ruby /usr/bin/ruby; - - ## - # Virtual Host Configs - ## - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; -} - - -#mail { -# # See sample authentication script at: -# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript -# -# # auth_http localhost/auth.php; -# # pop3_capabilities "TOP" "USER"; -# # imap_capabilities "IMAP4rev1" "UIDPLUS"; -# -# server { -# listen localhost:110; -# protocol pop3; -# proxy on; -# } -# -# server { -# listen localhost:143; -# protocol imap; -# proxy on; -# } -#} diff --git a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_aliases b/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_aliases deleted file mode 100644 index 26865c06..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_aliases +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/aliases -mailer-daemon: postmaster -postmaster: root -nobody: root -hostmaster: root -usenet: root -news: root -webmaster: root -www: root -ftp: root -abuse: root -noc: root -security: root - -# change this to a valid e-mail address you can access -root: root@ diff --git a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_main.cf deleted file mode 100644 index b23ec93b..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_main.cf +++ /dev/null @@ -1,732 +0,0 @@ -# Global Postfix configuration file. This file lists only a subset -# of all parameters. For the syntax, and for a complete parameter -# list, see the postconf(5) manual page (command: "man 5 postconf"). -# -# For common configuration examples, see BASIC_CONFIGURATION_README -# and STANDARD_CONFIGURATION_README. To find these documents, use -# the command "postconf html_directory readme_directory", or go to -# http://www.postfix.org/. -# -# For best results, change no more than 2-3 parameters at a time, -# and test if Postfix still works after every change. - -# SOFT BOUNCE -# -# The soft_bounce parameter provides a limited safety net for -# testing. When soft_bounce is enabled, mail will remain queued that -# would otherwise bounce. This parameter disables locally-generated -# bounces, and prevents the SMTP server from rejecting mail permanently -# (by changing 5xx replies into 4xx replies). However, soft_bounce -# is no cure for address rewriting mistakes or mail routing mistakes. -# -#soft_bounce = no - -# LOCAL PATHNAME INFORMATION -# -# The queue_directory specifies the location of the Postfix queue. -# This is also the root directory of Postfix daemons that run chrooted. -# See the files in examples/chroot-setup for setting up Postfix chroot -# environments on different UNIX systems. -# -#queue_directory = /var/spool/postfix - -# The command_directory parameter specifies the location of all -# postXXX commands. -# -command_directory = /usr/sbin - -# The daemon_directory parameter specifies the location of all Postfix -# daemon programs (i.e. programs listed in the master.cf file). This -# directory must be owned by root. -# -daemon_directory = /usr/lib/postfix - -# The data_directory parameter specifies the location of Postfix-writable -# data files (caches, random numbers). This directory must be owned -# by the mail_owner account (see below). -# -data_directory = /var/lib/postfix - -# QUEUE AND PROCESS OWNERSHIP -# -# The mail_owner parameter specifies the owner of the Postfix queue -# and of most Postfix daemon processes. Specify the name of a user -# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS -# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM. In -# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED -# USER. -# -#mail_owner = postfix - -# The default_privs parameter specifies the default rights used by -# the local delivery agent for delivery to external file or command. -# These rights are used in the absence of a recipient user context. -# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. -# -#default_privs = nobody - -# INTERNET HOST AND DOMAIN NAMES -# -# The myhostname parameter specifies the internet hostname of this -# mail system. The default is to use the fully-qualified domain name -# from gethostname(). $myhostname is used as a default value for many -# other configuration parameters. -# -# Froxlor Note: $myhostname can and should be the same as $mydomain as long as -# you don't intend to send mail to it (it will be considered local, not virtual) -# for the case of a subdomain, $mydomain *must* be equal to $myhostname, -# otherwise you cannot use the main domain for virtual transport. -# also check the note about $mydomain below. -myhostname = mail.$mydomain -#myhostname = virtual.domain.tld - -# The mydomain parameter specifies the local internet domain name. -# The default is to use $myhostname minus the first component. -# $mydomain is used as a default value for many other configuration -# parameters. -# -# Froxlor Note: We are using a default here but that may or may not make sense, -# depending on your dns configuration, please check yourself. -mydomain = - -# SENDING MAIL -# -# The myorigin parameter specifies the domain that locally-posted -# mail appears to come from. The default is to append $myhostname, -# which is fine for small sites. If you run a domain with multiple -# machines, you should (1) change this to $mydomain and (2) set up -# a domain-wide alias database that aliases each user to -# user@that.users.mailhost. -# -# For the sake of consistency between sender and recipient addresses, -# myorigin also specifies the default domain name that is appended -# to recipient addresses that have no @domain part. -# -# Debian GNU/Linux specific: Specifying a file name will cause the -# first line of that file to be used as the name. The Debian default -# is /etc/mailname. -# -#myorigin = /etc/mailname -#myorigin = $myhostname -#myorigin = $mydomain - -# RECEIVING MAIL - -# The inet_interfaces parameter specifies the network interface -# addresses that this mail system receives mail on. By default, -# the software claims all active interfaces on the machine. The -# parameter also controls delivery of mail to user@[ip.address]. -# -# See also the proxy_interfaces parameter, for network addresses that -# are forwarded to us via a proxy or network address translator. -# -# Note: you need to stop/start Postfix when this parameter changes. -# -inet_interfaces = all -#inet_interfaces = $myhostname -#inet_interfaces = $myhostname, localhost - -# The proxy_interfaces parameter specifies the network interface -# addresses that this mail system receives mail on by way of a -# proxy or network address translation unit. This setting extends -# the address list specified with the inet_interfaces parameter. -# -# You must specify your proxy/NAT addresses when your system is a -# backup MX host for other domains, otherwise mail delivery loops -# will happen when the primary MX host is down. -# -#proxy_interfaces = -#proxy_interfaces = 1.2.3.4 - -# The mydestination parameter specifies the list of domains that this -# machine considers itself the final destination for. -# -# These domains are routed to the delivery agent specified with the -# local_transport parameter setting. By default, that is the UNIX -# compatible delivery agent that lookups all recipients in /etc/passwd -# and /etc/aliases or their equivalent. -# -# The default is $myhostname + localhost.$mydomain. On a mail domain -# gateway, you should also include $mydomain. -# -# Do not specify the names of virtual domains - those domains are -# specified elsewhere (see VIRTUAL_README). -# -# Do not specify the names of domains that this machine is backup MX -# host for. Specify those names via the relay_domains settings for -# the SMTP server, or use permit_mx_backup if you are lazy (see -# STANDARD_CONFIGURATION_README). -# -# The local machine is always the final destination for mail addressed -# to user@[the.net.work.address] of an interface that the mail system -# receives mail on (see the inet_interfaces parameter). -# -# Specify a list of host or domain names, /file/name or type:table -# patterns, separated by commas and/or whitespace. A /file/name -# pattern is replaced by its contents; a type:table is matched when -# a name matches a lookup key (the right-hand side is ignored). -# Continue long lines by starting the next line with whitespace. -# -# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". -# -#mydestination = $myhostname, localhost.$mydomain, localhost -mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain -#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, -# mail.$mydomain, www.$mydomain, ftp.$mydomain - -# REJECTING MAIL FOR UNKNOWN LOCAL USERS -# -# The local_recipient_maps parameter specifies optional lookup tables -# with all names or addresses of users that are local with respect -# to $mydestination, $inet_interfaces or $proxy_interfaces. -# -# If this parameter is defined, then the SMTP server will reject -# mail for unknown local users. This parameter is defined by default. -# -# To turn off local recipient checking in the SMTP server, specify -# local_recipient_maps = (i.e. empty). -# -# The default setting assumes that you use the default Postfix local -# delivery agent for local delivery. You need to update the -# local_recipient_maps setting if: -# -# - You define $mydestination domain recipients in files other than -# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files. -# For example, you define $mydestination domain recipients in -# the $virtual_mailbox_maps files. -# -# - You redefine the local delivery agent in master.cf. -# -# - You redefine the "local_transport" setting in main.cf. -# -# - You use the "luser_relay", "mailbox_transport", or "fallback_transport" -# feature of the Postfix local delivery agent (see local(8)). -# -# Details are described in the LOCAL_RECIPIENT_README file. -# -# Beware: if the Postfix SMTP server runs chrooted, you probably have -# to access the passwd file via the proxymap service, in order to -# overcome chroot restrictions. The alternative, having a copy of -# the system passwd file in the chroot jail is just not practical. -# -# The right-hand side of the lookup tables is conveniently ignored. -# In the left-hand side, specify a bare username, an @domain.tld -# wild-card, or specify a user@domain.tld address. -# -#local_recipient_maps = unix:passwd.byname $alias_maps -#local_recipient_maps = proxy:unix:passwd.byname $alias_maps -#local_recipient_maps = - -# The unknown_local_recipient_reject_code specifies the SMTP server -# response code when a recipient domain matches $mydestination or -# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty -# and the recipient address or address local-part is not found. -# -# The default setting is 550 (reject mail) but it is safer to start -# with 450 (try again later) until you are certain that your -# local_recipient_maps settings are OK. -# -unknown_local_recipient_reject_code = 550 - -# TRUST AND RELAY CONTROL - -# The mynetworks parameter specifies the list of "trusted" SMTP -# clients that have more privileges than "strangers". -# -# In particular, "trusted" SMTP clients are allowed to relay mail -# through Postfix. See the smtpd_recipient_restrictions parameter -# in postconf(5). -# -# You can specify the list of "trusted" network addresses by hand -# or you can let Postfix do it for you (which is the default). -# -# By default (mynetworks_style = subnet), Postfix "trusts" SMTP -# clients in the same IP subnetworks as the local machine. -# On Linux, this does works correctly only with interfaces specified -# with the "ifconfig" command. -# -# Specify "mynetworks_style = class" when Postfix should "trust" SMTP -# clients in the same IP class A/B/C networks as the local machine. -# Don't do this with a dialup site - it would cause Postfix to "trust" -# your entire provider's network. Instead, specify an explicit -# mynetworks list by hand, as described below. -# -# Specify "mynetworks_style = host" when Postfix should "trust" -# only the local machine. -# -#mynetworks_style = class -#mynetworks_style = subnet -#mynetworks_style = host - -# Alternatively, you can specify the mynetworks list by hand, in -# which case Postfix ignores the mynetworks_style setting. -# -# Specify an explicit list of network/netmask patterns, where the -# mask specifies the number of bits in the network part of a host -# address. -# -# You can also specify the absolute pathname of a pattern file instead -# of listing the patterns here. Specify type:table for table-based lookups -# (the value on the table right-hand side is not used). -# -#mynetworks = 168.100.189.0/28, 127.0.0.0/8 -#mynetworks = $config_directory/mynetworks -#mynetworks = hash:/etc/postfix/network_table -mynetworks = 127.0.0.0/8 - -# The relay_domains parameter restricts what destinations this system will -# relay mail to. See the smtpd_recipient_restrictions description in -# postconf(5) for detailed information. -# -# By default, Postfix relays mail -# - from "trusted" clients (IP address matches $mynetworks) to any destination, -# - from "untrusted" clients to destinations that match $relay_domains or -# subdomains thereof, except addresses with sender-specified routing. -# The default relay_domains value is $mydestination. -# -# In addition to the above, the Postfix SMTP server by default accepts mail -# that Postfix is final destination for: -# - destinations that match $inet_interfaces or $proxy_interfaces, -# - destinations that match $mydestination -# - destinations that match $virtual_alias_domains, -# - destinations that match $virtual_mailbox_domains. -# These destinations do not need to be listed in $relay_domains. -# -# Specify a list of hosts or domains, /file/name patterns or type:name -# lookup tables, separated by commas and/or whitespace. Continue -# long lines by starting the next line with whitespace. A file name -# is replaced by its contents; a type:name table is matched when a -# (parent) domain appears as lookup key. -# -# NOTE: Postfix will not automatically forward mail for domains that -# list this system as their primary or backup MX host. See the -# permit_mx_backup restriction description in postconf(5). -# -#relay_domains = $mydestination - -# INTERNET OR INTRANET - -# The relayhost parameter specifies the default host to send mail to -# when no entry is matched in the optional transport(5) table. When -# no relayhost is given, mail is routed directly to the destination. -# -# On an intranet, specify the organizational domain name. If your -# internal DNS uses no MX records, specify the name of the intranet -# gateway host instead. -# -# In the case of SMTP, specify a domain, host, host:port, [host]:port, -# [address] or [address]:port; the form [host] turns off MX lookups. -# -# If you're connected via UUCP, see also the default_transport parameter. -# -#relayhost = $mydomain -#relayhost = [gateway.my.domain] -#relayhost = [mailserver.isp.tld] -#relayhost = uucphost -#relayhost = [an.ip.add.ress] - -# REJECTING UNKNOWN RELAY USERS -# -# The relay_recipient_maps parameter specifies optional lookup tables -# with all addresses in the domains that match $relay_domains. -# -# If this parameter is defined, then the SMTP server will reject -# mail for unknown relay users. This feature is off by default. -# -# The right-hand side of the lookup tables is conveniently ignored. -# In the left-hand side, specify an @domain.tld wild-card, or specify -# a user@domain.tld address. -# -#relay_recipient_maps = hash:/etc/postfix/relay_recipients - -# INPUT RATE CONTROL -# -# The in_flow_delay configuration parameter implements mail input -# flow control. This feature is turned on by default, although it -# still needs further development (it's disabled on SCO UNIX due -# to an SCO bug). -# -# A Postfix process will pause for $in_flow_delay seconds before -# accepting a new message, when the message arrival rate exceeds the -# message delivery rate. With the default 100 SMTP server process -# limit, this limits the mail inflow to 100 messages a second more -# than the number of messages delivered per second. -# -# Specify 0 to disable the feature. Valid delays are 0..10. -# -#in_flow_delay = 1s - -# ADDRESS REWRITING -# -# The ADDRESS_REWRITING_README document gives information about -# address masquerading or other forms of address rewriting including -# username->Firstname.Lastname mapping. - -# ADDRESS REDIRECTION (VIRTUAL DOMAIN) -# -# The VIRTUAL_README document gives information about the many forms -# of domain hosting that Postfix supports. - -# "USER HAS MOVED" BOUNCE MESSAGES -# -# See the discussion in the ADDRESS_REWRITING_README document. - -# TRANSPORT MAP -# -# See the discussion in the ADDRESS_REWRITING_README document. - -# ALIAS DATABASE -# -# The alias_maps parameter specifies the list of alias databases used -# by the local delivery agent. The default list is system dependent. -# -# On systems with NIS, the default is to search the local alias -# database, then the NIS alias database. See aliases(5) for syntax -# details. -# -# If you change the alias database, run "postalias /etc/aliases" (or -# wherever your system stores the mail alias file), or simply run -# "newaliases" to build the necessary DBM or DB file. -# -# It will take a minute or so before changes become visible. Use -# "postfix reload" to eliminate the delay. -# -#alias_maps = dbm:/etc/aliases -#alias_maps = hash:/etc/aliases -#alias_maps = hash:/etc/aliases, nis:mail.aliases -#alias_maps = netinfo:/aliases - -# The alias_database parameter specifies the alias database(s) that -# are built with "newaliases" or "sendmail -bi". This is a separate -# configuration parameter, because alias_maps (see above) may specify -# tables that are not necessarily all under control by Postfix. -# -#alias_database = dbm:/etc/aliases -#alias_database = dbm:/etc/mail/aliases -#alias_database = hash:/etc/aliases -#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases - -# ADDRESS EXTENSIONS (e.g., user+foo) -# -# The recipient_delimiter parameter specifies the separator between -# user names and address extensions (user+foo). See canonical(5), -# local(8), relocated(5) and virtual(5) for the effects this has on -# aliases, canonical, virtual, relocated and .forward file lookups. -# Basically, the software tries user+foo and .forward+foo before -# trying user and .forward. -# -#recipient_delimiter = + - -# DELIVERY TO MAILBOX -# -# The home_mailbox parameter specifies the optional pathname of a -# mailbox file relative to a user's home directory. The default -# mailbox file is /var/spool/mail/user or /var/mail/user. Specify -# "Maildir/" for qmail-style delivery (the / is required). -# -#home_mailbox = Mailbox -#home_mailbox = Maildir/ - -# The mail_spool_directory parameter specifies the directory where -# UNIX-style mailboxes are kept. The default setting depends on the -# system type. -# -#mail_spool_directory = /var/mail -#mail_spool_directory = /var/spool/mail - -# The mailbox_command parameter specifies the optional external -# command to use instead of mailbox delivery. The command is run as -# the recipient with proper HOME, SHELL and LOGNAME environment settings. -# Exception: delivery for root is done as $default_user. -# -# Other environment variables of interest: USER (recipient username), -# EXTENSION (address extension), DOMAIN (domain part of address), -# and LOCAL (the address localpart). -# -# Unlike other Postfix configuration parameters, the mailbox_command -# parameter is not subjected to $parameter substitutions. This is to -# make it easier to specify shell syntax (see example below). -# -# Avoid shell meta characters because they will force Postfix to run -# an expensive shell process. Procmail alone is expensive enough. -# -# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN -# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. -# -#mailbox_command = /usr/bin/procmail -#mailbox_command = /usr/bin/procmail -a "$EXTENSION" - -# The mailbox_transport specifies the optional transport in master.cf -# to use after processing aliases and .forward files. This parameter -# has precedence over the mailbox_command, fallback_transport and -# luser_relay parameters. -# -# Specify a string of the form transport:nexthop, where transport is -# the name of a mail delivery transport defined in master.cf. The -# :nexthop part is optional. For more details see the sample transport -# configuration file. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must update the "local_recipient_maps" setting in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" -# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. -#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp -# -# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and -# subsequent line in master.cf. -#mailbox_transport = cyrus - -# The fallback_transport specifies the optional transport in master.cf -# to use for recipients that are not found in the UNIX passwd database. -# This parameter has precedence over the luser_relay parameter. -# -# Specify a string of the form transport:nexthop, where transport is -# the name of a mail delivery transport defined in master.cf. The -# :nexthop part is optional. For more details see the sample transport -# configuration file. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must update the "local_recipient_maps" setting in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -#fallback_transport = lmtp:unix:/file/name -#fallback_transport = cyrus -#fallback_transport = - -# The luser_relay parameter specifies an optional destination address -# for unknown recipients. By default, mail for unknown@$mydestination, -# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned -# as undeliverable. -# -# The following expansions are done on luser_relay: $user (recipient -# username), $shell (recipient shell), $home (recipient home directory), -# $recipient (full recipient address), $extension (recipient address -# extension), $domain (recipient domain), $local (entire recipient -# localpart), $recipient_delimiter. Specify ${name?value} or -# ${name:value} to expand value only when $name does (does not) exist. -# -# luser_relay works only for the default Postfix local delivery agent. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must specify "local_recipient_maps =" (i.e. empty) in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -#luser_relay = $user@other.host -#luser_relay = $local@other.host -#luser_relay = admin+$local - -# JUNK MAIL CONTROLS -# -# The controls listed here are only a very small subset. The file -# SMTPD_ACCESS_README provides an overview. - -# The header_checks parameter specifies an optional table with patterns -# that each logical message header is matched against, including -# headers that span multiple physical lines. -# -# By default, these patterns also apply to MIME headers and to the -# headers of attached messages. With older Postfix versions, MIME and -# attached message headers were treated as body text. -# -# For details, see "man header_checks". -# -#header_checks = regexp:/etc/postfix/header_checks - -# FAST ETRN SERVICE -# -# Postfix maintains per-destination logfiles with information about -# deferred mail, so that mail can be flushed quickly with the SMTP -# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". -# See the ETRN_README document for a detailed description. -# -# The fast_flush_domains parameter controls what destinations are -# eligible for this service. By default, they are all domains that -# this server is willing to relay mail to. -# -#fast_flush_domains = $relay_domains - -# SHOW SOFTWARE VERSION OR NOT -# -# The smtpd_banner parameter specifies the text that follows the 220 -# code in the SMTP server's greeting banner. Some people like to see -# the mail version advertised. By default, Postfix shows no version. -# -# You MUST specify $myhostname at the start of the text. That is an -# RFC requirement. Postfix itself does not care. -# -#smtpd_banner = $myhostname ESMTP $mail_name -#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) - - -# PARALLEL DELIVERY TO THE SAME DESTINATION -# -# How many parallel deliveries to the same user or domain? With local -# delivery, it does not make sense to do massively parallel delivery -# to the same user, because mailbox updates must happen sequentially, -# and expensive pipelines in .forward files can cause disasters when -# too many are run at the same time. With SMTP deliveries, 10 -# simultaneous connections to the same domain could be sufficient to -# raise eyebrows. -# -# Each message delivery transport has its XXX_destination_concurrency_limit -# parameter. The default is $default_destination_concurrency_limit for -# most delivery transports. For the local delivery agent the default is 2. - -#local_destination_concurrency_limit = 2 -#default_destination_concurrency_limit = 20 - -# DEBUGGING CONTROL -# -# The debug_peer_level parameter specifies the increment in verbose -# logging level when an SMTP client or server host name or address -# matches a pattern in the debug_peer_list parameter. -# -#debug_peer_level = 2 - -# The debug_peer_list parameter specifies an optional list of domain -# or network patterns, /file/name patterns or type:name tables. When -# an SMTP client or server host name or address matches a pattern, -# increase the verbose logging level by the amount specified in the -# debug_peer_level parameter. -# -#debug_peer_list = 127.0.0.1 -#debug_peer_list = some.domain - -# The debugger_command specifies the external command that is executed -# when a Postfix daemon program is run with the -D option. -# -# Use "command .. & sleep 5" so that the debugger can attach before -# the process marches on. If you use an X-based debugger, be sure to -# set up your XAUTHORITY environment variable before starting Postfix. -# -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - -# If you can't use X, use this to capture the call stack when a -# daemon crashes. The result is in a file in the configuration -# directory, and is named after the process name and the process ID. -# -# debugger_command = -# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; -# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 -# >$config_directory/$process_name.$process_id.log & sleep 5 -# -# Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r -# " where uniquely matches one of the detached -# sessions (from "screen -list"). -# -# debugger_command = -# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen -# -dmS $process_name gdb $daemon_directory/$process_name -# $process_id & sleep 1 - -# INSTALL-TIME CONFIGURATION INFORMATION -# -# The following parameters are used when installing a new Postfix version. -# -# sendmail_path: The full pathname of the Postfix sendmail command. -# This is the Sendmail-compatible mail posting interface. -# -sendmail_path = /usr/sbin/sendmail - -# newaliases_path: The full pathname of the Postfix newaliases command. -# This is the Sendmail-compatible command to build alias databases. -# -newaliases_path = /usr/bin/newaliases - -# mailq_path: The full pathname of the Postfix mailq command. This -# is the Sendmail-compatible mail queue listing command. -# -mailq_path = /usr/bin/mailq - -# setgid_group: The group for mail submission and queue management -# commands. This must be a group name with a numerical group ID that -# is not shared with other accounts, not even with the Postfix account. -# -setgid_group = postdrop - -# html_directory: The location of the Postfix HTML documentation. -# -html_directory = no - -# manpage_directory: The location of the Postfix on-line manual pages. -# -manpage_directory = /usr/share/man - -# sample_directory: The location of the Postfix sample configuration files. -# This parameter is obsolete as of Postfix 2.1. -# -sample_directory = /usr/share/doc/postfix - -# readme_directory: The location of the Postfix README files. -# -readme_directory = /usr/share/doc/postfix -inet_protocols = ipv4 - -append_dot_mydomain = no -biff = no -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes - -# Virtual delivery settings -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = $smtpd_tls_cert_file -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes \ No newline at end of file diff --git a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index 090b6465..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index a962d086..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_sasl_smtpd.conf b/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_sasl_smtpd.conf deleted file mode 100644 index de3699d8..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_sasl_smtpd.conf +++ /dev/null @@ -1,11 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: plain login cram-md5 digest-md5 -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: SELECT password FROM mail_users WHERE username='%u@%r' OR email='%u@%r' \ No newline at end of file diff --git a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_aliases b/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_aliases deleted file mode 100644 index 26865c06..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_aliases +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/aliases -mailer-daemon: postmaster -postmaster: root -nobody: root -hostmaster: root -usenet: root -news: root -webmaster: root -www: root -ftp: root -abuse: root -noc: root -security: root - -# change this to a valid e-mail address you can access -root: root@ diff --git a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_main.cf deleted file mode 100644 index 4e83c37a..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_main.cf +++ /dev/null @@ -1,737 +0,0 @@ -# Global Postfix configuration file. This file lists only a subset -# of all parameters. For the syntax, and for a complete parameter -# list, see the postconf(5) manual page (command: "man 5 postconf"). -# -# For common configuration examples, see BASIC_CONFIGURATION_README -# and STANDARD_CONFIGURATION_README. To find these documents, use -# the command "postconf html_directory readme_directory", or go to -# http://www.postfix.org/. -# -# For best results, change no more than 2-3 parameters at a time, -# and test if Postfix still works after every change. - -# SOFT BOUNCE -# -# The soft_bounce parameter provides a limited safety net for -# testing. When soft_bounce is enabled, mail will remain queued that -# would otherwise bounce. This parameter disables locally-generated -# bounces, and prevents the SMTP server from rejecting mail permanently -# (by changing 5xx replies into 4xx replies). However, soft_bounce -# is no cure for address rewriting mistakes or mail routing mistakes. -# -#soft_bounce = no - -# LOCAL PATHNAME INFORMATION -# -# The queue_directory specifies the location of the Postfix queue. -# This is also the root directory of Postfix daemons that run chrooted. -# See the files in examples/chroot-setup for setting up Postfix chroot -# environments on different UNIX systems. -# -#queue_directory = /var/spool/postfix - -# The command_directory parameter specifies the location of all -# postXXX commands. -# -command_directory = /usr/sbin - -# The daemon_directory parameter specifies the location of all Postfix -# daemon programs (i.e. programs listed in the master.cf file). This -# directory must be owned by root. -# -daemon_directory = /usr/lib/postfix - -# The data_directory parameter specifies the location of Postfix-writable -# data files (caches, random numbers). This directory must be owned -# by the mail_owner account (see below). -# -data_directory = /var/lib/postfix - -# QUEUE AND PROCESS OWNERSHIP -# -# The mail_owner parameter specifies the owner of the Postfix queue -# and of most Postfix daemon processes. Specify the name of a user -# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS -# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM. In -# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED -# USER. -# -#mail_owner = postfix - -# The default_privs parameter specifies the default rights used by -# the local delivery agent for delivery to external file or command. -# These rights are used in the absence of a recipient user context. -# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. -# -#default_privs = nobody - -# INTERNET HOST AND DOMAIN NAMES -# -# The myhostname parameter specifies the internet hostname of this -# mail system. The default is to use the fully-qualified domain name -# from gethostname(). $myhostname is used as a default value for many -# other configuration parameters. -# -# Froxlor Note: $myhostname can and should be the same as $mydomain as long as -# you don't intend to send mail to it (it will be considered local, not virtual) -# for the case of a subdomain, $mydomain *must* be equal to $myhostname, -# otherwise you cannot use the main domain for virtual transport. -# also check the note about $mydomain below. -myhostname = mail.$mydomain -#myhostname = virtual.domain.tld - -# The mydomain parameter specifies the local internet domain name. -# The default is to use $myhostname minus the first component. -# $mydomain is used as a default value for many other configuration -# parameters. -# -# Froxlor Note: We are using a default here but that may or may not make sense, -# depending on your dns configuration, please check yourself. -mydomain = - -# SENDING MAIL -# -# The myorigin parameter specifies the domain that locally-posted -# mail appears to come from. The default is to append $myhostname, -# which is fine for small sites. If you run a domain with multiple -# machines, you should (1) change this to $mydomain and (2) set up -# a domain-wide alias database that aliases each user to -# user@that.users.mailhost. -# -# For the sake of consistency between sender and recipient addresses, -# myorigin also specifies the default domain name that is appended -# to recipient addresses that have no @domain part. -# -# Debian GNU/Linux specific: Specifying a file name will cause the -# first line of that file to be used as the name. The Debian default -# is /etc/mailname. -# -#myorigin = /etc/mailname -#myorigin = $myhostname -#myorigin = $mydomain - -# RECEIVING MAIL - -# The inet_interfaces parameter specifies the network interface -# addresses that this mail system receives mail on. By default, -# the software claims all active interfaces on the machine. The -# parameter also controls delivery of mail to user@[ip.address]. -# -# See also the proxy_interfaces parameter, for network addresses that -# are forwarded to us via a proxy or network address translator. -# -# Note: you need to stop/start Postfix when this parameter changes. -# -inet_interfaces = all -#inet_interfaces = $myhostname -#inet_interfaces = $myhostname, localhost - -# The proxy_interfaces parameter specifies the network interface -# addresses that this mail system receives mail on by way of a -# proxy or network address translation unit. This setting extends -# the address list specified with the inet_interfaces parameter. -# -# You must specify your proxy/NAT addresses when your system is a -# backup MX host for other domains, otherwise mail delivery loops -# will happen when the primary MX host is down. -# -#proxy_interfaces = -#proxy_interfaces = 1.2.3.4 - -# The mydestination parameter specifies the list of domains that this -# machine considers itself the final destination for. -# -# These domains are routed to the delivery agent specified with the -# local_transport parameter setting. By default, that is the UNIX -# compatible delivery agent that lookups all recipients in /etc/passwd -# and /etc/aliases or their equivalent. -# -# The default is $myhostname + localhost.$mydomain. On a mail domain -# gateway, you should also include $mydomain. -# -# Do not specify the names of virtual domains - those domains are -# specified elsewhere (see VIRTUAL_README). -# -# Do not specify the names of domains that this machine is backup MX -# host for. Specify those names via the relay_domains settings for -# the SMTP server, or use permit_mx_backup if you are lazy (see -# STANDARD_CONFIGURATION_README). -# -# The local machine is always the final destination for mail addressed -# to user@[the.net.work.address] of an interface that the mail system -# receives mail on (see the inet_interfaces parameter). -# -# Specify a list of host or domain names, /file/name or type:table -# patterns, separated by commas and/or whitespace. A /file/name -# pattern is replaced by its contents; a type:table is matched when -# a name matches a lookup key (the right-hand side is ignored). -# Continue long lines by starting the next line with whitespace. -# -# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". -# -#mydestination = $myhostname, localhost.$mydomain, localhost -mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain -#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, -# mail.$mydomain, www.$mydomain, ftp.$mydomain - -# REJECTING MAIL FOR UNKNOWN LOCAL USERS -# -# The local_recipient_maps parameter specifies optional lookup tables -# with all names or addresses of users that are local with respect -# to $mydestination, $inet_interfaces or $proxy_interfaces. -# -# If this parameter is defined, then the SMTP server will reject -# mail for unknown local users. This parameter is defined by default. -# -# To turn off local recipient checking in the SMTP server, specify -# local_recipient_maps = (i.e. empty). -# -# The default setting assumes that you use the default Postfix local -# delivery agent for local delivery. You need to update the -# local_recipient_maps setting if: -# -# - You define $mydestination domain recipients in files other than -# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files. -# For example, you define $mydestination domain recipients in -# the $virtual_mailbox_maps files. -# -# - You redefine the local delivery agent in master.cf. -# -# - You redefine the "local_transport" setting in main.cf. -# -# - You use the "luser_relay", "mailbox_transport", or "fallback_transport" -# feature of the Postfix local delivery agent (see local(8)). -# -# Details are described in the LOCAL_RECIPIENT_README file. -# -# Beware: if the Postfix SMTP server runs chrooted, you probably have -# to access the passwd file via the proxymap service, in order to -# overcome chroot restrictions. The alternative, having a copy of -# the system passwd file in the chroot jail is just not practical. -# -# The right-hand side of the lookup tables is conveniently ignored. -# In the left-hand side, specify a bare username, an @domain.tld -# wild-card, or specify a user@domain.tld address. -# -#local_recipient_maps = unix:passwd.byname $alias_maps -#local_recipient_maps = proxy:unix:passwd.byname $alias_maps -#local_recipient_maps = - -# The unknown_local_recipient_reject_code specifies the SMTP server -# response code when a recipient domain matches $mydestination or -# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty -# and the recipient address or address local-part is not found. -# -# The default setting is 550 (reject mail) but it is safer to start -# with 450 (try again later) until you are certain that your -# local_recipient_maps settings are OK. -# -unknown_local_recipient_reject_code = 550 - -# TRUST AND RELAY CONTROL - -# The mynetworks parameter specifies the list of "trusted" SMTP -# clients that have more privileges than "strangers". -# -# In particular, "trusted" SMTP clients are allowed to relay mail -# through Postfix. See the smtpd_recipient_restrictions parameter -# in postconf(5). -# -# You can specify the list of "trusted" network addresses by hand -# or you can let Postfix do it for you (which is the default). -# -# By default (mynetworks_style = subnet), Postfix "trusts" SMTP -# clients in the same IP subnetworks as the local machine. -# On Linux, this does works correctly only with interfaces specified -# with the "ifconfig" command. -# -# Specify "mynetworks_style = class" when Postfix should "trust" SMTP -# clients in the same IP class A/B/C networks as the local machine. -# Don't do this with a dialup site - it would cause Postfix to "trust" -# your entire provider's network. Instead, specify an explicit -# mynetworks list by hand, as described below. -# -# Specify "mynetworks_style = host" when Postfix should "trust" -# only the local machine. -# -#mynetworks_style = class -#mynetworks_style = subnet -#mynetworks_style = host - -# Alternatively, you can specify the mynetworks list by hand, in -# which case Postfix ignores the mynetworks_style setting. -# -# Specify an explicit list of network/netmask patterns, where the -# mask specifies the number of bits in the network part of a host -# address. -# -# You can also specify the absolute pathname of a pattern file instead -# of listing the patterns here. Specify type:table for table-based lookups -# (the value on the table right-hand side is not used). -# -#mynetworks = 168.100.189.0/28, 127.0.0.0/8 -#mynetworks = $config_directory/mynetworks -#mynetworks = hash:/etc/postfix/network_table -mynetworks = 127.0.0.0/8 - -# The relay_domains parameter restricts what destinations this system will -# relay mail to. See the smtpd_recipient_restrictions description in -# postconf(5) for detailed information. -# -# By default, Postfix relays mail -# - from "trusted" clients (IP address matches $mynetworks) to any destination, -# - from "untrusted" clients to destinations that match $relay_domains or -# subdomains thereof, except addresses with sender-specified routing. -# The default relay_domains value is $mydestination. -# -# In addition to the above, the Postfix SMTP server by default accepts mail -# that Postfix is final destination for: -# - destinations that match $inet_interfaces or $proxy_interfaces, -# - destinations that match $mydestination -# - destinations that match $virtual_alias_domains, -# - destinations that match $virtual_mailbox_domains. -# These destinations do not need to be listed in $relay_domains. -# -# Specify a list of hosts or domains, /file/name patterns or type:name -# lookup tables, separated by commas and/or whitespace. Continue -# long lines by starting the next line with whitespace. A file name -# is replaced by its contents; a type:name table is matched when a -# (parent) domain appears as lookup key. -# -# NOTE: Postfix will not automatically forward mail for domains that -# list this system as their primary or backup MX host. See the -# permit_mx_backup restriction description in postconf(5). -# -#relay_domains = $mydestination - -# INTERNET OR INTRANET - -# The relayhost parameter specifies the default host to send mail to -# when no entry is matched in the optional transport(5) table. When -# no relayhost is given, mail is routed directly to the destination. -# -# On an intranet, specify the organizational domain name. If your -# internal DNS uses no MX records, specify the name of the intranet -# gateway host instead. -# -# In the case of SMTP, specify a domain, host, host:port, [host]:port, -# [address] or [address]:port; the form [host] turns off MX lookups. -# -# If you're connected via UUCP, see also the default_transport parameter. -# -#relayhost = $mydomain -#relayhost = [gateway.my.domain] -#relayhost = [mailserver.isp.tld] -#relayhost = uucphost -#relayhost = [an.ip.add.ress] - -# REJECTING UNKNOWN RELAY USERS -# -# The relay_recipient_maps parameter specifies optional lookup tables -# with all addresses in the domains that match $relay_domains. -# -# If this parameter is defined, then the SMTP server will reject -# mail for unknown relay users. This feature is off by default. -# -# The right-hand side of the lookup tables is conveniently ignored. -# In the left-hand side, specify an @domain.tld wild-card, or specify -# a user@domain.tld address. -# -#relay_recipient_maps = hash:/etc/postfix/relay_recipients - -# INPUT RATE CONTROL -# -# The in_flow_delay configuration parameter implements mail input -# flow control. This feature is turned on by default, although it -# still needs further development (it's disabled on SCO UNIX due -# to an SCO bug). -# -# A Postfix process will pause for $in_flow_delay seconds before -# accepting a new message, when the message arrival rate exceeds the -# message delivery rate. With the default 100 SMTP server process -# limit, this limits the mail inflow to 100 messages a second more -# than the number of messages delivered per second. -# -# Specify 0 to disable the feature. Valid delays are 0..10. -# -#in_flow_delay = 1s - -# ADDRESS REWRITING -# -# The ADDRESS_REWRITING_README document gives information about -# address masquerading or other forms of address rewriting including -# username->Firstname.Lastname mapping. - -# ADDRESS REDIRECTION (VIRTUAL DOMAIN) -# -# The VIRTUAL_README document gives information about the many forms -# of domain hosting that Postfix supports. - -# "USER HAS MOVED" BOUNCE MESSAGES -# -# See the discussion in the ADDRESS_REWRITING_README document. - -# TRANSPORT MAP -# -# See the discussion in the ADDRESS_REWRITING_README document. - -# ALIAS DATABASE -# -# The alias_maps parameter specifies the list of alias databases used -# by the local delivery agent. The default list is system dependent. -# -# On systems with NIS, the default is to search the local alias -# database, then the NIS alias database. See aliases(5) for syntax -# details. -# -# If you change the alias database, run "postalias /etc/aliases" (or -# wherever your system stores the mail alias file), or simply run -# "newaliases" to build the necessary DBM or DB file. -# -# It will take a minute or so before changes become visible. Use -# "postfix reload" to eliminate the delay. -# -#alias_maps = dbm:/etc/aliases -#alias_maps = hash:/etc/aliases -#alias_maps = hash:/etc/aliases, nis:mail.aliases -#alias_maps = netinfo:/aliases - -# The alias_database parameter specifies the alias database(s) that -# are built with "newaliases" or "sendmail -bi". This is a separate -# configuration parameter, because alias_maps (see above) may specify -# tables that are not necessarily all under control by Postfix. -# -#alias_database = dbm:/etc/aliases -#alias_database = dbm:/etc/mail/aliases -#alias_database = hash:/etc/aliases -#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases - -# ADDRESS EXTENSIONS (e.g., user+foo) -# -# The recipient_delimiter parameter specifies the separator between -# user names and address extensions (user+foo). See canonical(5), -# local(8), relocated(5) and virtual(5) for the effects this has on -# aliases, canonical, virtual, relocated and .forward file lookups. -# Basically, the software tries user+foo and .forward+foo before -# trying user and .forward. -# -#recipient_delimiter = + - -# DELIVERY TO MAILBOX -# -# The home_mailbox parameter specifies the optional pathname of a -# mailbox file relative to a user's home directory. The default -# mailbox file is /var/spool/mail/user or /var/mail/user. Specify -# "Maildir/" for qmail-style delivery (the / is required). -# -#home_mailbox = Mailbox -#home_mailbox = Maildir/ - -# The mail_spool_directory parameter specifies the directory where -# UNIX-style mailboxes are kept. The default setting depends on the -# system type. -# -#mail_spool_directory = /var/mail -#mail_spool_directory = /var/spool/mail - -# The mailbox_command parameter specifies the optional external -# command to use instead of mailbox delivery. The command is run as -# the recipient with proper HOME, SHELL and LOGNAME environment settings. -# Exception: delivery for root is done as $default_user. -# -# Other environment variables of interest: USER (recipient username), -# EXTENSION (address extension), DOMAIN (domain part of address), -# and LOCAL (the address localpart). -# -# Unlike other Postfix configuration parameters, the mailbox_command -# parameter is not subjected to $parameter substitutions. This is to -# make it easier to specify shell syntax (see example below). -# -# Avoid shell meta characters because they will force Postfix to run -# an expensive shell process. Procmail alone is expensive enough. -# -# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN -# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. -# -mailbox_command = /usr/lib/dovecot/deliver -#mailbox_command = /usr/bin/procmail -a "$EXTENSION" - -# The mailbox_transport specifies the optional transport in master.cf -# to use after processing aliases and .forward files. This parameter -# has precedence over the mailbox_command, fallback_transport and -# luser_relay parameters. -# -# Specify a string of the form transport:nexthop, where transport is -# the name of a mail delivery transport defined in master.cf. The -# :nexthop part is optional. For more details see the sample transport -# configuration file. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must update the "local_recipient_maps" setting in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" -# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. -#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp -# -# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and -# subsequent line in master.cf. -#mailbox_transport = cyrus - -# The fallback_transport specifies the optional transport in master.cf -# to use for recipients that are not found in the UNIX passwd database. -# This parameter has precedence over the luser_relay parameter. -# -# Specify a string of the form transport:nexthop, where transport is -# the name of a mail delivery transport defined in master.cf. The -# :nexthop part is optional. For more details see the sample transport -# configuration file. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must update the "local_recipient_maps" setting in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -#fallback_transport = lmtp:unix:/file/name -#fallback_transport = cyrus -#fallback_transport = - -# The luser_relay parameter specifies an optional destination address -# for unknown recipients. By default, mail for unknown@$mydestination, -# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned -# as undeliverable. -# -# The following expansions are done on luser_relay: $user (recipient -# username), $shell (recipient shell), $home (recipient home directory), -# $recipient (full recipient address), $extension (recipient address -# extension), $domain (recipient domain), $local (entire recipient -# localpart), $recipient_delimiter. Specify ${name?value} or -# ${name:value} to expand value only when $name does (does not) exist. -# -# luser_relay works only for the default Postfix local delivery agent. -# -# NOTE: if you use this feature for accounts not in the UNIX password -# file, then you must specify "local_recipient_maps =" (i.e. empty) in -# the main.cf file, otherwise the SMTP server will reject mail for -# non-UNIX accounts with "User unknown in local recipient table". -# -#luser_relay = $user@other.host -#luser_relay = $local@other.host -#luser_relay = admin+$local - -# JUNK MAIL CONTROLS -# -# The controls listed here are only a very small subset. The file -# SMTPD_ACCESS_README provides an overview. - -# The header_checks parameter specifies an optional table with patterns -# that each logical message header is matched against, including -# headers that span multiple physical lines. -# -# By default, these patterns also apply to MIME headers and to the -# headers of attached messages. With older Postfix versions, MIME and -# attached message headers were treated as body text. -# -# For details, see "man header_checks". -# -#header_checks = regexp:/etc/postfix/header_checks - -# FAST ETRN SERVICE -# -# Postfix maintains per-destination logfiles with information about -# deferred mail, so that mail can be flushed quickly with the SMTP -# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". -# See the ETRN_README document for a detailed description. -# -# The fast_flush_domains parameter controls what destinations are -# eligible for this service. By default, they are all domains that -# this server is willing to relay mail to. -# -#fast_flush_domains = $relay_domains - -# SHOW SOFTWARE VERSION OR NOT -# -# The smtpd_banner parameter specifies the text that follows the 220 -# code in the SMTP server's greeting banner. Some people like to see -# the mail version advertised. By default, Postfix shows no version. -# -# You MUST specify $myhostname at the start of the text. That is an -# RFC requirement. Postfix itself does not care. -# -#smtpd_banner = $myhostname ESMTP $mail_name -#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) - - -# PARALLEL DELIVERY TO THE SAME DESTINATION -# -# How many parallel deliveries to the same user or domain? With local -# delivery, it does not make sense to do massively parallel delivery -# to the same user, because mailbox updates must happen sequentially, -# and expensive pipelines in .forward files can cause disasters when -# too many are run at the same time. With SMTP deliveries, 10 -# simultaneous connections to the same domain could be sufficient to -# raise eyebrows. -# -# Each message delivery transport has its XXX_destination_concurrency_limit -# parameter. The default is $default_destination_concurrency_limit for -# most delivery transports. For the local delivery agent the default is 2. - -#local_destination_concurrency_limit = 2 -#default_destination_concurrency_limit = 20 - -# DEBUGGING CONTROL -# -# The debug_peer_level parameter specifies the increment in verbose -# logging level when an SMTP client or server host name or address -# matches a pattern in the debug_peer_list parameter. -# -#debug_peer_level = 2 - -# The debug_peer_list parameter specifies an optional list of domain -# or network patterns, /file/name patterns or type:name tables. When -# an SMTP client or server host name or address matches a pattern, -# increase the verbose logging level by the amount specified in the -# debug_peer_level parameter. -# -#debug_peer_list = 127.0.0.1 -#debug_peer_list = some.domain - -# The debugger_command specifies the external command that is executed -# when a Postfix daemon program is run with the -D option. -# -# Use "command .. & sleep 5" so that the debugger can attach before -# the process marches on. If you use an X-based debugger, be sure to -# set up your XAUTHORITY environment variable before starting Postfix. -# -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - -# If you can't use X, use this to capture the call stack when a -# daemon crashes. The result is in a file in the configuration -# directory, and is named after the process name and the process ID. -# -# debugger_command = -# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; -# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 -# >$config_directory/$process_name.$process_id.log & sleep 5 -# -# Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r -# " where uniquely matches one of the detached -# sessions (from "screen -list"). -# -# debugger_command = -# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen -# -dmS $process_name gdb $daemon_directory/$process_name -# $process_id & sleep 1 - -# INSTALL-TIME CONFIGURATION INFORMATION -# -# The following parameters are used when installing a new Postfix version. -# -# sendmail_path: The full pathname of the Postfix sendmail command. -# This is the Sendmail-compatible mail posting interface. -# -sendmail_path = /usr/sbin/sendmail - -# newaliases_path: The full pathname of the Postfix newaliases command. -# This is the Sendmail-compatible command to build alias databases. -# -newaliases_path = /usr/bin/newaliases - -# mailq_path: The full pathname of the Postfix mailq command. This -# is the Sendmail-compatible mail queue listing command. -# -mailq_path = /usr/bin/mailq - -# setgid_group: The group for mail submission and queue management -# commands. This must be a group name with a numerical group ID that -# is not shared with other accounts, not even with the Postfix account. -# -setgid_group = postdrop - -# html_directory: The location of the Postfix HTML documentation. -# -html_directory = no - -# manpage_directory: The location of the Postfix on-line manual pages. -# -manpage_directory = /usr/share/man - -# sample_directory: The location of the Postfix sample configuration files. -# This parameter is obsolete as of Postfix 2.1. -# -sample_directory = /usr/share/doc/postfix - -# readme_directory: The location of the Postfix README files. -# -readme_directory = /usr/share/doc/postfix -inet_protocols = ipv4 - -append_dot_mydomain = no -biff = no -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes -## Dovecot Settings for deliver, SASL Auth and virtual transport -smtpd_sasl_type = dovecot -virtual_transport = dovecot -dovecot_destination_recipient_limit = 1 -smtpd_sasl_path = private/auth - -# Virtual delivery settings -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = $smtpd_tls_cert_file -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes \ No newline at end of file diff --git a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_master.cf b/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_master.cf deleted file mode 100644 index 5e2f5036..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_master.cf +++ /dev/null @@ -1,115 +0,0 @@ -# -# Postfix master process configuration file. For details on the format -# of the file, see the master(5) manual page (command: "man 5 master"). -# -# Do not forget to execute "postfix reload" after editing this file. -# -# ========================================================================== -# service type private unpriv chroot wakeup maxproc command + args -# (yes) (yes) (yes) (never) (100) -# ========================================================================== -smtp inet n - - - - smtpd -#smtp inet n - - - 1 postscreen -#smtpd pass - - - - - smtpd -#dnsblog unix - - - - 0 dnsblog -#tlsproxy unix - - - - 0 tlsproxy -#submission inet n - - - - smtpd -# -o syslog_name=postfix/submission -# -o smtpd_tls_security_level=encrypt -# -o smtpd_sasl_auth_enable=yes -# -o smtpd_client_restrictions=permit_sasl_authenticated,reject -# -o milter_macro_daemon_name=ORIGINATING -#smtps inet n - - - - smtpd -# -o syslog_name=postfix/smtps -# -o smtpd_tls_wrappermode=yes -# -o smtpd_sasl_auth_enable=yes -# -o smtpd_client_restrictions=permit_sasl_authenticated,reject -# -o milter_macro_daemon_name=ORIGINATING -#628 inet n - - - - qmqpd -pickup fifo n - - 60 1 pickup -cleanup unix n - - - 0 cleanup -qmgr fifo n - n 300 1 qmgr -#qmgr fifo n - n 300 1 oqmgr -tlsmgr unix - - - 1000? 1 tlsmgr -rewrite unix - - - - - trivial-rewrite -bounce unix - - - - 0 bounce -defer unix - - - - 0 bounce -trace unix - - - - 0 bounce -verify unix - - - - 1 verify -flush unix n - - 1000? 0 flush -proxymap unix - - n - - proxymap -proxywrite unix - - n - 1 proxymap -smtp unix - - - - - smtp -relay unix - - - - - smtp -# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 -showq unix n - - - - showq -error unix - - - - - error -retry unix - - - - - error -discard unix - - - - - discard -local unix - n n - - local -virtual unix - n n - - virtual -lmtp unix - - - - - lmtp -anvil unix - - - - 1 anvil -scache unix - - - - 1 scache -# -# ==================================================================== -# Interfaces to non-Postfix software. Be sure to examine the manual -# pages of the non-Postfix software to find out what options it wants. -# -# Many of the following services use the Postfix pipe(8) delivery -# agent. See the pipe(8) man page for information about ${recipient} -# and other message envelope options. -# ==================================================================== -# -# maildrop. See the Postfix MAILDROP_README file for details. -# Also specify in main.cf: maildrop_destination_recipient_limit=1 -# -maildrop unix - n n - - pipe - flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} -# -# ==================================================================== -# -# Recent Cyrus versions can use the existing "lmtp" master.cf entry. -# -# Specify in cyrus.conf: -# lmtp cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4 -# -# Specify in main.cf one or more of the following: -# mailbox_transport = lmtp:inet:localhost -# virtual_transport = lmtp:inet:localhost -# -# ==================================================================== -# -# Cyrus 2.1.5 (Amos Gouaux) -# Also specify in main.cf: cyrus_destination_recipient_limit=1 -# -#cyrus unix - n n - - pipe -# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} -# -# ==================================================================== -# Old example of delivery via Cyrus. -# -#old-cyrus unix - n n - - pipe -# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user} -# -# ==================================================================== -# -# See the Postfix UUCP_README file for configuration details. -# -uucp unix - n n - - pipe - flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) -# -# Other external delivery methods. -# -ifmail unix - n n - - pipe - flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) -bsmtp unix - n n - - pipe - flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -t$nexthop -f$sender $recipient -scalemail-backend unix - n n - 2 pipe - flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension} -mailman unix - n n - - pipe - flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py - ${nexthop} ${user} -# Dovecot LDA -dovecot unix - n n - - pipe - flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient} diff --git a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index 090b6465..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index a962d086..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/debian_wheezy/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/debian_wheezy/postfix_mxaccess/etc_postfix_main.cf deleted file mode 100644 index 82b23a03..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_mxaccess/etc_postfix_main.cf +++ /dev/null @@ -1,25 +0,0 @@ -# -# ATTENTION - this is not the full postfix-main.cf file -# -# it only provides additional configuration-entries! -# - -# -# look for the follow statement -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient - -# -# and extend it with the following line -# so it looks like this -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient, - check_recipient_mx_access cidr:/etc/postfix/mx_access diff --git a/templates/misc/configfiles/debian_wheezy/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/debian_wheezy/postfix_mxaccess/etc_postfix_mx_access deleted file mode 100644 index 18a1ec5f..00000000 --- a/templates/misc/configfiles/debian_wheezy/postfix_mxaccess/etc_postfix_mx_access +++ /dev/null @@ -1,9 +0,0 @@ -0.0.0.0/8 REJECT Domain MX in broadcast network -10.0.0.0/8 REJECT Domain MX in RFC 1918 private network -169.254.0.0/16 REJECT Domain MX in link local network -172.16.0.0/12 REJECT Domain MX in RFC 1918 private network -192.0.2.0/24 REJECT Domain MX in TEST-NET network -192.168.0.0/16 REJECT Domain MX in RFC 1918 private network -224.0.0.0/4 REJECT Domain MX in class D multicast network -240.0.0.0/5 REJECT Domain MX in class E reserved network -248.0.0.0/5 REJECT Domain MX in reserved network diff --git a/templates/misc/configfiles/debian_wheezy/powerdns/etc_powerdns_bindbackend.conf b/templates/misc/configfiles/debian_wheezy/powerdns/etc_powerdns_bindbackend.conf deleted file mode 100644 index 168ce662..00000000 --- a/templates/misc/configfiles/debian_wheezy/powerdns/etc_powerdns_bindbackend.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Bind backend configuration - -# Location of the Bind configuration file to parse. -bind-config=named.conf - -# How often to check for zone changes. See 'Operation' section. -bind-check-interval=180 - -# Uncomment to enable Huffman compression on zone data. -# Currently saves around 20% of memory actually used, but slows down operation. -# bind-enable-huffman - diff --git a/templates/misc/configfiles/debian_wheezy/powerdns/etc_powerdns_pdns.conf b/templates/misc/configfiles/debian_wheezy/powerdns/etc_powerdns_pdns.conf deleted file mode 100644 index 977534f9..00000000 --- a/templates/misc/configfiles/debian_wheezy/powerdns/etc_powerdns_pdns.conf +++ /dev/null @@ -1,314 +0,0 @@ -# Autogenerated configuration file template -################################# -# allow-axfr-ips If enabled, restrict zonetransfers to originate from these -# IP addresses -# -allow-axfr-ips= - -################################# -# allow-recursion List of netmasks that are allowed to recurse -# -allow-recursion=127.0.0.1 - -################################# -# allow-recursion-override Local data even about hosts that don't exist will -# override the internet. (on/off) -# -# allow-recursion-override= - -################################# -# cache-ttl Seconds to store packets in the PacketCache -# -# cache-ttl=20 - -################################# -# chroot If set, chroot to this directory for more security -# -# chroot=/var/spool/powerdns - -################################# -# config-dir Location of configuration directory (pdns.conf) -# -config-dir=/etc/powerdns - -################################# -# config-name Name of this virtual configuration - will rename the binary image -# -# config-name= - -################################# -# control-console Debugging switch - don't use -# -# control-console=no - -################################# -# daemon Operate as a daemon -# -daemon=yes - -################################# -# default-soa-name name to insert in the SOA record if none set in the backend -# -# default-soa-name=a.misconfigured.powerdns.server - -################################# -# disable-axfr Disable zonetransfers but do allow TCP queries -# -disable-axfr=yes - -################################# -# disable-tcp Do not listen to TCP queries -# -# disable-tcp=no - -################################# -# distributor-threads Default number of Distributor (backend) threads to start -# -# distributor-threads=3 - -################################# -# fancy-records Process URL and MBOXFW records -# -# fancy-records=no - -################################# -# guardian Run within a guardian process -# -guardian=yes - -################################# -# launch Which backends to launch and order to query them in -# -launch=bind - -################################# -# lazy-recursion Only recurse if question cannot be answered locally -# -lazy-recursion=yes - -################################# -# load-modules Load this module - supply absolute or relative path -# -# load-modules= - -################################# -# local-address Local IP address to which we bind -# -local-address=,127.0.0.1 - -################################# -# local-ipv6 Local IP address to which we bind -# -# local-ipv6= - -################################# -# local-port The port on which we listen -# -local-port=53 - -################################# -# log-dns-details If PDNS should log failed update requests -# -log-dns-details=yes - -################################# -# log-failed-updates If PDNS should log failed update requests -# -# log-failed-updates= - -################################# -# logfile Logfile to use -# -# logfile=/var/log/pdns.log - -################################# -# logging-facility Log under a specific facility -# -# logging-facility= - -################################# -# loglevel Amount of logging. Higher is more. Do not set below 3 -# -# loglevel=4 - -################################# -# master Act as a master -# -master=yes - -################################# -# max-queue-length Maximum queuelength before considering situation lost -# -# max-queue-length=5000 - -################################# -# max-tcp-connections Maximum number of TCP connections -# -# max-tcp-connections=10 - -################################# -# module-dir Default directory for modules -# -module-dir=/usr/lib/powerdns - -################################# -# negquery-cache-ttl Seconds to store packets in the PacketCache -# -# negquery-cache-ttl=60 - -################################# -# out-of-zone-additional-processing Do out of zone additional processing -# -# out-of-zone-additional-processing=no - -################################# -# query-cache-ttl Seconds to store packets in the PacketCache -# -# query-cache-ttl=20 - -################################# -# query-logging Hint backends that queries should be logged -# -# query-logging=no - -################################# -# queue-limit Maximum number of milliseconds to queue a query -# -# queue-limit=1500 - -################################# -# query-local-address The IP address to use as a source address for sending -# queries. -# query-local-address= - -################################# -# receiver-threads Number of receiver threads to launch -# -# receiver-threads=1 - -################################# -# recursive-cache-ttl Seconds to store packets in the PacketCache -# -# recursive-cache-ttl=10 - -################################# -# recursor If recursion is desired, IP address of a recursing nameserver -# -# recursor= - -################################# -# setgid If set, change group id to this gid for more security -# -setgid=pdns - -################################# -# setuid If set, change user id to this uid for more security -# -setuid=pdns - -################################# -# skip-cname Do not perform CNAME indirection for each query -# -# skip-cname=no - -################################# -# slave Act as a slave -# -# slave=no - -################################# -# slave-cycle-interval Reschedule failed SOA serial checks once every .. seconds -# -# slave-cycle-interval=60 - -################################# -# smtpredirector Our smtpredir MX host -# -# smtpredirector=a.misconfigured.powerdns.smtp.server - -################################# -# soa-minimum-ttl Default SOA mininum ttl -# -# soa-minimum-ttl=3600 - -################################# -# soa-refresh-default Default SOA refresh -# -# soa-refresh-default=10800 - -################################# -# soa-retry-default Default SOA retry -# -# soa-retry-default=3600 - -################################# -# soa-expire-default Default SOA expire -# -# soa-expire-default=604800 - -################################# -# soa-serial-offset Make sure that no SOA serial is less than this number -# -# soa-serial-offset=0 - -################################# -# socket-dir Where the controlsocket will live -# -socket-dir=/var/run - -################################# -# strict-rfc-axfrs Perform strictly rfc compliant axfrs (very slow) -# -# strict-rfc-axfrs=no - -################################# -# urlredirector Where we send hosts to that need to be url redirected -# -# urlredirector=127.0.0.1 - -################################# -# use-logfile Use a log file -# -# use-logfile=yes - -################################# -# webserver Start a webserver for monitoring -# -# webserver=no - -################################# -# webserver-address IP Address of webserver to listen on -# -# webserver-address=127.0.0.1 - -################################# -# webserver-password Password required for accessing the webserver -# -# webserver-password= - -################################# -# webserver-port Port of webserver to listen on -# -# webserver-port=8081 - -################################# -# webserver-print-arguments If the webserver should print arguments -# -# webserver-print-arguments=no - -################################# -# wildcard-url Process URL and MBOXFW records -# -# wildcard-url=no - -################################# -# wildcards Honor wildcards in the database -# -# wildcards= - -################################# -# version-string What should PowerDNS return for version -# allowed methods are anonymous / powerdns / full / custom -version-string=powerdns - -include=/etc/powerdns/pdns.d diff --git a/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_modules.conf b/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_modules.conf deleted file mode 100644 index 0c555bcb..00000000 --- a/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_modules.conf +++ /dev/null @@ -1,96 +0,0 @@ -# -# This file is used to manage DSO modules and features. -# - -# This is the directory where DSO modules reside - -ModulePath /usr/lib/proftpd - -# Allow only user root to load and unload modules, but allow everyone -# to see which modules have been loaded - -ModuleControlsACLs insmod,rmmod allow user root -ModuleControlsACLs lsmod allow user * - -LoadModule mod_ctrls_admin.c -LoadModule mod_tls.c - -# Install one of proftpd-mod-mysql, proftpd-mod-pgsql or any other -# SQL backend engine to use this module and the required backend. -# This module must be mandatory loaded before anyone of -# the existent SQL backeds. -LoadModule mod_sql.c - -# Install proftpd-mod-ldap to use this -#LoadModule mod_ldap.c - -# -# 'SQLBackend mysql' or 'SQLBackend postgres' (or any other valid backend) directives -# are required to have SQL authorization working. You can also comment out the -# unused module here, in alternative. -# - -# Install proftpd-mod-mysql and decomment the previous -# mod_sql.c module to use this. -LoadModule mod_sql_mysql.c - -# Install proftpd-mod-pgsql and decomment the previous -# mod_sql.c module to use this. -#LoadModule mod_sql_postgres.c - -# Install proftpd-mod-sqlite and decomment the previous -# mod_sql.c module to use this -#LoadModule mod_sql_sqlite.c - -# Install proftpd-mod-odbc and decomment the previous -# mod_sql.c module to use this -#LoadModule mod_sql_odbc.c - -# Install one of the previous SQL backends and decomment -# the previous mod_sql.c module to use this -#LoadModule mod_sql_passwd.c - -LoadModule mod_radius.c -LoadModule mod_quotatab.c -LoadModule mod_quotatab_file.c - -# Install proftpd-mod-ldap to use this -#LoadModule mod_quotatab_ldap.c - -# Install one of the previous SQL backends and decomment -# the previous mod_sql.c module to use this -LoadModule mod_quotatab_sql.c -LoadModule mod_quotatab_radius.c -LoadModule mod_wrap.c -LoadModule mod_rewrite.c -LoadModule mod_load.c -LoadModule mod_ban.c -LoadModule mod_wrap2.c -LoadModule mod_wrap2_file.c -# Install one of the previous SQL backends and decomment -# the previous mod_sql.c module to use this -#LoadModule mod_wrap2_sql.c -LoadModule mod_dynmasq.c -LoadModule mod_exec.c -LoadModule mod_shaper.c -LoadModule mod_ratio.c -LoadModule mod_site_misc.c - -LoadModule mod_sftp.c -LoadModule mod_sftp_pam.c -# Install one of the previous SQL backends and decomment -# the previous mod_sql.c module to use this -#LoadModule mod_sftp_sql.c - -LoadModule mod_facl.c -LoadModule mod_unique_id.c -LoadModule mod_copy.c -LoadModule mod_deflate.c -LoadModule mod_ifversion.c -# this is disabled because wheezy's proftpd does not have memcache compiled, -# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707680 -#LoadModule mod_tls_memcache.c - -# keep this module the last one -LoadModule mod_ifsession.c - diff --git a/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index c0c28b09..00000000 --- a/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,189 +0,0 @@ -# -# /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file. -# To really apply changes, reload proftpd after modifications, if -# it runs in daemon mode. It is not required in inetd/xinetd mode. -# - -# Includes DSO modules -Include /etc/proftpd/modules.conf - -# Set off to disable IPv6 support which is annoying on IPv4 only boxes. -UseIPv6 on -# If set on you can experience a longer connection delay in many cases. -IdentLookups off - -ServerName " FTP Server" -ServerType standalone -DeferWelcome off - -MultilineRFC2228 on -DefaultServer on -ShowSymlinks on - -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 1200 - -DisplayLogin welcome.msg -DisplayChdir .message true -ListOptions "-l" - -DenyFilter \*.*/ - -# Use this to jail all users in their homes -# DefaultRoot ~ - -# Users require a valid shell listed in /etc/shells to login. -# Use this directive to release that constrain. -# RequireValidShell off - -# Port 21 is the standard FTP port. -Port 21 - -# In some cases you have to specify passive ports range to by-pass -# firewall limitations. Ephemeral ports can be used for that, but -# feel free to use a more narrow range. -# PassivePorts 49152 65534 - -# If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public -# address and opening the passive ports used on your firewall as well. -# MasqueradeAddress 1.2.3.4 - -# This is useful for masquerading address with dynamic IPs: -# refresh any configured MasqueradeAddress directives every 8 hours - -# DynMasqRefresh 28800 - - -# To prevent DoS attacks, set the maximum number of child processes -# to 30. If you need to allow more than 30 concurrent connections -# at once, simply increase this value. Note that this ONLY works -# in standalone mode, in inetd mode you should use an inetd server -# that allows you to limit maximum number of processes per service -# (such as xinetd) -MaxInstances 30 - -# Set the user and group that the server normally runs at. -User proftpd -Group nogroup - -# Umask 022 is a good standard umask to prevent new files and dirs -# (second parm) from being group and world writable. -Umask 022 022 -# Normally, we want files to be overwriteable. -AllowOverwrite on - -# Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: -# PersistentPasswd off - -# This is required to use both PAM-based authentication and local passwords -# AuthOrder mod_auth_pam.c* mod_auth_unix.c - -# Be warned: use of this directive impacts CPU average load! -# Uncomment this if you like to see progress and transfer rate with ftpwho -# in downloads. That is not needed for uploads rates. -# -# UseSendFile off - -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - -# Logging onto /var/log/lastlog is enabled but set to off by default -#UseLastlog on - -# In order to keep log file dates consistent after chroot, use timezone info -# from /etc/localtime. If this is not set, and proftpd is configured to -# chroot (e.g. DefaultRoot or ), it will use the non-daylight -# savings timezone regardless of whether DST is in effect. -#SetEnv TZ :/etc/localtime - - -QuotaEngine on - - - -Ratios off - - - -# Delay engine reduces impact of the so-called Timing Attack described in -# http://www.securityfocus.com/bid/11430/discuss -# It is on by default. - -DelayEngine on - - - -ControlsEngine off -ControlsMaxClients 2 -ControlsLog /var/log/proftpd/controls.log -ControlsInterval 5 -ControlsSocket /var/run/proftpd/proftpd.sock - - - -AdminControlsEngine off - - -# -# Alternative authentication frameworks -# -#Include /etc/proftpd/ldap.conf -Include /etc/proftpd/sql.conf - -# -# This is used for FTPS connections -# -#Include /etc/proftpd/tls.conf - -# -# Useful to keep VirtualHost/VirtualRoot directives separated -# -#Include /etc/proftpd/virtuals.conf - -# A basic anonymous configuration, no upload directories. - -# -# User ftp -# Group nogroup -# # We want clients to be able to login with "anonymous" as well as "ftp" -# UserAlias anonymous ftp -# # Cosmetic changes, all files belongs to ftp user -# DirFakeUser on ftp -# DirFakeGroup on ftp -# -# RequireValidShell off -# -# # Limit the maximum number of anonymous logins -# MaxClients 10 -# -# # We want 'welcome.msg' displayed at login, and '.message' displayed -# # in each newly chdired directory. -# DisplayLogin welcome.msg -# DisplayChdir .message -# -# # Limit WRITE everywhere in the anonymous chroot -# -# -# DenyAll -# -# -# -# # Uncomment this if you're brave. -# # -# # # Umask 022 is a good standard umask to prevent new files and dirs -# # # (second parm) from being group and world writable. -# # Umask 022 022 -# # -# # DenyAll -# # -# # -# # AllowAll -# # -# # -# -# - -# Include other custom configuration files -Include /etc/proftpd/conf.d/ diff --git a/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_sql.conf b/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_sql.conf deleted file mode 100644 index d05bdb3f..00000000 --- a/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_sql.conf +++ /dev/null @@ -1,37 +0,0 @@ - -DefaultRoot ~ -RequireValidShell off -AuthOrder mod_sql.c - -SQLBackend mysql -SQLEngine on -SQLAuthenticate on - -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -QuotaEngine on -QuotaShowQuotas on -QuotaDisplayUnits Mb -QuotaLock /var/lock/ftpd.quotatab.lock -QuotaLimitTable sql:/get-quota-limit -QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally -SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" -SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" -SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies -SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies - - diff --git a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_default_pure-ftpd-common b/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_default_pure-ftpd-common deleted file mode 100644 index 0781388c..00000000 --- a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_default_pure-ftpd-common +++ /dev/null @@ -1,26 +0,0 @@ -# Configuration for pure-ftpd -# (this file is sourced by /bin/sh, edit accordingly) - -# STANDALONE_OR_INETD -# valid values are "standalone" and "inetd". -# Any change here overrides the setting in debconf. -STANDALONE_OR_INETD=standalone - -# VIRTUALCHROOT: -# whether to use binary with virtualchroot support -# valid values are "true" or "false" -# Any change here overrides the setting in debconf. -VIRTUALCHROOT=false - -# UPLOADSCRIPT: if this is set and the daemon is run in standalone mode, -# pure-uploadscript will also be run to spawn the program given below -# for handling uploads. see /usr/share/doc/pure-ftpd/README.gz or -# pure-uploadscript(8) - -# example: UPLOADSCRIPT=/usr/local/sbin/uploadhandler.pl -UPLOADSCRIPT= - -# if set, pure-uploadscript will spawn running as the -# given uid and gid -UPLOADUID= -UPLOADGID= diff --git a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_Bind b/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_Bind deleted file mode 100644 index aabe6ec3..00000000 --- a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_Bind +++ /dev/null @@ -1 +0,0 @@ -21 diff --git a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone b/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone deleted file mode 100644 index 7cfab5b0..00000000 --- a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_CustomerProof b/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_CustomerProof deleted file mode 100644 index d00491fd..00000000 --- a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_CustomerProof +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime b/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime deleted file mode 100644 index 60d3b2f4..00000000 --- a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime +++ /dev/null @@ -1 +0,0 @@ -15 diff --git a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MinUID b/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MinUID deleted file mode 100644 index 83b33d23..00000000 --- a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MinUID +++ /dev/null @@ -1 +0,0 @@ -1000 diff --git a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile b/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile deleted file mode 100644 index be85bafe..00000000 --- a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile +++ /dev/null @@ -1 +0,0 @@ -/etc/pure-ftpd/db/mysql.conf diff --git a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous b/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous deleted file mode 100644 index 7cfab5b0..00000000 --- a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication b/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication deleted file mode 100644 index 7ecb56eb..00000000 --- a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication +++ /dev/null @@ -1 +0,0 @@ -no diff --git a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_db_mysql.conf b/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_db_mysql.conf deleted file mode 100644 index 916ad0ba..00000000 --- a/templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_db_mysql.conf +++ /dev/null @@ -1,129 +0,0 @@ - -############################################## -# # -# Sample Pure-FTPd Mysql configuration file. # -# See README.MySQL for explanations. # -# # -############################################## - - -# Optional : MySQL server name or IP. Don't define this for unix sockets. - -# MYSQLServer - - -# Optional : MySQL port. Don't define this if a local unix socket is used. - -# MYSQLPort 3306 - - -# Optional : define the location of mysql.sock if the server runs on this host. - -MYSQLSocket /var/run/mysqld/mysqld.sock - - -# Mandatory : user to bind the server as. - -MYSQLUser - - -# Mandatory : user password. You must have a password. - -MYSQLPassword - - -# Mandatory : database to open. - -MYSQLDatabase - - -# Mandatory : how passwords are stored -# Valid values are : "cleartext", "crypt", "sha1", "md5" and "password" -# ("password" = MySQL password() function) -# You can also use "any" to try "crypt", "sha1", "md5" *and* "password" - -MYSQLCrypt any - - -# In the following directives, parts of the strings are replaced at -# run-time before performing queries : -# -# \L is replaced by the login of the user trying to authenticate. -# \I is replaced by the IP address the user connected to. -# \P is replaced by the port number the user connected to. -# \R is replaced by the IP address the user connected from. -# \D is replaced by the remote IP address, as a long decimal number. -# -# Very complex queries can be performed using these substitution strings, -# especially for virtual hosting. - - -# Query to execute in order to fetch the password - -MYSQLGetPW SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y" - - -# Query to execute in order to fetch the system user name or uid - -MYSQLGetUID SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y" - - -# Optional : default UID - if set this overrides MYSQLGetUID - -#MYSQLDefaultUID 1000 - - -# Query to execute in order to fetch the system user group or gid - -MYSQLGetGID SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y" - - -# Optional : default GID - if set this overrides MYSQLGetGID - -#MYSQLDefaultGID 1000 - - -# Query to execute in order to fetch the home directory - -MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y" - - -# Optional : query to get the maximal number of files -# Pure-FTPd must have been compiled with virtual quotas support. - -# MySQLGetQTAFS SELECT QuotaFiles FROM users WHERE User='\L' - - -# Optional : query to get the maximal disk usage (virtual quotas) -# The number should be in Megabytes. -# Pure-FTPd must have been compiled with virtual quotas support. - -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) - - -# Optional : ratios. The server has to be compiled with ratio support. - -# MySQLGetRatioUL SELECT ULRatio FROM users WHERE User='\L' -# MySQLGetRatioDL SELECT DLRatio FROM users WHERE User='\L' - - -# Optional : bandwidth throttling. -# The server has to be compiled with throttling support. -# Values are in KB/s . - -# MySQLGetBandwidthUL SELECT ULBandwidth FROM users WHERE User='\L' -# MySQLGetBandwidthDL SELECT DLBandwidth FROM users WHERE User='\L' - -# Enable ~ expansion. NEVER ENABLE THIS BLINDLY UNLESS : -# 1) You know what you are doing. -# 2) Real and virtual users match. - -# MySQLForceTildeExpansion 1 - - -# If you're using a transactionnal storage engine, you can enable SQL -# transactions to avoid races. Leave this commented if you are using the -# traditional MyIsam engine. - -# MySQLTransactions On - diff --git a/templates/misc/configfiles/freebsd/bind9/etc_namedb_default-zone b/templates/misc/configfiles/freebsd/bind9/etc_namedb_default-zone deleted file mode 100644 index 3d95158a..00000000 --- a/templates/misc/configfiles/freebsd/bind9/etc_namedb_default-zone +++ /dev/null @@ -1,4 +0,0 @@ -zone "default.zone" { - type master; - file "/etc/namedb/master/default.zone"; -}; diff --git a/templates/misc/configfiles/freebsd/bind9/etc_namedb_master_default.zone b/templates/misc/configfiles/freebsd/bind9/etc_namedb_master_default.zone deleted file mode 100644 index 7b751f0a..00000000 --- a/templates/misc/configfiles/freebsd/bind9/etc_namedb_master_default.zone +++ /dev/null @@ -1,45 +0,0 @@ -; default zone - -$TTL 1W - -; SOA Record -@ IN SOA ns0 hostmaster ( - 2013031201 ; serial - 1D ; refresh - 1H ; retry - 1W ; expiry - 1D ; minimum -) - -@ IN NS ns0 - IN MX 10 mail - -@ IN A - IN MX 10 mail - -* IN A - IN MX 10 mail - -; Subdomain Records -ns0 IN A -mail IN A - -; Additional Records -@ IN RP hostmaster . - IN SPF "v=spf1 a mx -all" - IN TXT "dkim=all" - -; Services Records -_http._tcp IN SRV 1 0 80 @ -_http._tcp.www IN SRV 0 0 80 www -_ftp._tcp IN SRV 0 0 20 @ -_ftp._tcp IN SRV 0 0 21 @ -_dns._udp.ns0 IN SRV 0 1 53 ns0 -_dns._tcp.ns0 IN SRV 0 0 53 ns0 -_smtps._tcp.mail IN SRV 0 0 587 mail -_smtps._tcp.mail IN SRV 1 0 465 mail -_smtp._tcp.mail IN SRV 2 0 25 mail -_imaps._tcp.mail IN SRV 0 0 993 mail -_imap._tcp.mail IN SRV 1 0 143 mail -_sieve._tcp.mail IN SRV 0 0 4190 mail -_sieve._tcp.mail IN SRV 1 0 2000 mail diff --git a/templates/misc/configfiles/freebsd/bind9/etc_namedb_named.conf b/templates/misc/configfiles/freebsd/bind9/etc_namedb_named.conf deleted file mode 100644 index 486de9a2..00000000 --- a/templates/misc/configfiles/freebsd/bind9/etc_namedb_named.conf +++ /dev/null @@ -1,32 +0,0 @@ -options { - - ... - - [snip] - - # General - directory "/etc/namedb/working"; - pid-file "/var/run/named.pid"; - - auth-nxdomain no; - - # Cache - dump-file "/var/db/named"; - max-cache-size 8m; - - # DNSSEC - //======================================================================== - // If BIND logs error messages about the root key being expired, - // you will need to update your keys. See https://www.isc.org/bind-keys - //======================================================================== - dnssec-enable yes; - dnssec-validation yes; - dnssec-lookaside auto; - - random-device "/dev/urandom"; - - [/snip] - - ... - -}; \ No newline at end of file diff --git a/templates/misc/configfiles/freebsd/dkim/dkim-filter.conf b/templates/misc/configfiles/freebsd/dkim/dkim-filter.conf deleted file mode 100644 index 579391e2..00000000 --- a/templates/misc/configfiles/freebsd/dkim/dkim-filter.conf +++ /dev/null @@ -1,15 +0,0 @@ -Syslog yes -UMask 002 - -Canonicalization relaxed/simple -Mode sv -SubDomains yes -X-Header yes - -KeyList /usr/local/etc/mail/dkim.key -Domain /usr/local/etc/mail/domains -LogWhy yes - -Socket inet:8891@localhost - -# OmitHeaders Return-Path,Received,Comments,Keywords,Bcc,Resent-Bcc,To diff --git a/templates/misc/configfiles/freebsd/dkim/postfix_dkim_addition.cf b/templates/misc/configfiles/freebsd/dkim/postfix_dkim_addition.cf deleted file mode 100644 index 932caf02..00000000 --- a/templates/misc/configfiles/freebsd/dkim/postfix_dkim_addition.cf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Add these lines to the main.cf to use DKIM -# -milter_default_action = accept -milter_protocol = 2 -smtpd_milters = inet:localhost:8891 -non_smtpd_milters = inet:localhost:8891 diff --git a/templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot-sql.conf b/templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot-sql.conf deleted file mode 100644 index 444801ef..00000000 --- a/templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot-sql.conf +++ /dev/null @@ -1,5 +0,0 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -password_query = SELECT username AS user, password_enc AS password FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp') -user_query = SELECT CONCAT(homedir,maildir) AS home, concat('maildir:',homedir,maildir) AS mail, uid, gid FROM mail_users where (username = '%u' OR email = '%u') diff --git a/templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot.conf b/templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot.conf deleted file mode 100644 index 1b404704..00000000 --- a/templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot.conf +++ /dev/null @@ -1,127 +0,0 @@ -## Dovecot configuration file -# -syslog_facility = local1 -#log_timestamp = .%Y-%m-%d %H:%M:%S -#login_log_format_elements = user=<%u>method=%m rip=%r lip=%l %c -#login_log_format = %$: %s -#log_path = /var/log/dovecot.log -#info_log_path = /var/log/dovecot-info.log -#mail_debug = yes -#auth_debug_passwords= yes -#auth_verbose= yes -# -ssl=no -#ssl_ca_file = /etc/ssl/.crt -#ssl_cert_file = /etc/ssl/.crt -#ssl_key_file = /etc/ssl/.key -#ssl_key_password = -# -# imap imaps pop3 pop3s (use imaps and pop3s if configured for SSL) - -protocols = imap pop3 - -# -# Uncomment the ssl_listen statements and comment out listen if using SSL -# -protocol imap { - listen = *:143 -# ssl_listen = *:993 -} - -protocol pop3 { - listen = *:110 -# ssl_listen = *:995 -} -# -shutdown_clients = yes - -login_chroot = yes -disable_plaintext_auth = no -login_process_per_connection = yes -login_processes_count = 2 -login_max_processes_count = 128 -login_max_connections = 256 -login_greeting = Welcome to Mail Server. -verbose_proctitle = no -maildir_copy_with_hardlinks = yes - -protocol imap { - login_executable = /usr/local/libexec/dovecot/imap-login - mail_executable = /usr/local/libexec/dovecot/imap - imap_max_line_length = 65536 - imap_client_workarounds = delay-newmail outlook-idle netscape-eoh tb-extra-mailbox-sep - - # IMAP logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - imap_logout_format = in=%i out=%o -} - -protocol pop3 { - login_executable = /usr/local/libexec/dovecot/pop3-login - mail_executable = /usr/local/libexec/dovecot/pop3 - pop3_uidl_format = %08Xu%08Xv - pop3_client_workarounds = outlook-no-nuls oe-ns-eoh - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s -} - -protocol lda { - postmaster_address = postmaster@ - sendmail_path = /usr/sbin/sendmail -# mail_plugins = sieve -# log_path = /var/log/dovecot-deliver.log -# info_log_path = /var/log/dovecot-deliver.log -} - -protocol managesieve { - # Specify an alternative address:port the daemon must listen on - # (default: *:2000) -# listen = localhost:2000 -# managesieve_logout_format = bytes ( in=%i : out=%o ) -} - - -plugin { -# quota = maildir -# Used by both the Sieve plugin and the ManageSieve protocol -# sieve=~/.dovecot.sieve -# sieve_dir=~/sieve -} - -auth default { - mechanisms = plain login - passdb sql { - args = /usr/local/etc/dovecot-sql.conf - } - userdb sql { - args = /usr/local/etc/dovecot-sql.conf - } - user = root - count = 1 - socket listen { - master { - path = /var/run/dovecot/auth-master - mode = 0660 - user = vmail - group = vmail - } - client { - path = /var/spool/postfix/private/auth - mode = 0660 - user = postfix - group = postfix - } - } -} diff --git a/templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot-sql.conf deleted file mode 100644 index 91ef7d30..00000000 --- a/templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot-sql.conf +++ /dev/null @@ -1,8 +0,0 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve') -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') - -# this query is used for doveadm: -iterate_query = SELECT username AS user FROM mail_users diff --git a/templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf b/templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf deleted file mode 100644 index 98eb1523..00000000 --- a/templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf +++ /dev/null @@ -1,141 +0,0 @@ -### Dovecot 2.x configuration file ### - -mail_plugins = -protocols = imap lmtp sieve -listen = *, [::] - -mail_uid = vmail -mail_gid = vmail -mail_access_groups = vmail - -disable_plaintext_auth = yes -auth_mechanisms = plain login -auth_cache_negative_ttl = 1 mins -auth_cache_size = 1 k - -ssl = yes -#ssl_cert = - -} diff --git a/templates/misc/configfiles/freebsd/libnss/etc_nsswitch.conf b/templates/misc/configfiles/freebsd/libnss/etc_nsswitch.conf deleted file mode 100644 index bfcf8827..00000000 --- a/templates/misc/configfiles/freebsd/libnss/etc_nsswitch.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Make sure that `passwd` and `group` have mysql in their lines -# You should place mysql at the end, so that it is queried after the other mechanisams -# -group: files mysql -group_compat: nis -hosts: files dns -networks: files -passwd: files mysql -passwd_compat: nis -shells: files -services: compat -services_compat: nis -protocols: files -rpc: files - diff --git a/templates/misc/configfiles/freebsd/libnss/usr_local_etc_libnss-mysql-root.cfg b/templates/misc/configfiles/freebsd/libnss/usr_local_etc_libnss-mysql-root.cfg deleted file mode 100644 index 64989771..00000000 --- a/templates/misc/configfiles/freebsd/libnss/usr_local_etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username -password diff --git a/templates/misc/configfiles/freebsd/libnss/usr_local_etc_libnss-mysql.cfg b/templates/misc/configfiles/freebsd/libnss/usr_local_etc_libnss-mysql.cfg deleted file mode 100644 index bafc9126..00000000 --- a/templates/misc/configfiles/freebsd/libnss/usr_local_etc_libnss-mysql.cfg +++ /dev/null @@ -1,18 +0,0 @@ -getpwnam SELECT username, 'x', uid, gid, '0', '', 'MySQL User', homedir, shell, '0' FROM ftp_users WHERE username='%1$s' AND login_enabled = 'Y' LIMIT 1 -getpwuid SELECT username, 'x', uid, gid, '0', '', 'MySQL User', homedir, shell, '0' FROM ftp_users WHERE uid='%1$u' AND login_enabled = 'Y' LIMIT 1 -getpwent SELECT username, 'x', uid, gid, '0', '', 'MySQL User', homedir, shell, '0' FROM ftp_users -getspnam SELECT username, password, '12345', '0', '99999', '7', '', '', '' FROM ftp_users WHERE username='%1$s' LIMIT 1 -getspent SELECT username, password, '12345', '0', '99999', '7', '', '', '' FROM ftp_users -getgrnam SELECT groupname, '', gid FROM ftp_groups WHERE groupname='%1$s' LIMIT 1 -getgrgid SELECT groupname, '', gid FROM ftp_groups WHERE gid='%1$u' LIMIT 1 -getgrent SELECT groupname, '', gid FROM ftp_groups -memsbygid SELECT members FROM ftp_groups WHERE gid='%1$u' -gidsbymem SELECT CONCAT_WS(',', gid) as gid FROM ftp_groups WHERE FIND_IN_SET('%1$s', members) - -host -database -username -password -port 3306 -timeout 10 -compress 0 diff --git a/templates/misc/configfiles/freebsd/logrotate/etc_logrotated_froxlor b/templates/misc/configfiles/freebsd/logrotate/etc_logrotated_froxlor deleted file mode 100644 index d7f7deeb..00000000 --- a/templates/misc/configfiles/freebsd/logrotate/etc_logrotated_froxlor +++ /dev/null @@ -1,16 +0,0 @@ -# -# Froxlor logrotate snipet -# -*.log { - missingok - weekly - rotate 4 - compress - delaycompress - notifempty - create - sharedscripts - postrotate - > /dev/null 2>&1 || true - endscript -} diff --git a/templates/misc/configfiles/freebsd/nginx/usr_local_etc_nginx_nginx.conf b/templates/misc/configfiles/freebsd/nginx/usr_local_etc_nginx_nginx.conf deleted file mode 100644 index a9dc8c55..00000000 --- a/templates/misc/configfiles/freebsd/nginx/usr_local_etc_nginx_nginx.conf +++ /dev/null @@ -1,62 +0,0 @@ -### Nginx configuration file ### - -daemon on; -user www www; -worker_processes 4; - -error_log /var/log/nginx/nginx.log crit; -pid /var/run/nginx.pid; - - -events { - use kqueue; - worker_connections 64; - accept_mutex_delay 50ms; -} - - -http { - - access_log /var/log/nginx/access.log; - - include mime.types; - default_type application/octet-stream; - charset utf-8; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - - # Open File Cache - open_file_cache max=512 inactive=20m; - open_file_cache_valid 60s; - open_file_cache_errors on; - - # FastCGI Cache - fastcgi_cache_key "$scheme$request_method$host$request_uri"; - fastcgi_cache_path /var/tmp/nginx levels=1:2 keys_zone=cache:10m inactive=20m max_size=12m; - fastcgi_temp_path /var/tmp/nginx 1 2; - fastcgi_cache cache; - fastcgi_cache_valid 200 20m; - fastcgi_cache_valid 301 302 304 1h; - fastcgi_cache_valid any 1m; - fastcgi_cache_use_stale error timeout invalid_header http_500; - - # SSL - #ssl_client_certificate /path/to/example.pem; - #ssl_crl /path/to/example.crl; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers HIGH; - ssl_prefer_server_ciphers on; - ssl_session_cache builtin:256 shared:SSL:64k; - ssl_session_timeout 20m; - - # GZip - gzip on; - gzip_vary on; - gzip_comp_level 6; - gzip_static on; - - include /usr/local/etc/nginx/conf.d/*.conf; - -} \ No newline at end of file diff --git a/templates/misc/configfiles/freebsd/postfix/etc_periodic.conf b/templates/misc/configfiles/freebsd/postfix/etc_periodic.conf deleted file mode 100644 index d94d9cb3..00000000 --- a/templates/misc/configfiles/freebsd/postfix/etc_periodic.conf +++ /dev/null @@ -1,4 +0,0 @@ -daily_clean_hoststat_enable="NO" -daily_status_mail_rejects_enable="NO" -daily_status_include_submit_mailq="NO" -daily_submit_queuerun="NO" diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf deleted file mode 100644 index 4c0070fc..00000000 --- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf +++ /dev/null @@ -1,110 +0,0 @@ -smtpd_sender_restrictions = - permit_sasl_authenticated, - reject_sender_login_mismatch, - permit_mynetworks, - reject_unknown_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain, - -smtpd_recipient_restrictions = - permit_mynetworks, - permit_sasl_authenticated, - reject_sender_login_mismatch, - reject_non_fqdn_hostname, - reject_non_fqdn_sender, - reject_non_fqdn_recipient, - reject_unauth_destination, - reject_unauth_pipelining, - reject_invalid_hostname, - reject_rbl_client sbl-xbl.spamhaus.org, - reject_rbl_client ix.dnsbl.manitu.net, -# sqlgrey enable -# check_policy_service inet:127.0.0.1:2501, -# postgrey enable -# check_policy_service inet:127.0.0.1:10023, - -smtpd_client_restrictions = - permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client, - -smtpd_sasl_auth_enable = yes -smtpd_sasl_authenticated_header = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes -smtpd_sasl_type = dovecot -smtpd_sasl_path = private/auth - -soft_bounce = yes - -# Maximum size of Message in bytes (0 = unlimited) -message_size_limit = 0 -mailbox_size_limit = 0 - -smtp_tls_security_level = may -smtpd_tls_security_level = may -smtpd_tls_auth_only = no -smtp_tls_note_starttls_offer = yes -smtpd_tls_key_file = /etc/ssl/.key.unencrypted -smtpd_tls_cert_file = /etc/ssl/.crt -# Just an example for CACert.org -smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt -smtpd_tls_loglevel = 0 -smtpd_tls_received_header = yes -smtpd_tls_session_cache_timeout = 3600s -tls_random_source = dev:/dev/urandom - -virtual_alias_maps = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_mailbox_base = -virtual_mailbox_domains = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_mailbox_limit = 0 -virtual_mailbox_maps = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_uid_maps = static: -virtual_gid_maps = static: -proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps - $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains - $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps - $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks - $smtpd_sender_login_maps -virtual_transport = virtual -## Dovecot Settings for deliver, SASL Auth and virtual transport -# uncomment those line to use Dovecot -#mailbox_command = /usr/local/libexec/dovecot/deliver -#virtual_transport = dovecot -#dovecot_destination_recipient_limit = 1 -#alias_maps = $alias_database -#smtpd_sasl_path = private/auth - -queue_directory = /var/spool/postfix -command_directory = /usr/local/sbin -daemon_directory = /usr/local/libexec/postfix -data_directory = /var/db/postfix -mail_owner = postfix -myhostname = mail.$mydomain -mydomain = -myorigin = $mydomain - -mydestination = $myhostname, -$mydomain, -localhost.$myhostname, -localhost.$mydomain, -localhost - -inet_interfaces = all -unknown_local_recipient_reject_code = 550 -mynetworks_style = host -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 -sendmail_path = /usr/local/sbin/sendmail -newaliases_path = /usr/local/bin/newaliases -mailq_path = /usr/local/bin/mailq -setgid_group = maildrop -html_directory = /usr/local/share/doc/postfix -manpage_directory = /usr/local/man -sample_directory = /usr/local/etc/postfix -readme_directory = /usr/local/share/doc/postfix - diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index 090b6465..00000000 --- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index a962d086..00000000 --- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/freebsd/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/freebsd/postfix_mxaccess/etc_postfix_main.cf deleted file mode 100644 index d4c9f9de..00000000 --- a/templates/misc/configfiles/freebsd/postfix_mxaccess/etc_postfix_main.cf +++ /dev/null @@ -1,25 +0,0 @@ -# -# ATTENTION - this is not the full postfix-main.cf file -# -# it only provides additional configuration-entries! -# - -# -# look for the follow statement -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient - -# -# and extend it with the following line -# so it looks like this -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient, - check_recipient_mx_access cidr:/usr/local/etc/postfix/mx_access diff --git a/templates/misc/configfiles/freebsd/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/freebsd/postfix_mxaccess/etc_postfix_mx_access deleted file mode 100644 index 18a1ec5f..00000000 --- a/templates/misc/configfiles/freebsd/postfix_mxaccess/etc_postfix_mx_access +++ /dev/null @@ -1,9 +0,0 @@ -0.0.0.0/8 REJECT Domain MX in broadcast network -10.0.0.0/8 REJECT Domain MX in RFC 1918 private network -169.254.0.0/16 REJECT Domain MX in link local network -172.16.0.0/12 REJECT Domain MX in RFC 1918 private network -192.0.2.0/24 REJECT Domain MX in TEST-NET network -192.168.0.0/16 REJECT Domain MX in RFC 1918 private network -224.0.0.0/4 REJECT Domain MX in class D multicast network -240.0.0.0/5 REJECT Domain MX in class E reserved network -248.0.0.0/5 REJECT Domain MX in reserved network diff --git a/templates/misc/configfiles/freebsd/powerdns/usr_local_etc_pdns_pdns.conf b/templates/misc/configfiles/freebsd/powerdns/usr_local_etc_pdns_pdns.conf deleted file mode 100644 index da05e560..00000000 --- a/templates/misc/configfiles/freebsd/powerdns/usr_local_etc_pdns_pdns.conf +++ /dev/null @@ -1,10 +0,0 @@ -allow-axfr-ips= -allow-recursion=127.0.0.1 -daemon=yes -guardian=yes -launch=bind -lazy-recursion=yes -recursor= -master=yes -bind-config=froxlor_bind.conf -bind-check-interval=180 diff --git a/templates/misc/configfiles/freebsd/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/freebsd/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index b7725ae2..00000000 --- a/templates/misc/configfiles/freebsd/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,96 +0,0 @@ -# Server settings -ServerName " FTP Server" -ServerType standalone -DefaultServer on -Port 21 -UseIPv6 off -Umask 022 -SyslogLevel emerg -SystemLog /var/log/xferlog -LogFormat auth "%v [%P] %h %t \"%r\" %s" -ExtendedLog /var/log/xferlog AUTH auth - -# General settings -DeferWelcome off -MultilineRFC2228 on -ShowSymlinks on -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 1200 -DisplayLogin welcome.msg -DisplayChdir .message -ListOptions "-l" -DenyFilter \*.*/ -MaxInstances 30 -CommandBufferSize 512 -User nobody -Group nogroup -AllowOverwrite on - -# Allow up- and downloads to be continued -AllowRetrieveRestart On -AllowStoreRestart On - -LoadModule mod_quotatab.c -LoadModule mod_quotatab_sql.c - - - QuotaEngine on - QuotaShowQuotas on - QuotaDisplayUnits Mb - QuotaLock /var/lock/ftpd.quotatab.lock - - - - Ratios off - - - - DelayEngine off - - -LoadModule mod_sql.c -LoadModule mod_sql_mysql.c - - - DefaultRoot ~ - RequireValidShell off - AuthOrder mod_sql.c - SQLBackend mysql - SQLEngine on - SQLAuthenticate on - SQLAuthTypes Crypt - SQLAuthenticate users* groups* - SQLConnectInfo @ - SQLUserInfo ftp_users username password uid gid homedir shell - SQLGroupInfo ftp_groups groupname gid members - SQLUserWhereClause "login_enabled = 'y'" - - SQLLog PASS login - SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - - SQLLog RETR download - SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - - SQLLog STOR upload - SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - - QuotaLimitTable sql:/get-quota-limit - QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally - SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" - SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" - SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies - SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies - - - -# -# TLSEngine on -# TLSLog /var/log/xferlog -# TLSProtocol SSLv23 -# TLSRequired off -# TLSRSACertificateFile /etc/ssl/cert.pem -# TLSRSACertificateKeyFile /etc/ssl/key.pem -# TLSVerifyClient off -# TLSRenegotiate required off -# diff --git a/templates/misc/configfiles/freebsd/pure-ftpd/usr_local_etc_pure-ftpd.conf b/templates/misc/configfiles/freebsd/pure-ftpd/usr_local_etc_pure-ftpd.conf deleted file mode 100644 index 0f5d2c1d..00000000 --- a/templates/misc/configfiles/freebsd/pure-ftpd/usr_local_etc_pure-ftpd.conf +++ /dev/null @@ -1,63 +0,0 @@ -############################################################ -# Configuration file for pure-ftpd wrappers # -############################################################ -BrokenClientsCompatibility no -MaxClientsNumber 30 -Daemonize yes -MaxClientsPerIP 8 -VerboseLog no -DisplayDotFiles yes -AnonymousOnly no -NoAnonymous yes -SyslogFacility ftp -DontResolve yes -MaxIdleTime 10 -MySQLConfigFile /usr/local/etc/pureftpd-mysql.conf -UnixAuthentication yes -LimitRecursion 10000 8 -AnonymousCanCreateDirs no -MaxLoad 4 -# Port range for passive connections replies. - for firewalling. -# PassivePortRange 30000 50000 -# Force an IP address in PASV/EPSV/SPSV replies. - for NAT. -# Symbolic host names are also accepted for gateways with dynamic IP addresses. -# ForcePassiveIP 192.168.0.1 -AntiWarez yes -# IP address/port to listen to (default=all IP and port 21). -# Bind 127.0.0.1,21 -# Maximum bandwidth for *all* users (including anonymous) in KB/s -# Use AnonymousBandwidth *or* UserBandwidth, both makes no sense. -UserBandwidth 512 -# File creation mask. : - 177:077 if you feel paranoid. -Umask 133:022 -# Minimum UID for an authenticated user to log in. -MinUID 100 -# Allow FXP transfers for authenticated users. -AllowUserFXP no -# Allow anonymous FXP for anonymous and non-anonymous users. -AllowAnonymousFXP no -ProhibitDotFilesWrite no -ProhibitDotFilesRead no -AutoRename no -AnonymousCantUpload yes -# Disallow the CHMOD command. Users can't change perms of their files. -#NoChmod yes -# Allow users to resume and upload files, but *NOT* to delete them. -#KeepAllFiles yes -MaxDiskUsage 90 -CustomerProof yes -# This option can accept three values : -# 0 : disable SSL/TLS encryption layer (default). -# 1 : accept both traditional and encrypted sessions. -# 2 : refuse connections that don't use SSL/TLS security mechanisms, -# including anonymous sessions. -# Do _not_ uncomment this blindly. Be sure that : -# 1) Your server has been compiled with SSL/TLS support (--with-tls), -# 2) A valid certificate is in place, -# 3) Only compatible clients will log in. -# TLS 1 -# List of ciphers that will be accepted for SSL/TLS connections -# Prefix with -S: in order to totally disable SSL but not TLS. -# TLSCipherSuite HIGH:MEDIUM:+TLSv1:!SSLv2:+SSLv3 -# IPV4Only yes -# IPV6Only yes diff --git a/templates/misc/configfiles/freebsd/pure-ftpd/usr_local_etc_pureftpd-mysql.conf b/templates/misc/configfiles/freebsd/pure-ftpd/usr_local_etc_pureftpd-mysql.conf deleted file mode 100644 index cca7aa9b..00000000 --- a/templates/misc/configfiles/freebsd/pure-ftpd/usr_local_etc_pureftpd-mysql.conf +++ /dev/null @@ -1,30 +0,0 @@ -############################################## -# Pure-FTPd Mysql configuration file. # -# for use with Froxlor Panel # -############################################## -# Optional : MySQL server name or IP. Don't define this for unix sockets. -# MYSQLServer -# Optional : MySQL port. Don't define this if a local unix socket is used. -# MYSQLPort 3306 -# Optional : define the location of mysql.sock if the server runs on this host. -MYSQLSocket /tmp/mysql.sock -MYSQLUser -MYSQLPassword -MYSQLDatabase -MYSQLCrypt crypt -# \L is replaced by the login of the user trying to authenticate. -# \I IP address connect to # \P port number the user connected to. -# \R is replaced by the IP address the user connected from. # \D is replaced by the remote IP address, as a long decimal number. -MYSQLGetPW SELECT password FROM ftp_users WHERE username='\L' AND login_enabled="y" -MYSQLGetUID SELECT uid FROM ftp_users WHERE username='\L' AND login_enabled="y" -MYSQLGetGID SELECT gid FROM ftp_users WHERE username='\L' AND login_enabled="y" -MYSQLGetDir SELECT homedir FROM ftp_users WHERE username='\L' AND login_enabled="y" -#MySQLGetQTAFS SELECT QuotaFiles FROM ftp_users WHERE User='\L' -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username='\L' AND panel_customers.loginname = SUBSTRING_INDEX('\L','ftp', 1) -# Optional : ratios. The server has to be compiled with ratio support. -# MySQLGetRatioUL SELECT ULRatio FROM users WHERE User='\L' -# MySQLGetRatioDL SELECT DLRatio FROM users WHERE User='\L' -# Optional : bandwidth throttling. The server has to be compiled with throttling support. Values are in KB/s . -# MySQLGetBandwidthUL SELECT ULBandwidth FROM users WHERE User='\L' -# MySQLGetBandwidthDL SELECT DLBandwidth FROM users WHERE User='\L' - diff --git a/templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf b/templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf deleted file mode 100644 index db1a4557..00000000 --- a/templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf +++ /dev/null @@ -1,10 +0,0 @@ - - FastCgiIpcDir - - - Order Deny,Allow - Deny from All - # Prevent accessing this path directly - Allow from env=REDIRECT_STATUS - - diff --git a/templates/misc/configfiles/gentoo/bind/etc_bind_default.zone b/templates/misc/configfiles/gentoo/bind/etc_bind_default.zone deleted file mode 100644 index 817b9bcf..00000000 --- a/templates/misc/configfiles/gentoo/bind/etc_bind_default.zone +++ /dev/null @@ -1,21 +0,0 @@ -$TTL 1W -@ IN SOA ns root ( - 2004060501 ; serial - 8H ; refresh - 2H ; retry - 1W ; expiry - 11h) ; minimum - - IN NS ns - IN MX 10 mail - - IN A - IN MX 10 mail - -* IN A - IN MX 10 mail - -ns IN A - -mail IN A - IN MX 10 mail diff --git a/templates/misc/configfiles/gentoo/courier/etc_courier-imap_imapd b/templates/misc/configfiles/gentoo/courier/etc_courier-imap_imapd deleted file mode 100644 index f594e413..00000000 --- a/templates/misc/configfiles/gentoo/courier/etc_courier-imap_imapd +++ /dev/null @@ -1,376 +0,0 @@ -##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $ -# -# imapd created from imapd.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used with the couriertcpd server. -# A lot of the stuff here is documented in the manual page for couriertcpd. -# -# NOTE - do not use \ to split long variable contents on multiple lines. -# This will break the default imapd.rc script, which parses this file. -# -##NAME: ADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# ADDRESS=127.0.0.1 - -ADDRESS=0 - -##NAME: PORT:1 -# -# Port numbers that connections are accepted on. The default is 143, -# the standard IMAP port. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possible to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The previous ADDRESS setting is a default for ports that do not have -# a specified IP address. - -PORT=143 - -##NAME: AUTHSERVICE:0 -# -# It's possible to authenticate using a different 'service' parameter -# depending on the connection's port. This only works with authentication -# modules that use the 'service' parameter, such as PAM. Example: -# -# AUTHSERVICE143=imap -# AUTHSERVICE993=imaps - -##NAME: MAXDAEMONS:0 -# -# Maximum number of IMAP servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:0 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=10 - -##NAME: PIDFILE:0 -# -# File where couriertcpd will save its process ID -# - -PIDFILE=/var/run/imapd.pid - -##NAME: TCPDOPTS:0 -# -# Miscellaneous couriertcpd options that shouldn't be changed. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: IMAP_CAPABILITY:1 -# -# IMAP_CAPABILITY specifies what most of the response should be to the -# CAPABILITY command. -# -# If you have properly configured Courier to use CRAM-MD5 or CRAM-SHA1 -# authentication (see INSTALL), set IMAP_CAPABILITY as follows: -# -# IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" -# - -IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE" - -##NAME: KEYWORDS_CAPABILITY:0 -# -# IMAP_KEYWORDS=1 enables custom IMAP keywords. Set this option to 0 to -# disable custom keywords. - -IMAP_KEYWORDS=1 - -##NAME: SMAP1_CAPABILITY:0 -# -# EXPERIMENTAL -# -# To enable the experimental "Simple Mail Access Protocol" extensions, -# uncomment the following setting. -# -# SMAP_CAPABILITY=SMAP1 - -##NAME: IMAP_CAPABILITY_ORIG:1 -# -# For use by webadmin - -IMAP_CAPABILITY_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" - -##NAME: IMAP_PROXY:0 -# -# Enable proxying. See README.proxy - -IMAP_PROXY=0 - -##NAME: IMAP_PROXY_FOREIGN:0 -# -# Proxying to non-Courier servers. Re-sends the CAPABILITY command after -# logging in to the remote server. May not work with all IMAP clients. - -IMAP_PROXY_FOREIGN=0 - -##NAME: IMAP_IDLE_TIMEOUT:0 -# -# This setting controls how often -# the server polls for changes to the folder, in IDLE mode (in seconds). - -IMAP_IDLE_TIMEOUT=60 - -##NAME: IMAP_CAPABILITY_TLS:0 -# -# The following setting will advertise SASL PLAIN authentication after -# STARTTLS is established. If you want to allow SASL PLAIN authentication -# with or without TLS then just comment this out, and add AUTH=PLAIN to -# IMAP_CAPABILITY - -IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN" - -##NAME: IMAP_TLS_ORIG:0 -# -# For use by webadmin - -IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN" - -##NAME: IMAP_DISABLETHREADSORT:0 -# -# Set IMAP_DISABLETHREADSORT to disable the THREAD and SORT commands - -# server side sorting and threading. -# -# Those capabilities will still be advertised, but the server will reject -# them. Set this option if you want to disable all the extra load from -# server-side threading and sorting. Not advertising those capabilities -# will simply result in the clients reading the entire folder, and sorting -# it on the client side. That will still put some load on the server. -# advertising these capabilities, but rejecting the commands, will stop this -# silliness. -# - -IMAP_DISABLETHREADSORT=0 - -##NAME: IMAP_CHECK_ALL_FOLDERS:0 -# -# Set IMAP_CHECK_ALL_FOLDERS to 1 if you want the server to check for new -# mail in every folder. Not all IMAP clients use the IMAP's new mail -# indicator, but some do. Normally new mail is checked only in INBOX, -# because it is a comparatively time consuming operation, and it would be -# a complete waste of time unless mail filters are used to deliver -# mail directly to folders. -# -# When IMAP clients are used which support new mail indication, and when -# mail filters are used to sort incoming mail into folders, setting -# IMAP_CHECK_ALL_FOLDERS to 1 will allow IMAP clients to announce new -# mail in folders. Note that this will result in slightly more load on the -# server. -# - -IMAP_CHECK_ALL_FOLDERS=0 - -##NAME: IMAP_OBSOLETE_CLIENT:0 -# -# Set IMAP_OBSOLETE_CLIENT if your IMAP client expects \\NoInferiors to mean -# what \\HasNoChildren really means. - -IMAP_OBSOLETE_CLIENT=0 - -##NAME: IMAP_UMASK:0 -# -# IMAP_UMASK sets the umask of the server process. The value of IMAP_UMASK is -# simply passed to the "umask" command. The default value is 022. -# -# This feature is mostly useful for shared folders, where the file permissions -# of the messages may be important. - -IMAP_UMASK=027 - -##NAME: IMAP_ULIMITD:0 -# -# IMAP_ULIMITD sets the maximum size of the data segment of the server -# process. The value of IMAP_ULIMITD is simply passed to the "ulimit -d" -# command (or ulimit -v). The argument to ulimi sets the upper limit on the -# size of the data segment of the server process, in kilobytes. The default -# value of 65536 sets a very generous limit of 64 megabytes, which should -# be more than plenty for anyone. -# -# This feature is used as an additional safety check that should stop -# any potential denial-of-service attacks that exploit any kind of -# a memory leak to exhaust all the available memory on the server. -# It is theoretically possible that obscenely huge folders will also -# result in the server running out of memory when doing server-side -# sorting (by my calculations you have to have at least 100,000 messages -# in a single folder, for that to happen). - -IMAP_ULIMITD=65536 - -##NAME: IMAP_USELOCKS:0 -# -# Setting IMAP_USELOCKS to 1 will use dot-locking to support concurrent -# multiple access to the same folder. This incurs slight additional -# overhead. Concurrent multiple access will still work without this setting, -# however occasionally a minor race condition may result in an IMAP client -# downloading the same message twice, or a keyword update will fail. -# -# IMAP_USELOCKS=1 is strongly recommended when shared folders are used. - -IMAP_USELOCKS=1 - -##NAME: IMAP_SHAREDINDEXFILE:0 -# -# The index of all accessible folders. Do not change this setting unless -# you know what you're doing. See README.sharedfolders for additional -# information. - -IMAP_SHAREDINDEXFILE=/etc/courier-imap/shared/index - -##NAME: IMAP_ENHANCEDIDLE:0 -# -# If Courier was compiled with the File Alteration Monitor, setting -# IMAP_ENHANCEDIDLE to 1 enables enhanced IDLE mode, where multiple -# clients may open the same folder concurrently, and receive updates to -# folder contents in realtime. See the imapd(8) man page for additional -# information. -# -# IMPORTANT: IMAP_USELOCKS *MUST* also be set to 1, and IDLE must be included -# in the IMAP_CAPABILITY list. -# - -IMAP_ENHANCEDIDLE=0 - -##NAME: IMAP_TRASHFOLDERNAME:0 -# -# The name of the magic trash Folder. For MSOE compatibility, -# you can set IMAP_TRASHFOLDERNAME="Deleted Items". -# -# IMPORTANT: If you change this, you must also change IMAP_EMPTYTRASH - -IMAP_TRASHFOLDERNAME=Trash - -##NAME: IMAP_EMPTYTRASH:0 -# -# The following setting is optional, and causes messages from the given -# folder to be automatically deleted after the given number of days. -# IMAP_EMPTYTRASH is a comma-separated list of folder:days. The default -# setting, below, purges 7 day old messages from the Trash folder. -# Another useful setting would be: -# -# IMAP_EMPTYTRASH=Trash:7,Sent:30 -# -# This would also delete messages from the Sent folder (presumably copies -# of sent mail) after 30 days. This is a global setting that is applied to -# every mail account, and is probably useful in a controlled, corporate -# environment. -# -# Important: the purging is controlled by CTIME, not MTIME (the file time -# as shown by ls). It is perfectly ordinary to see stuff in Trash that's -# a year old. That's the file modification time, MTIME, that's displayed. -# This is generally when the message was originally delivered to this -# mailbox. Purging is controlled by a different timestamp, CTIME, which is -# changed when the file is moved to the Trash folder (and at other times too). -# -# You might want to disable this setting in certain situations - it results -# in a stat() of every file in each folder, at login and logout. -# - -IMAP_EMPTYTRASH=Trash:7 - -##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0 -# -# Set IMAP_MOVE_EXPUNGE_TO_TRASH to move expunged messages to Trash. This -# effectively allows an undo of message deletion by fishing the deleted -# mail from trash. Trash can be manually expunged as usually, and mail -# will get automatically expunged from Trash according to IMAP_EMPTYTRASH. -# -# NOTE: shared folders are still expunged as usual. Shared folders are -# not affected. -# - -IMAP_MOVE_EXPUNGE_TO_TRASH=0 - - -##NAME: OUTBOX:0 -# -# The next set of options deal with the "Outbox" enhancement. -# Uncomment the following setting to create a special folder, named -# INBOX.Outbox -# -# OUTBOX=.Outbox - -##NAME: SENDMAIL:0 -# -# If OUTBOX is defined, mail can be sent via the IMAP connection by copying -# a message to the INBOX.Outbox folder. For all practical matters, -# INBOX.Outbox looks and behaves just like any other IMAP folder. If this -# folder doesn't exist it must be created by the IMAP mail client, just -# like any other IMAP folder. The kicker: any message copied or moved to -# this folder is will be E-mailed by the Courier-IMAP server, by running -# the SENDMAIL program. Therefore, messages copied or moved to this -# folder must be well-formed RFC-2822 messages, with the recipient list -# specified in the To:, Cc:, and Bcc: headers. Courier-IMAP relies on -# SENDMAIL to read the recipient list from these headers (and delete the Bcc: -# header) by running the command "$SENDMAIL -oi -t -f $SENDER", with the -# message piped on standard input. $SENDER will be the return address -# of the message, which is set by the authentication module. -# -# DO NOT MODIFY SENDMAIL, below, unless you know what you're doing. -# - -SENDMAIL=/usr/sbin/sendmail - -##NAME: HEADERFROM:0 -# -# For administrative and oversight purposes, the return address, $SENDER -# will also be saved in the X-IMAP-Sender mail header. This header gets -# added to the sent E-mail (but it doesn't get saved in the copy of the -# message that's saved in the folder) -# -# WARNING - By enabling OUTBOX above, *every* IMAP mail client will receive -# the magic OUTBOX treatment. Therefore advance LARTing is in order for -# _all_ of your lusers, until every one of them is aware of this. Otherwise if -# OUTBOX is left at its default setting - a folder name that might be used -# accidentally - some people may be in for a rude surprise. You can redefine -# the name of the magic folder by changing OUTBOX, above. You should do that -# and pick a less-obvious name. Perhaps brand it with your organizational -# name ( OUTBOX=.WidgetsAndSonsOutbox ) - -HEADERFROM=X-IMAP-Sender - -##NAME: IMAPDSTART:0 -# -# IMAPDSTART is not used directly. Rather, this is a convenient flag to -# be read by your system startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/imapd -# -# case x$IMAPDSTART in -# x[yY]*) -# /usr/lib/courier-imap/imapd.rc start -# ;; -# esac -# -# The default setting is going to be NO, so you'll have to manually flip -# it to yes. - -IMAPDSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/templates/misc/configfiles/gentoo/courier/etc_courier-imap_imapd-ssl b/templates/misc/configfiles/gentoo/courier/etc_courier-imap_imapd-ssl deleted file mode 100644 index bb1eaa01..00000000 --- a/templates/misc/configfiles/gentoo/courier/etc_courier-imap_imapd-ssl +++ /dev/null @@ -1,199 +0,0 @@ -##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $ -# -# imapd-ssl created from imapd-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL IMAP connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL IMAP -# connections, you will start two instances of couriertcpd, one on the -# IMAP port 143, and another one on the IMAP-SSL port 993. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:1 -# -# Options in the imapd-ssl configuration file AUGMENT the options in the -# imapd configuration file. First the imapd configuration file is read, -# then the imapd-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 993. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=993 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# That's the SSL IMAP port we'll listen on. -# Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP. - -SSLPIDFILE=/var/run/imapd-ssl.pid - -##NAME: IMAPDSSLSTART:0 -# -# Different pid files, so that both instances of couriertcpd can coexist -# happily. -# -# You can also redefine IMAP_CAPABILITY, although I can't -# think of why you'd want to do that. -# -# -# Ok, the following settings are new to imapd-ssl: -# -# Whether or not to start IMAP over SSL on simap port: - -IMAPDSSLSTART=YES - -##NAME: IMAPDSTARTTLS:0 -# -# Whether or not to implement IMAP STARTTLS extension instead: - -IMAPDSTARTTLS=YES - -##NAME: IMAP_TLS_REQUIRED:1 -# -# Set IMAP_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED IMAP capability, until STARTTLS -# is issued). - -IMAP_TLS_REQUIRED=0 - -######################################################################### -# -# The following variables configure IMAP over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. -# -##NAME: COURIERTLS:0 -# - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS -# extension, as opposed to IMAP over SSL on port 993. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/postfix/server.pem - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -TLS_TRUSTCERTS=/etc/ssl/certs - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for IMAP clients -# that open multiple SSL sessions to the server. TLS_CACHEFILE will be -# automatically created, TLS_CACHESIZE bytes long, and used as a cache -# buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/templates/misc/configfiles/gentoo/courier/etc_courier-imap_pop3d b/templates/misc/configfiles/gentoo/courier/etc_courier-imap_pop3d deleted file mode 100644 index 71502ae6..00000000 --- a/templates/misc/configfiles/gentoo/courier/etc_courier-imap_pop3d +++ /dev/null @@ -1,127 +0,0 @@ -##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $ -# -# pop3d created from pop3d.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# Courier POP3 daemon configuration -# -##NAME: PIDFILE:0 -# - -PIDFILE=/var/run/pop3d.pid - -##NAME: MAXDAEMONS:0 -# -# Maximum number of POP3 servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:4 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=5 - -##NAME: POP3AUTH:1 -# -# To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH -# variable: -# -# POP3AUTH="LOGIN" -# -# If you have configured the CRAM-MD5 or CRAM-SHA1, set POP3AUTH to something -# like this: -# -# POP3AUTH="LOGIN CRAM-MD5 CRAM-SHA1" - -POP3AUTH="" - -##NAME: POP3AUTH_ORIG:0 -# -# For use by webadmin - -POP3AUTH_ORIG="LOGIN CRAM-MD5 CRAM-SHA1" - -##NAME: POP3AUTH_TLS:1 -# -# To also advertise SASL PLAIN if SSL is enabled, uncomment the -# POP3AUTH_TLS environment variable: -# -# POP3AUTH_TLS="LOGIN PLAIN" - -POP3AUTH_TLS="" - -##NAME: POP3AUTH_TLS_ORIG:0 -# -# For use by webadmin - -POP3AUTH_TLS_ORIG="LOGIN PLAIN" - -##NAME: POP3_PROXY:0 -# -# Enable proxying. See README.proxy - -POP3_PROXY=0 - -##NAME: PORT:1 -# -# Port to listen on for connections. The default is port 110. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The ADDRESS setting is a default for ports that do not have a specified -# IP address. - -PORT=110 - -##NAME: ADDRESS:0 -# -# IP address to listen on. 0 means all IP addresses. - -ADDRESS=0 - -##NAME: TCPDOPTS:0 -# -# Other couriertcpd(1) options. The following defaults should be fine. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: POP3DSTART:0 -# -# POP3DSTART is not referenced anywhere in the standard Courier programs -# or scripts. Rather, this is a convenient flag to be read by your system -# startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/pop3d -# case x$POP3DSTART in -# x[yY]*) -# /usr/lib/courier-imap/pop3d.rc start -# ;; -# esac -# -# The default setting is going to be NO, until Courier is shipped by default -# with enough platforms so that people get annoyed with having to flip it to -# YES every time. - -POP3DSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/templates/misc/configfiles/gentoo/courier/etc_courier-imap_pop3d-ssl b/templates/misc/configfiles/gentoo/courier/etc_courier-imap_pop3d-ssl deleted file mode 100644 index 3f8b8bc9..00000000 --- a/templates/misc/configfiles/gentoo/courier/etc_courier-imap_pop3d-ssl +++ /dev/null @@ -1,186 +0,0 @@ -##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $ -# -# pop3d-ssl created from pop3d-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000-2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL POP3 connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL POP3 -# connections, you will start two instances of couriertcpd, one on the -# POP3 port 110, and another one on the POP3-SSL port 995. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:0 -# -# Options in the pop3d-ssl configuration file AUGMENT the options in the -# pop3d configuration file. First the pop3d configuration file is read, -# then the pop3d-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 995. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=995 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# -# - -SSLPIDFILE=/var/run/pop3d-ssl.pid - -##NAME: POP3DSSLSTART:0 -# -# Whether or not to start POP3 over SSL on spop3 port: - -POP3DSSLSTART=YES - -##NAME: POP3_STARTTLS:0 -# -# Whether or not to implement the POP3 STLS extension: - -POP3_STARTTLS=YES - -##NAME: POP3_TLS_REQUIRED:1 -# -# Set POP3_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED POP3 capability, until STARTTLS -# is issued). - -POP3_TLS_REQUIRED=0 - -##NAME: COURIERTLS:0 -# -# The following variables configure POP3 over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the POP3 STARTTLS -# extension, as opposed to POP3 over SSL on port 995. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/postfix/server.pem - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -TLS_TRUSTCERTS=/etc/ssl/certs - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for long-running -# POP3 clients. TLS_CACHEFILE will be automatically created, TLS_CACHESIZE -# bytes long, and used as a cache buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/templates/misc/configfiles/gentoo/courier/etc_courier_authlib_authdaemonrc b/templates/misc/configfiles/gentoo/courier/etc_courier_authlib_authdaemonrc deleted file mode 100644 index 867a12db..00000000 --- a/templates/misc/configfiles/gentoo/courier/etc_courier_authlib_authdaemonrc +++ /dev/null @@ -1,93 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.12 2005/07/05 12:25:08 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authuserdb authpam authshadow authmysql authcustom authpipe" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/lib/courier/authdaemon - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" diff --git a/templates/misc/configfiles/gentoo/courier/etc_courier_authlib_authmysqlrc b/templates/misc/configfiles/gentoo/courier/etc_courier_authlib_authmysqlrc deleted file mode 100644 index 68b78a69..00000000 --- a/templates/misc/configfiles/gentoo/courier/etc_courier_authlib_authmysqlrc +++ /dev/null @@ -1,14 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 0 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD uid -MYSQL_GID_FIELD gid -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD homedir -MYSQL_MAILDIR_FIELD maildir -MYSQL_QUOTA_FIELD (quota*1024*1024) -MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3) diff --git a/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor b/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor deleted file mode 100644 index 9dfc7cb2..00000000 --- a/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the froxlor package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/gentoo/dkim/dkim-filter.conf b/templates/misc/configfiles/gentoo/dkim/dkim-filter.conf deleted file mode 100644 index efb37cfe..00000000 --- a/templates/misc/configfiles/gentoo/dkim/dkim-filter.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# !!! DO NOT REPLACE THE ORIGINAL CONFIG WITH THIS FILE !!! -# -# Instead, just set the shown values in the file to the -# given values ;-) -# - -Syslog yes -Domain /etc/postfix/dkim/domains -KeyList /etc/postfix/dkim/dkim-keys.conf diff --git a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot-sql.conf deleted file mode 100644 index 21179945..00000000 --- a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot-sql.conf +++ /dev/null @@ -1,6 +0,0 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -password_query = "SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('*:storage=', quota,'M') AS userdb_quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve')" -user_query = "SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', quota,'M') AS quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u')" -iterate_query = "SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3 = 1)" diff --git a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf deleted file mode 100644 index 891b8247..00000000 --- a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf +++ /dev/null @@ -1,99 +0,0 @@ -auth_mechanisms = plain login -## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS -disable_plaintext_auth = no -listen = * -mail_access_groups = vmail -mail_debug = no - -protocols = imap pop3 sieve - -### SSL Settings -### After you obtained an SSL-certificate enable ssl here and -### set disable_plaintext_auth to yes (see above) -ssl = no -#ssl_cert = .pem -#ssl_key = .key - -passdb { - args = /etc/dovecot/dovecot-sql.conf - driver = sql -} - -plugin { - quota = maildir:User Quota - - # Sieve-Configuration - sieve = ~/sieve/.dovecot.sieve - sieve_dir = ~/sieve -} - -service auth { - unix_listener /var/spool/postfix/private/auth { - group = postfix - mode = 0660 - user = postfix - } - unix_listener auth-master { - group = vmail - mode = 0660 - user = vmail - } -} - -service managesieve-login { - inet_listener sieve { - port = 4190 - } -} - -service managesieve { -} - -userdb { - driver = prefetch -} - -userdb { - args = /etc/dovecot/dovecot-sql.conf - driver = sql -} - -protocol imap { - mail_plugins = quota imap_quota - - # IMAP logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - imap_logout_format = in=%i out=%o -} - -protocol pop3 { - mail_plugins = quota - pop3_uidl_format = UID%u-%v - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s -} - -protocol sieve { -} - -lda_mailbox_autocreate = yes -protocol lda { - auth_socket_path = /var/run/dovecot/auth-master - mail_plugins = quota sieve - # postmaster is the one in charge of the mail system. MUST be set to a valid address! - postmaster_address = postmaster@ - sendmail_path = /usr/sbin/sendmail - lda_mailbox_autocreate = 1 -} diff --git a/templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql-root.cfg b/templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql-root.cfg deleted file mode 100644 index 64989771..00000000 --- a/templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username -password diff --git a/templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql.cfg b/templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql.cfg deleted file mode 100644 index 22d27921..00000000 --- a/templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql.cfg +++ /dev/null @@ -1,41 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT members \ - FROM ftp_groups \ - WHERE gid='%1$u' -gidsbymem SELECT CONCAT_WS(',', gid) as gid \ - FROM ftp_groups \ - WHERE FIND_IN_SET('%1$s', members) - -host -database -username -password -socket /var/run/mysqld/mysqld.sock diff --git a/templates/misc/configfiles/gentoo/libnss/etc_nsswitch.conf b/templates/misc/configfiles/gentoo/libnss/etc_nsswitch.conf deleted file mode 100644 index 22a74dda..00000000 --- a/templates/misc/configfiles/gentoo/libnss/etc_nsswitch.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Make sure that `passwd`, `group` and `shadow` have mysql in their lines -# You should place mysql at the end, so that it is queried after the other mechanisams -# -passwd: compat mysql -group: compat mysql -shadow: compat mysql - -hosts: files dns -networks: files dns - -services: db files -protocols: db files -rpc: db files -ethers: db files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files \ No newline at end of file diff --git a/templates/misc/configfiles/gentoo/lighttpd/etc_lighttpd.conf b/templates/misc/configfiles/gentoo/lighttpd/etc_lighttpd.conf deleted file mode 100644 index 171c1e5a..00000000 --- a/templates/misc/configfiles/gentoo/lighttpd/etc_lighttpd.conf +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################### -# Default lighttpd.conf for Froxlor. -############################################################################### -var.basedir = "/var/www" -var.logdir = "/var/log/lighttpd" -var.statedir = "/var/lib/lighttpd" - -server.modules = ( - "mod_rewrite", - "mod_redirect", - "mod_alias", - "mod_access", - "mod_auth", - "mod_fastcgi", - "mod_cgi", - "mod_accesslog" -) - -server.username = "lighttpd" -server.groupname = "lighttpd" -server.document-root = var.basedir -server.pid-file = "/var/run/lighttpd.pid" -accesslog.filename = var.logdir + "/access.log" -server.errorlog = var.logdir + "/error.log" - -server.indexfiles = ("index.php", "index.html", - "index.htm", "default.htm") - -server.name = "" -server.port = 80 -server.bind = "" -url.access-deny = ("~", ".inc") - -include "mime-types.conf" -#include "mod_cgi.conf" - -fastcgi.server = ( -".php" => ( - "localhost" => ( - "socket" => "/tmp/lighttpd-fcgi-sock-lighttpd", - "broken-scriptfilename" => "enable", - "bin-path" => "/usr/bin/php-cgi", - "min-procs" => 1, - "max-procs" => 1, - "max-load-per-proc" => 4, - "idle-timeout" => 60, - "bin-environment" => ( - "UID" => "lighttpd", - "GID" => "lighttpd", - "PHP_FCGI_CHILDREN" => "0", - "PHP_FCGI_MAX_REQUESTS" => "10000" - ), - "bin-copy-environment" => ( "" ) - ) - ) -) diff --git a/templates/misc/configfiles/gentoo/logrotate/etc_logrotated_froxlor b/templates/misc/configfiles/gentoo/logrotate/etc_logrotated_froxlor deleted file mode 100644 index d7f7deeb..00000000 --- a/templates/misc/configfiles/gentoo/logrotate/etc_logrotated_froxlor +++ /dev/null @@ -1,16 +0,0 @@ -# -# Froxlor logrotate snipet -# -*.log { - missingok - weekly - rotate 4 - compress - delaycompress - notifempty - create - sharedscripts - postrotate - > /dev/null 2>&1 || true - endscript -} diff --git a/templates/misc/configfiles/gentoo/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/gentoo/nginx/etc_init.d_php-fcgi deleted file mode 100644 index 0c2520ce..00000000 --- a/templates/misc/configfiles/gentoo/nginx/etc_init.d_php-fcgi +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -BIND="127.0.0.1:8888" -USER="nginx" -PHP_FCGI_CHILDREN="15" -PHP_FCGI_MAX_REQUESTS="1000" - -PHP_CGI="/usr/bin/php-cgi" -PHP_CGI_NAME="$(basename ${PHP_CGI})" -PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}" -RETVAL="0" - -start() { - echo -n "Starting PHP FastCGI: " - start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $PHP_CGI_ARGS - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} -stop() { - echo -n "Stopping PHP FastCGI: " - killall -q -w -u ${USER} ${PHP_CGI} - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "Usage: php-fastcgi {start|stop|restart}" - exit 1 - ;; -esac -exit "$RETVAL" diff --git a/templates/misc/configfiles/gentoo/nginx/etc_nginx_fastcgi.conf b/templates/misc/configfiles/gentoo/nginx/etc_nginx_fastcgi.conf deleted file mode 100644 index 10bcaba4..00000000 --- a/templates/misc/configfiles/gentoo/nginx/etc_nginx_fastcgi.conf +++ /dev/null @@ -1,15 +0,0 @@ -fastcgi_param GATEWAY_INTERFACE CGI/1.1; -fastcgi_param SERVER_SOFTWARE nginx; -fastcgi_param QUERY_STRING $query_string; -fastcgi_param REQUEST_METHOD $request_method; -fastcgi_param CONTENT_TYPE $content_type; -fastcgi_param CONTENT_LENGTH $content_length; -fastcgi_param REQUEST_URI $request_uri; -fastcgi_param DOCUMENT_URI $document_uri; -fastcgi_param DOCUMENT_ROOT $document_root; -fastcgi_param SERVER_PROTOCOL $server_protocol; -fastcgi_param REMOTE_ADDR $remote_addr; -fastcgi_param REMOTE_PORT $remote_port; -fastcgi_param SERVER_ADDR $server_addr; -fastcgi_param SERVER_PORT $server_port; -fastcgi_param SERVER_NAME $server_name; diff --git a/templates/misc/configfiles/gentoo/nginx/etc_nginx_nginx.conf b/templates/misc/configfiles/gentoo/nginx/etc_nginx_nginx.conf deleted file mode 100644 index a8bd62af..00000000 --- a/templates/misc/configfiles/gentoo/nginx/etc_nginx_nginx.conf +++ /dev/null @@ -1,26 +0,0 @@ -user nginx; -worker_processes 4; - -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - access_log /var/log/nginx/access.log; - - sendfile on; - tcp_nodelay on; - - keepalive_timeout 65; - - gzip on; - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; -} - diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf deleted file mode 100644 index 99175d05..00000000 --- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf +++ /dev/null @@ -1,91 +0,0 @@ -# Postfix programs paths settings -command_directory = /usr/sbin -daemon_directory = /usr/libexec/postfix -program_directory = /usr/libexec/postfix -sendmail_path = /usr/sbin/sendmail - -## General Postfix configuration -# should be the default domain from your provider eg. "server100.provider.tld" -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_hostname -smtpd_relay_restrictions = permit_mynetworks, - permit_sasl_authenticated, - defer_unauth_destination - -# Maximum size of Message in bytes (512MB) -message_size_limit = 536870912 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes - -# Virtual delivery settings -virtual_mailbox_base = / -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = mysql:/etc/postfix/mysql-virtual_uid_maps.cf -virtual_gid_maps = mysql:/etc/postfix/mysql-virtual_gid_maps.cf - -# Local delivery settings -local_transport = local -alias_database = hash:/etc/mail/aliases -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/postfix/server.pem -#smtpd_tls_key_file = /etc/ssl/postfix/server.key -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index aa5c7432..00000000 --- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_gid_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_gid_maps.cf deleted file mode 100644 index 79f4e601..00000000 --- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_gid_maps.cf +++ /dev/null @@ -1,6 +0,0 @@ -user = -password = -dbname = -expansion_limit = 1 -hosts = -query = SELECT gid FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index b51c6397..00000000 --- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_limit_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_limit_maps.cf deleted file mode 100644 index a62e1b95..00000000 --- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_limit_maps.cf +++ /dev/null @@ -1,6 +0,0 @@ -user = -password = -dbname = -expansion_limit = 1 -hosts = -query = SELECT (quota*1024*1024) FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 25e6bf02..00000000 --- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,6 +0,0 @@ -user = -password = -dbname = -expansion_limit = 1 -hosts = -query = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_uid_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_uid_maps.cf deleted file mode 100644 index c339939f..00000000 --- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_uid_maps.cf +++ /dev/null @@ -1,6 +0,0 @@ -user = -password = -dbname = -expansion_limit = 1 -hosts = -query = SELECT uid FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_sasl2_smtpd.conf b/templates/misc/configfiles/gentoo/postfix_courier/etc_sasl2_smtpd.conf deleted file mode 100644 index 4bd4bafd..00000000 --- a/templates/misc/configfiles/gentoo/postfix_courier/etc_sasl2_smtpd.conf +++ /dev/null @@ -1,12 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: PLAIN LOGIN -password_format: crypt -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: SELECT password_enc FROM mail_users WHERE username='%u@%r' OR email='%u@%r' \ No newline at end of file diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf deleted file mode 100644 index aab90ae7..00000000 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf +++ /dev/null @@ -1,119 +0,0 @@ -# Postfix programs paths settings -command_directory = /usr/sbin -daemon_directory = /usr/libexec/postfix -program_directory = /usr/libexec/postfix -sendmail_path = /usr/sbin/sendmail - -## General Postfix configuration -# should be the default domain from your provider eg. "server100.provider.tld" -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client - -smtpd_relay_restrictions = permit_mynetworks, - permit_sasl_authenticated, - defer_unauth_destination - -# Maximum size of Message in bytes (512MB) -message_size_limit = 536870912 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes -## Dovecot Settings for deliver, SASL Auth and virtual transport -mailbox_command = /usr/libexec/dovecot/deliver -smtpd_sasl_type = dovecot -smtpd_sasl_path = private/auth -virtual_transport = dovecot -dovecot_destination_recipient_limit = 1 - -# Virtual delivery settings -virtual_mailbox_base = / -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = mysql:/etc/postfix/mysql-virtual_uid_maps.cf -virtual_gid_maps = mysql:/etc/postfix/mysql-virtual_gid_maps.cf - -# Local delivery settings -local_transport = local -alias_database = hash:/etc/mail/aliases -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_use_tls = yes -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_cert_file = /etc/ssl/server/server.pem -#smtpd_tls_key_file = /etc/ssl/server/server.key -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt # Just an example for CACert.org -#smtpd_tls_auth_only = no -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes -#smtpd_tls_session_cache_timeout = 3600s -#tls_random_source = dev:/dev/urandom - -### Quota Settings with vda useflag -## I use only virtual as localdelivery... This permits me to have full -## virtual domain hosting without using a lot of maps -#virtual_transport = virtual -## Generate maildirsize files or not -#virtual_create_maildirsize = yes -## I use Courier IMAP compatibles files. -#virtual_mailbox_extended = yes -## Limits only INBOX part (useful when -## using when you have IMAP users) -#virtual_mailbox_limit_inbox = yes -## maps of soft disk quotas -#virtual_mailbox_limit_maps = mysql:/etc/postfix/mysql-virtual_mailbox_limit_maps.cf -#virtual_mailbox_limit_override = yes -#virtual_maildir_limit_message = Sorry, this user has overdrawn their diskspace quota. Please try again later. -#virtual_overquota_bounce = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_master.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_master.cf deleted file mode 100644 index b52b5a98..00000000 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_master.cf +++ /dev/null @@ -1,4 +0,0 @@ -# Add this lines to be able to use dovecot as delivery agent -# Dovecot LDA -dovecot unix - n n - - pipe - flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -d ${recipient} diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index aa5c7432..00000000 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_gid_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_gid_maps.cf deleted file mode 100644 index 79f4e601..00000000 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_gid_maps.cf +++ /dev/null @@ -1,6 +0,0 @@ -user = -password = -dbname = -expansion_limit = 1 -hosts = -query = SELECT gid FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index b51c6397..00000000 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_limit_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_limit_maps.cf deleted file mode 100644 index a62e1b95..00000000 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_limit_maps.cf +++ /dev/null @@ -1,6 +0,0 @@ -user = -password = -dbname = -expansion_limit = 1 -hosts = -query = SELECT (quota*1024*1024) FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 25e6bf02..00000000 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,6 +0,0 @@ -user = -password = -dbname = -expansion_limit = 1 -hosts = -query = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_uid_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_uid_maps.cf deleted file mode 100644 index c339939f..00000000 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_uid_maps.cf +++ /dev/null @@ -1,6 +0,0 @@ -user = -password = -dbname = -expansion_limit = 1 -hosts = -query = SELECT uid FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/gentoo/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/gentoo/postfix_mxaccess/etc_postfix_main.cf deleted file mode 100644 index 82b23a03..00000000 --- a/templates/misc/configfiles/gentoo/postfix_mxaccess/etc_postfix_main.cf +++ /dev/null @@ -1,25 +0,0 @@ -# -# ATTENTION - this is not the full postfix-main.cf file -# -# it only provides additional configuration-entries! -# - -# -# look for the follow statement -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient - -# -# and extend it with the following line -# so it looks like this -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient, - check_recipient_mx_access cidr:/etc/postfix/mx_access diff --git a/templates/misc/configfiles/gentoo/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/gentoo/postfix_mxaccess/etc_postfix_mx_access deleted file mode 100644 index 18a1ec5f..00000000 --- a/templates/misc/configfiles/gentoo/postfix_mxaccess/etc_postfix_mx_access +++ /dev/null @@ -1,9 +0,0 @@ -0.0.0.0/8 REJECT Domain MX in broadcast network -10.0.0.0/8 REJECT Domain MX in RFC 1918 private network -169.254.0.0/16 REJECT Domain MX in link local network -172.16.0.0/12 REJECT Domain MX in RFC 1918 private network -192.0.2.0/24 REJECT Domain MX in TEST-NET network -192.168.0.0/16 REJECT Domain MX in RFC 1918 private network -224.0.0.0/4 REJECT Domain MX in class D multicast network -240.0.0.0/5 REJECT Domain MX in class E reserved network -248.0.0.0/5 REJECT Domain MX in reserved network diff --git a/templates/misc/configfiles/gentoo/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/gentoo/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index d2a3004a..00000000 --- a/templates/misc/configfiles/gentoo/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,103 +0,0 @@ -# Server settings -ServerName " FTP Server" -ServerType standalone -ServerIdent off -DefaultServer on -Port 21 -MaxInstances 50 - -# General settings -DeferWelcome on -MultilineRFC2228 on -ShowSymlinks on -AllowOverwrite on -AllowStoreRestart on -AllowRetrieveRestart on -ListOptions "-al" -DisplayChdir .message -UseIPv6 off - -# Modules settings -#DelayEngine off - -# Timeout settings -TimeoutLogin 120 -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 600 - -# Security settings -RootLogin off -RequireValidShell off -User nobody -Group nogroup -Umask 133 022 -DefaultRoot ~ -DenyFilter \*.*/ - -# Per-Directory settings - -Umask 133 022 -AllowOverwrite on - - -# SQL settings -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -# Quota settings -QuotaEngine on -QuotaShowQuotas on -QuotaDisplayUnits Mb -QuotaLock /var/lock/ftpd.quotatab.lock -QuotaLimitTable sql:/get-quota-limit -QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally -SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" -SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" -SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies -SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies - -# TLS settings -# -#TLSEngine on -#TLSLog /var/log/proftpd-tls.log -#TLSProtocol SSLv23 -#TLSTimeoutHandshake 120 -# Really important for WinClients -#TLSOptions NoCertRequest -#TLSRSACertificateFile /etc/ssl/server/.crt -#TLSRSACertificateKeyFile /etc/ssl/server/.key -# Authenticate client that want to use FTP over TLS? -#TLSVerifyClient off -# Uncomment the following line to force tls login -#TLSRequired off -# - -# LOG settings -# Logging Formats -LogFormat default "%h %1 %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -LogFormat write "%h %l %u %t \"%r\" %s %b" -# Activate Logging -# all logins -ExtendedLog /var/log/proftpd-auth.log AUTH auth -# file/dir access -ExtendedLog /var/log/proftpd-access.log WRITE,READ write -# everything (be careful, generates_ very_ big logfiles) -#ExtendedLog /var/log/proftpd-all.log ALL default - -# make proftpd faster / do not perform ident and reverse dns lookup -UseReverseDNS off diff --git a/templates/misc/configfiles/gentoo/pureftpd/etc_conf.d_pure-ftpd b/templates/misc/configfiles/gentoo/pureftpd/etc_conf.d_pure-ftpd deleted file mode 100644 index 2d331b19..00000000 --- a/templates/misc/configfiles/gentoo/pureftpd/etc_conf.d_pure-ftpd +++ /dev/null @@ -1,23 +0,0 @@ -# Config file for /etc/init.d/pure-ftpd -# Configuration-template by Froxlor - -IS_CONFIGURED="yes" - -# Server/Port -SERVER="-S 21" - -## Number of simultaneous connections in total, and per IP ## -MAX_CONN="-c 30" -MAX_CONN_IP="-C 10" - -## Start daemonized in background ## -DAEMON="-B" - -## Don't allow uploads if the partition is more full then this var ## -DISK_FULL="-k 90%" - -## Authentication mechanism -AUTH="-l mysql:/etc/pureftpd-mysql.conf" - -## Misc. Others ## -MISC_OTHER="-A -x -j -Z" diff --git a/templates/misc/configfiles/gentoo/pureftpd/etc_pureftpd-mysql.conf b/templates/misc/configfiles/gentoo/pureftpd/etc_pureftpd-mysql.conf deleted file mode 100644 index ac93eb20..00000000 --- a/templates/misc/configfiles/gentoo/pureftpd/etc_pureftpd-mysql.conf +++ /dev/null @@ -1,12 +0,0 @@ -MYSQLServer -#MYSQLPort 3306 -MYSQLSocket /var/run/mysqld/mysqld.sock -MYSQLUser -MYSQLPassword -MYSQLDatabase -MYSQLCrypt Crypt -MYSQLGetPW SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetUID SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetGID SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y" -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) diff --git a/templates/misc/configfiles/opensuse_11_x/courier/etc_authlib_authdaemonrc b/templates/misc/configfiles/opensuse_11_x/courier/etc_authlib_authdaemonrc deleted file mode 100644 index 428a68da..00000000 --- a/templates/misc/configfiles/opensuse_11_x/courier/etc_authlib_authdaemonrc +++ /dev/null @@ -1,103 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.13 2005/10/05 00:07:32 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authldap authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authcustom authcram authuserdb authldap authmysql authpam" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/run/authdaemon.courier-imap - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" - -##NAME: LDAP_TLS_OPTIONS:0 -# -# Options documented in ldap.conf(5) can be set here, prefixed with 'LDAP'. -# Examples: -# -#LDAPTLS_CACERT=/path/to/cacert.pem -#LDAPTLS_REQCERT=demand -#LDAPTLS_CERT=/path/to/clientcert.pem -#LDAPTLS_KEY=/path/to/clientkey.pem diff --git a/templates/misc/configfiles/opensuse_11_x/courier/etc_authlib_authmysqlrc b/templates/misc/configfiles/opensuse_11_x/courier/etc_authlib_authmysqlrc deleted file mode 100644 index 4190aa9e..00000000 --- a/templates/misc/configfiles/opensuse_11_x/courier/etc_authlib_authmysqlrc +++ /dev/null @@ -1,12 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 3306 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD uid -MYSQL_GID_FIELD gid -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD homedir -MYSQL_MAILDIR_FIELD maildir diff --git a/templates/misc/configfiles/opensuse_11_x/cron/etc_cron.d_froxlor b/templates/misc/configfiles/opensuse_11_x/cron/etc_cron.d_froxlor deleted file mode 100644 index 4566f74b..00000000 --- a/templates/misc/configfiles/opensuse_11_x/cron/etc_cron.d_froxlor +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the froxlor package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q /srv/www/froxlor/scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/opensuse_11_x/dkim/dkim-filter.conf b/templates/misc/configfiles/opensuse_11_x/dkim/dkim-filter.conf deleted file mode 100644 index 86cdb1b6..00000000 --- a/templates/misc/configfiles/opensuse_11_x/dkim/dkim-filter.conf +++ /dev/null @@ -1,3 +0,0 @@ -Syslog yes -Domain /etc/postfix/dkim/domains -KeyList /etc/postfix/dkim/dkim-keys.conf diff --git a/templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot-sql.conf deleted file mode 100644 index 311a6dd2..00000000 --- a/templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot-sql.conf +++ /dev/null @@ -1,5 +0,0 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('*:storage=', (quota*1024)) as userdb_quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve') diff --git a/templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot.conf deleted file mode 100644 index 6f0721df..00000000 --- a/templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot.conf +++ /dev/null @@ -1,105 +0,0 @@ -protocols = imap pop3 sieve -listen = * -mail_access_groups = vmail -mail_debug = no -## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS -disable_plaintext_auth = no - -### SSL Settings -### After setting this options, set disable_plaintext_auth to yes (see above) -### and add imaps pop3s to the protocols -#ssl_cert_file = /etc/ssl/server/.pem -#ssl_key_file = /etc/ssl/server/.key -## This is an example with CACerts class3 cert! -#ssl_ca_file = /path/to/cacert.class3.crt -#ssl_cipher_list = ALL:!LOW:!SSLv2 - -protocol imap { - mail_plugins = quota imap_quota - - # IMAP logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - imap_logout_format = in=%i out=%o -} - -protocol pop3 { - # leave this uncommented if you are migrating from Courier also see Migration from Courier - pop3_uidl_format = UID%u-%v - mail_plugins = quota - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s -} -protocol lda { - # postmaster is the one in charge of the mail system. MUST be set to a valid address! - postmaster_address = postmaster@ - auth_socket_path = /var/run/dovecot/auth-master - mail_plugins = quota sieve - sendmail_path = /usr/sbin/sendmail -} - -protocol sieve { -} - -auth default { - mechanisms = plain login - passdb sql { - args = /etc/dovecot/dovecot-sql.conf - } - - userdb prefetch { - } - - userdb sql { - args = /etc/dovecot/dovecot-sql.conf - } - - user = vmail - socket listen { - # Postfix uses the client socket for SMTP Auth - client { - # Assuming the default Postfix $queue_directory setting - path = /var/spool/postfix/private/auth - mode = 0660 - # Assuming the default Postfix user and group - user = postfix - group = postfix - } - # Note that we're setting a master socket. SMTP AUTH for Postfix and Exim uses client sockets. - master { - path = /var/run/dovecot/auth-master - mode = 0660 - user = vmail - group = vmail - } - - } -} - -service managesieve-login { - inet_listener sieve { - port = 4190 - } -} - -service managesieve { -} - -plugin { - quota = maildir:User quota - - # Sieve-Configuration - sieve = ~/sieve/.dovecot.sieve - sieve_dir = ~/sieve -} diff --git a/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul b/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul deleted file mode 100644 index 93bf877e..00000000 --- a/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul +++ /dev/null @@ -1,125 +0,0 @@ -### acl/30_exim4-config_check_rcpt -################################# - -acl_check_rcpt: - accept - hosts = : - - warn - hosts = +relay_from_hosts - control = submission/sender_retain - - .ifdef CHECK_RCPT_LOCAL_LOCALPARTS - deny - domains = +local_domains:+froxlor_domain - local_parts = CHECK_RCPT_LOCAL_LOCALPARTS - message = restricted characters in address - .endif - - .ifdef CHECK_RCPT_REMOTE_LOCALPARTS - deny - domains = !+local_domains - local_parts = CHECK_RCPT_REMOTE_LOCALPARTS - message = restricted characters in address - .endif - - accept - .ifndef CHECK_RCPT_POSTMASTER - local_parts = postmaster - .else - local_parts = CHECK_RCPT_POSTMASTER - .endif - domains = +local_domains:+froxlor_domain - - deny - message = sender envelope address $sender_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_local_deny_exceptions - senders = ${if exists{CONFDIR/local_sender_blacklist}\ - {CONFDIR/local_sender_blacklist}\ - {}} - - deny - message = sender IP address $sender_host_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_local_deny_exceptions - hosts = ${if exists{CONFDIR/local_host_blacklist}\ - {CONFDIR/local_host_blacklist}\ - {}} - - .ifdef CHECK_RCPT_VERIFY_SENDER - deny - message = Sender verification failed - !acl = acl_local_deny_exceptions - !verify = sender - .endif - - deny - !acl = acl_local_deny_exceptions - senders = ${if exists{CONFDIR/local_sender_callout}\ - {CONFDIR/local_sender_callout}\ - {}} - !verify = sender/callout - - deny - !acl = acl_local_deny_exceptions - recipients = ${if exists{CONFDIR/local_rcpt_callout}\ - {CONFDIR/local_rcpt_callout}\ - {}} - !verify = recipient/callout - - .ifdef CHECK_RCPT_REVERSE_DNS - warn - message = X-Host-Lookup-Failed: Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}}) - condition = ${if and{{def:sender_host_address}{!def:sender_host_name}}\ - {yes}{no}} - .endif - - .ifdef CHECK_RCPT_IP_DNSBLS - warn - message = X-Warning: $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - dnslists = CHECK_RCPT_IP_DNSBLS - .endif - - .ifdef CHECK_RCPT_DOMAIN_DNSBLS - warn - message = X-Warning: $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - !senders = ${if exists{CONFDIR/local_domain_dnsbl_whitelist}\ - {CONFDIR/local_domain_dnsbl_whitelist}\ - {}} - dnslists = CHECK_RCPT_DOMAIN_DNSBLS/$sender_address_domain - .endif - - .ifdef CHECK_RCPT_LOCAL_ACL_FILE - .include CHECK_RCPT_LOCAL_ACL_FILE - .endif - - accept - domains = +local_domains:+froxlor_domain - endpass - message = unknown user - verify = recipient - - accept - domains = +relay_to_domains - endpass - .ifdef CHECK_RCPT_GIVE_UNKNOWN_USER - message = ${if eq{$acl_verify_message}{Unrouteable address}{unknown user}{$acl_verify_message}} - .else - message = unrouteable address - .endif - verify = recipient - - ############ - # If control reaches this point, the domain is neither in +local_domains - # nor in +relay_to_domains. - ############ - - accept - hosts = +relay_from_hosts - - accept - authenticated = * - - deny - message = relay not permitted \ No newline at end of file diff --git a/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_auth_30_froxlor-config b/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_auth_30_froxlor-config deleted file mode 100644 index b0b13de8..00000000 --- a/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_auth_30_froxlor-config +++ /dev/null @@ -1,30 +0,0 @@ -### auth/30_froxlor-config -################################# - -plain_server: - driver = plaintext - public_name = PLAIN - server_condition = "${if and { \ - {!eq{$2}{}} \ - {!eq{$3}{}} \ - {crypteq{$3}{${lookup mysql{FROXLOR_AUTH_PLAIN}{$value}fail}}} \ - } {yes}{no}}" - server_set_id = $2 - server_prompts = : -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} -# .endif - -login_server: - driver = plaintext - public_name = LOGIN - server_prompts = "Username:: : Password::" - server_condition = "${if and { \ - {!eq{$1}{}} \ - {!eq{$2}{}} \ - {crypteq{$2}{${lookup mysql{FROXLOR_AUTH_LOGIN}{$value}fail}}} \ - } {yes}{no}}" - server_set_id = $1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} -# .endif \ No newline at end of file diff --git a/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_main_10_froxlor-config_options b/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_main_10_froxlor-config_options deleted file mode 100644 index 8a070db6..00000000 --- a/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_main_10_froxlor-config_options +++ /dev/null @@ -1,20 +0,0 @@ -hide mysql_servers = /// - -FROXLOR_LOCAL_DOMAIN = SELECT domain FROM panel_domains WHERE domain = '${quote_mysql:$domain}' AND isemaildomain = '1' - -FROXLOR_MAILALIAS = SELECT REPLACE(destination,' ',',') FROM mail_virtual WHERE \ - (( email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' ) \ - OR ( email = '@${quote_mysql:$domain}' AND iscatchall > 0 )) \ - AND destination <> '' AND destination <> ' ' ORDER BY iscatchall ASC LIMIT 1 - -FROXLOR_MAILUSER = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE \ - email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' AND postfix = 'y' - -FROXLOR_PARENT_DOMAIN = SELECT parent.domain FROM `panel_domains` AS parent INNER JOIN panel_domains AS alias \ - ON alias.domain = '${quote_mysql:$domain}' AND parent.id = alias.aliasdomain - -FROXLOR_AUTH_PLAIN = SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$2}' - -FROXLOR_AUTH_LOGIN = SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$1}' - -domainlist froxlor_domain = mysql;FROXLOR_LOCAL_DOMAIN \ No newline at end of file diff --git a/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_router_180_froxlor-config b/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_router_180_froxlor-config deleted file mode 100644 index 2c09dd8a..00000000 --- a/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_router_180_froxlor-config +++ /dev/null @@ -1,12 +0,0 @@ -froxlor_mailalias: - debug_print = "R: froxlor_mailalias for $local_part@$domain" - driver = redirect - domains = +froxlor_domain - data = ${lookup mysql {FROXLOR_MAILALIAS}{$value}fail} - -froxlor_mailuser: - debug_print = "R: froxlor_mailuser for $local_part@$domain" - driver = redirect - domains = +froxlor_domain - data = ${lookup mysql {FROXLOR_MAILUSER}{$value}fail} - directory_transport = maildir_froxlor \ No newline at end of file diff --git a/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_transport_30_froxlor-config b/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_transport_30_froxlor-config deleted file mode 100644 index 6f00c2f7..00000000 --- a/templates/misc/configfiles/opensuse_11_x/exim4/etc_exim4_conf.d_transport_30_froxlor-config +++ /dev/null @@ -1,13 +0,0 @@ -maildir_froxlor: - debug_print = "T: maildir_froxlor for $local_part@$domain" - driver = appendfile - create_directory - delivery_date_add - envelope_to_add - return_path_add - maildir_format - directory_mode = 0770 - mode = 0660 - mode_fail_narrower = false - user = 2000 - group = 2000 \ No newline at end of file diff --git a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf b/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf deleted file mode 100644 index 5d8cacf2..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,65 +0,0 @@ -queue_directory = /var/spool/postfix -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -mail_owner = postfix -inet_interfaces = all -unknown_local_recipient_reject_code = 550 -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - xxgdb $daemon_directory/$process_name $process_id & sleep 5 -sendmail_path = /usr/sbin/sendmail -newaliases_path = /usr/bin/newaliases -mailq_path = /usr/bin/mailq -setgid_group = maildrop -html_directory = /usr/share/doc/packages/postfix/html -manpage_directory = /usr/share/man -sample_directory = /usr/share/doc/packages/postfix/samples -readme_directory = /usr/share/doc/packages/postfix/README_FILES -inet_protocols = all -biff = no -append_dot_mydomain = no -mail_spool_directory = /var/mail -canonical_maps = hash:/etc/postfix/canonical -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_domains = -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -virtual_uid_maps = static: -virtual_gid_maps = static: -virtual_maps = hash:/etc/postfix/virtual -relocated_maps = hash:/etc/postfix/relocated -transport_maps = hash:/etc/postfix/transport -sender_canonical_maps = hash:/etc/postfix/sender_canonical -masquerade_exceptions = root -masquerade_classes = envelope_sender, header_sender, header_recipient -mydomain = -myhostname = mail.$mydomain -program_directory = /usr/lib/postfix -masquerade_domains = -mydestination = $myhostname $mydomain localhost localhost.$mydomain -mynetworks = 127.0.0.0/8 -defer_transports = -disable_dns_lookups = no -relayhost = -mailbox_command = -mailbox_transport = -strict_8bitmime = no -disable_mime_output_conversion = no -smtpd_client_restrictions = -smtpd_helo_required = no -smtpd_helo_restrictions = -strict_rfc821_envelopes = no -smtpd_recipient_restrictions = permit_mynetworks permit_sasl_authenticated reject_unauth_destination -smtpd_relay_restrictions = -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes -#smtpd_use_tls = no -#smtp_use_tls = no -alias_maps = $alias_database -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 -message_size_limit = 10240000 diff --git a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c0a12256..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index a962d086..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/opensuse_11_x/postfix/etc_sasl2_smtpd.conf b/templates/misc/configfiles/opensuse_11_x/postfix/etc_sasl2_smtpd.conf deleted file mode 100644 index 3d4dff60..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix/etc_sasl2_smtpd.conf +++ /dev/null @@ -1,9 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -mech_list: plain login cram-md5 digest-md5 -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: select password from mail_users where username='%u@%r' diff --git a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf deleted file mode 100644 index a447d4de..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf +++ /dev/null @@ -1,83 +0,0 @@ -## General Postfix configuration - -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes -## Dovecot Settings for deliver, SASL Auth and virtual transport -smtpd_sasl_type = dovecot -mailbox_command = /usr/lib/dovecot/deliver -virtual_transport = dovecot -dovecot_destination_recipient_limit = 1 -smtpd_sasl_path = private/auth - -# Virtual delivery settings -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_master.cf b/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_master.cf deleted file mode 100644 index a72ddf17..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_master.cf +++ /dev/null @@ -1,4 +0,0 @@ -# Add this lines to be able to use dovecot as delivery agent -# Dovecot LDA -dovecot unix - n n - - pipe - flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${recipient} diff --git a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index 090b6465..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index a962d086..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/opensuse_11_x/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/opensuse_11_x/postfix_mxaccess/etc_postfix_main.cf deleted file mode 100644 index 82b23a03..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix_mxaccess/etc_postfix_main.cf +++ /dev/null @@ -1,25 +0,0 @@ -# -# ATTENTION - this is not the full postfix-main.cf file -# -# it only provides additional configuration-entries! -# - -# -# look for the follow statement -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient - -# -# and extend it with the following line -# so it looks like this -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient, - check_recipient_mx_access cidr:/etc/postfix/mx_access diff --git a/templates/misc/configfiles/opensuse_11_x/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/opensuse_11_x/postfix_mxaccess/etc_postfix_mx_access deleted file mode 100644 index 18a1ec5f..00000000 --- a/templates/misc/configfiles/opensuse_11_x/postfix_mxaccess/etc_postfix_mx_access +++ /dev/null @@ -1,9 +0,0 @@ -0.0.0.0/8 REJECT Domain MX in broadcast network -10.0.0.0/8 REJECT Domain MX in RFC 1918 private network -169.254.0.0/16 REJECT Domain MX in link local network -172.16.0.0/12 REJECT Domain MX in RFC 1918 private network -192.0.2.0/24 REJECT Domain MX in TEST-NET network -192.168.0.0/16 REJECT Domain MX in RFC 1918 private network -224.0.0.0/4 REJECT Domain MX in class D multicast network -240.0.0.0/5 REJECT Domain MX in class E reserved network -248.0.0.0/5 REJECT Domain MX in reserved network diff --git a/templates/misc/configfiles/opensuse_11_x/proftpd/etc_proftpd_modules.conf b/templates/misc/configfiles/opensuse_11_x/proftpd/etc_proftpd_modules.conf deleted file mode 100644 index abf2ecd2..00000000 --- a/templates/misc/configfiles/opensuse_11_x/proftpd/etc_proftpd_modules.conf +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is used to manage DSO modules and features. -# - -# This is the directory where DSO modules resides - -ModulePath /usr/lib/proftpd - -# Allow only user root to load and unload modules, but allow everyone -# to see which modules have been loaded - -ModuleControlsACLs insmod,rmmod allow user root -ModuleControlsACLs lsmod allow user * - -#LoadModule mod_ctrls_admin.c -LoadModule mod_tls.c -LoadModule mod_sql.c -#LoadModule mod_ldap.c -LoadModule mod_sql_mysql.c -#LoadModule mod_sql_postgres.c -LoadModule mod_quotatab.c -#LoadModule mod_quotatab_file.c -#LoadModule mod_quotatab_ldap.c -LoadModule mod_quotatab_sql.c -#LoadModule mod_radius.c -LoadModule mod_wrap.c -LoadModule mod_rewrite.c - -# keep this module the last one -LoadModule mod_ifsession.c diff --git a/templates/misc/configfiles/opensuse_11_x/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/opensuse_11_x/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index c48e4bf0..00000000 --- a/templates/misc/configfiles/opensuse_11_x/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,84 +0,0 @@ -Include /etc/proftpd/modules.conf - -ServerName " FTP Server" -ServerType standalone -DeferWelcome off - -MultilineRFC2228 on -DefaultServer on -ShowSymlinks on -AllowOverwrite on - -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 1200 - -DisplayLogin welcome.msg -DisplayChdir .message -ListOptions "-l" - -DenyFilter \*.*/ - -Port 21 -MaxInstances 30 -UseIPv6 off - -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - -# Allow up- and downloads to be continued -AllowRetrieveRestart On -AllowStoreRestart On - -# make proftpd faster / do not perform ident and reverse dns lookup -UseReverseDNS off - -# Set the user and group that the server normally runs at. -User nobody -Group nogroup - - -# Umask 022 is a good standard umask to prevent new files and dirs -# (second parm) from being group and world writable. - Umask 022 022 -# Normally, we want files to be overwriteable. - AllowOverwrite on - - - -# CH-Root all users -DefaultRoot ~ -# Reject rootlogin (just for security) -RootLogin off -# Noo need to require valid shell, because user is virtual -RequireValidShell off - - -AuthOrder mod_sql.c - -SQLAuthTypes Crypt Plaintext -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -QuotaEngine on -QuotaShowQuotas on -QuotaDisplayUnits Mb -QuotaLock /var/lock/ftpd.quotatab.lock -QuotaLimitTable sql:/get-quota-limit -QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally -SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" -SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" -SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies -SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies diff --git a/templates/misc/configfiles/opensuse_11_x/pure-ftpd/etc_pure-ftpd.conf b/templates/misc/configfiles/opensuse_11_x/pure-ftpd/etc_pure-ftpd.conf deleted file mode 100644 index 5ac6a16e..00000000 --- a/templates/misc/configfiles/opensuse_11_x/pure-ftpd/etc_pure-ftpd.conf +++ /dev/null @@ -1,75 +0,0 @@ -# Config file for /etc/init.d/pure-ftpd -##Comment variables out to disable its features, or change the values in it... ## -# Maximum number of simultaneous users - -MaxClientsNumber 30 - -# Fork in background - -Daemonize yes - -# Maximum number of sim clients with the same IP address - -MaxClientsPerIP 3 - -# Don't allow authenticated users - have a public anonymous FTP only. - -# If you want to log all client commands, set this to "yes". -# This directive can be duplicated to also log server responses. - -VerboseLog no - -# Allow dot-files -AllowDotFiles yes - -# List dot-files even when the client doesn't send "-a". - -DisplayDotFiles yes - -AnonymousOnly no - -# Disallow anonymous connections. Only allow authenticated users. - -NoAnonymous yes - -# Don't resolve host names in log files. Logs are less verbose, but -# it uses less bandwidth. Set this to "yes" on very busy servers or -# if you don't have a working DNS. - -DontResolve yes - -# Maximum idle time in minutes (default = 15 minutes) - -MaxIdleTime 15 - -# MySQL configuration file (see README.MySQL) - -MySQLConfigFile /etc/pure-ftpd/pure-ftpd-mysql.conf - -# If you want to enable PAM authentication, uncomment the following line - -PAMAuthentication no - -# 'ls' recursion limits. The first argument is the maximum number of -# files to be displayed. The second one is the max subdirectories depth - -LimitRecursion 2000 8 - -# Are anonymous users allowed to create new directories ? - -AnonymousCanCreateDirs no - -# If the system is more loaded than the following value, -# anonymous users aren't allowed to download. - -MaxLoad 4 - -... - -# This option is useful with servers where anonymous upload is -# allowed. As /var/ftp is in /var, it save some space and protect -# the log files. When the partition is more that X percent full, -# new uploads are disallowed. - -MaxDiskUsage 90 - diff --git a/templates/misc/configfiles/opensuse_11_x/pure-ftpd/etc_pure-ftpd_mysql.conf b/templates/misc/configfiles/opensuse_11_x/pure-ftpd/etc_pure-ftpd_mysql.conf deleted file mode 100644 index 675e06db..00000000 --- a/templates/misc/configfiles/opensuse_11_x/pure-ftpd/etc_pure-ftpd_mysql.conf +++ /dev/null @@ -1,15 +0,0 @@ -## connect via port 3306 -#MYSQLServer localhost -#MYSQLPort 3306 -## or connect via sock -MYSQLSocket /var/lib/mysql/mysql.sock -## -MYSQLUser -MYSQLPassword -MYSQLDatabase -MYSQLCrypt any -MYSQLGetPW SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetUID SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetGID SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y" -MySQLGetQTASZ SELECT CONCAT( diskspace / 1024 ) AS diskspace FROM panel_customers WHERE loginname="\L" AND deactivated="0" diff --git a/templates/misc/configfiles/rhel7/cron/etc_cron.d_froxlor b/templates/misc/configfiles/rhel7/cron/etc_cron.d_froxlor deleted file mode 100644 index 4b172508..00000000 --- a/templates/misc/configfiles/rhel7/cron/etc_cron.d_froxlor +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the froxlor package -# -# Please check that all following paths are correct -# -*/1 * * * * root /usr/bin/php -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-auth.conf b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-auth.conf deleted file mode 100644 index 30651ffc..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-auth.conf +++ /dev/null @@ -1,129 +0,0 @@ -## -## Authentication processes -## - -# Disable LOGIN command and all other plaintext authentications unless -# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP -# matches the local IP (ie. you're connecting from the same computer), the -# connection is considered secure and plaintext authentication is allowed. -# See also ssl=required setting. -#disable_plaintext_auth = yes -disable_plaintext_auth = no - -# Authentication cache size (e.g. 10M). 0 means it's disabled. Note that -# bsdauth, PAM and vpopmail require cache_key to be set for caching to be used. -#auth_cache_size = 0 -# Time to live for cached data. After TTL expires the cached record is no -# longer used, *except* if the main database lookup returns internal failure. -# We also try to handle password changes automatically: If user's previous -# authentication was successful, but this one wasn't, the cache isn't used. -# For now this works only with plaintext authentication. -#auth_cache_ttl = 1 hour -# TTL for negative hits (user not found, password mismatch). -# 0 disables caching them completely. -#auth_cache_negative_ttl = 1 hour - -# Space separated list of realms for SASL authentication mechanisms that need -# them. You can leave it empty if you don't want to support multiple realms. -# Many clients simply use the first one listed here, so keep the default realm -# first. -#auth_realms = - -# Default realm/domain to use if none was specified. This is used for both -# SASL realms and appending @domain to username in plaintext logins. -#auth_default_realm = - -# List of allowed characters in username. If the user-given username contains -# a character not listed in here, the login automatically fails. This is just -# an extra check to make sure user can't exploit any potential quote escaping -# vulnerabilities with SQL/LDAP databases. If you want to allow all characters, -# set this value to empty. -auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ - -# Username character translations before it's looked up from databases. The -# value contains series of from -> to characters. For example "#@/@" means -# that '#' and '/' characters are translated to '@'. -#auth_username_translation = - -# Username formatting before it's looked up from databases. You can use -# the standard variables here, eg. %Lu would lowercase the username, %n would -# drop away the domain if it was given, or "%n-AT-%d" would change the '@' into -# "-AT-". This translation is done after auth_username_translation changes. -#auth_username_format = %Lu - -# If you want to allow master users to log in by specifying the master -# username within the normal username string (ie. not using SASL mechanism's -# support for it), you can specify the separator character here. The format -# is then . UW-IMAP uses "*" as the -# separator, so that could be a good choice. -#auth_master_user_separator = - -# Username to use for users logging in with ANONYMOUS SASL mechanism -#auth_anonymous_username = anonymous - -# Maximum number of dovecot-auth worker processes. They're used to execute -# blocking passdb and userdb queries (eg. MySQL and PAM). They're -# automatically created and destroyed as needed. -#auth_worker_max_count = 30 - -# Host name to use in GSSAPI principal names. The default is to use the -# name returned by gethostname(). Use "$ALL" (with quotes) to allow all keytab -# entries. -#auth_gssapi_hostname = - -# Kerberos keytab to use for the GSSAPI mechanism. Will use the system -# default (usually /etc/krb5.keytab) if not specified. You may need to change -# the auth service to run as root to be able to read this file. -#auth_krb5_keytab = - -# Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and -# ntlm_auth helper. -#auth_use_winbind = no - -# Path for Samba's ntlm_auth helper binary. -#auth_winbind_helper_path = /usr/bin/ntlm_auth - -# Time to delay before replying to failed authentications. -#auth_failure_delay = 2 secs - -# Require a valid SSL client certificate or the authentication fails. -#auth_ssl_require_client_cert = no - -# Take the username from client's SSL certificate, using -# X509_NAME_get_text_by_NID() which returns the subject's DN's -# CommonName. -#auth_ssl_username_from_cert = no - -# Space separated list of wanted authentication mechanisms: -# plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey -# gss-spnego -# NOTE: See also disable_plaintext_auth setting. -auth_mechanisms = plain - -## -## Password and user databases -## - -# -# Password database is used to verify user's password (and nothing more). -# You can have multiple passdbs and userdbs. This is useful if you want to -# allow both system users (/etc/passwd) and virtual users to login without -# duplicating the system users into virtual database. -# -# -# -# User database specifies where mails are located and what user/group IDs -# own them. For single-UID configuration use "static" userdb. -# -# - -#!include auth-deny.conf.ext -#!include auth-master.conf.ext - -#!include auth-system.conf.ext -!include auth-sql.conf.ext -#!include auth-ldap.conf.ext -#!include auth-passwdfile.conf.ext -#!include auth-checkpassword.conf.ext -#!include auth-vpopmail.conf.ext -#!include auth-static.conf.ext diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-logging.conf b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-logging.conf deleted file mode 100644 index 6b7dcfbb..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-logging.conf +++ /dev/null @@ -1,84 +0,0 @@ -## -## Log destination. -## - -# Log file to use for error messages. "syslog" logs to syslog, -# /dev/stderr logs to stderr. -log_path = syslog - -# Log file to use for informational messages. Defaults to log_path. -#info_log_path = -# Log file to use for debug messages. Defaults to info_log_path. -#debug_log_path = - -# Syslog facility to use if you're logging to syslog. Usually if you don't -# want to use "mail", you'll use local0..local7. Also other standard -# facilities are supported. -syslog_facility = mail - -## -## Logging verbosity and debugging. -## - -# Log unsuccessful authentication attempts and the reasons why they failed. -#auth_verbose = no - -# In case of password mismatches, log the attempted password. Valid values are -# no, plain and sha1. sha1 can be useful for detecting brute force password -# attempts vs. user simply trying the same password over and over again. -# You can also truncate the value to n chars by appending ":n" (e.g. sha1:6). -#auth_verbose_passwords = no - -# Even more verbose logging for debugging purposes. Shows for example SQL -# queries. -#auth_debug = no - -# In case of password mismatches, log the passwords and used scheme so the -# problem can be debugged. Enabling this also enables auth_debug. -#auth_debug_passwords = no - -# Enable mail process debugging. This can help you figure out why Dovecot -# isn't finding your mails. -#mail_debug = no - -# Show protocol level SSL errors. -#verbose_ssl = no - -# mail_log plugin provides more event logging for mail processes. -plugin { - # Events to log. Also available: flag_change append - #mail_log_events = delete undelete expunge copy mailbox_delete mailbox_rename - # Available fields: uid, box, msgid, from, subject, size, vsize, flags - # size and vsize are available only for expunge and copy events. - #mail_log_fields = uid box msgid size -} - -## -## Log formatting. -## - -# Prefix for each line written to log file. % codes are in strftime(3) -# format. -#log_timestamp = "%b %d %H:%M:%S " - -# Space-separated list of elements we want to log. The elements which have -# a non-empty variable value are joined together to form a comma-separated -# string. -#login_log_format_elements = user=<%u> method=%m rip=%r lip=%l mpid=%e %c - -# Login log format. %s contains login_log_format_elements string, %$ contains -# the data we want to log. -#login_log_format = %$: %s - -# Log prefix for mail processes. See doc/wiki/Variables.txt for list of -# possible variables you can use. -#mail_log_prefix = "%s(%u): " - -# Format to use for logging mail deliveries. You can use variables: -# %$ - Delivery status message (e.g. "saved to INBOX") -# %m - Message-ID -# %s - Subject -# %f - From address -# %p - Physical size -# %w - Virtual size -#deliver_log_format = msgid=%m: %$ diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-mail.conf b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-mail.conf deleted file mode 100644 index 2965fa52..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-mail.conf +++ /dev/null @@ -1,370 +0,0 @@ -## -## Mailbox locations and namespaces -## - -# Location for users' mailboxes. The default is empty, which means that Dovecot -# tries to find the mailboxes automatically. This won't work if the user -# doesn't yet have any mail, so you should explicitly tell Dovecot the full -# location. -# -# If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u) -# isn't enough. You'll also need to tell Dovecot where the other mailboxes are -# kept. This is called the "root mail directory", and it must be the first -# path given in the mail_location setting. -# -# There are a few special variables you can use, eg.: -# -# %u - username -# %n - user part in user@domain, same as %u if there's no domain -# %d - domain part in user@domain, empty if there's no domain -# %h - home directory -# -# See doc/wiki/Variables.txt for full list. Some examples: -# -# mail_location = maildir:~/Maildir -# mail_location = mbox:~/mail:INBOX=/var/mail/%u -# mail_location = mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%n -# -# -# -mail_location = maildir:/var/vmail/%d/%u -# ########################## TODO - -# If you need to set multiple mailbox locations or want to change default -# namespace settings, you can do it by defining namespace sections. -# -# You can have private, shared and public namespaces. Private namespaces -# are for user's personal mails. Shared namespaces are for accessing other -# users' mailboxes that have been shared. Public namespaces are for shared -# mailboxes that are managed by sysadmin. If you create any shared or public -# namespaces you'll typically want to enable ACL plugin also, otherwise all -# users can access all the shared mailboxes, assuming they have permissions -# on filesystem level to do so. -namespace inbox { - # Namespace type: private, shared or public - #type = private - - # Hierarchy separator to use. You should use the same separator for all - # namespaces or some clients get confused. '/' is usually a good one. - # The default however depends on the underlying mail storage format. - #separator = - - # Prefix required to access this namespace. This needs to be different for - # all namespaces. For example "Public/". - #prefix = - - # Physical location of the mailbox. This is in same format as - # mail_location, which is also the default for it. - #location = - - # There can be only one INBOX, and this setting defines which namespace - # has it. - inbox = yes - - # If namespace is hidden, it's not advertised to clients via NAMESPACE - # extension. You'll most likely also want to set list=no. This is mostly - # useful when converting from another server with different namespaces which - # you want to deprecate but still keep working. For example you can create - # hidden namespaces with prefixes "~/mail/", "~%u/mail/" and "mail/". - #hidden = no - - # Show the mailboxes under this namespace with LIST command. This makes the - # namespace visible for clients that don't support NAMESPACE extension. - # "children" value lists child mailboxes, but hides the namespace prefix. - #list = yes - - # Namespace handles its own subscriptions. If set to "no", the parent - # namespace handles them (empty prefix should always have this as "yes") - #subscriptions = yes -} - -# Example shared namespace configuration -#namespace { - #type = shared - #separator = / - - # Mailboxes are visible under "shared/user@domain/" - # %%n, %%d and %%u are expanded to the destination user. - #prefix = shared/%%u/ - - # Mail location for other users' mailboxes. Note that %variables and ~/ - # expands to the logged in user's data. %%n, %%d, %%u and %%h expand to the - # destination user's data. - #location = maildir:%%h/Maildir:INDEX=~/Maildir/shared/%%u - - # Use the default namespace for saving subscriptions. - #subscriptions = no - - # List the shared/ namespace only if there are visible shared mailboxes. - #list = children -#} -# Should shared INBOX be visible as "shared/user" or "shared/user/INBOX"? -#mail_shared_explicit_inbox = no - -# System user and group used to access mails. If you use multiple, userdb -# can override these by returning uid or gid fields. You can use either numbers -# or names. -#mail_uid = -#mail_gid = - -# Group to enable temporarily for privileged operations. Currently this is -# used only with INBOX when either its initial creation or dotlocking fails. -# Typically this is set to "mail" to give access to /var/mail. -#mail_privileged_group = - -# Grant access to these supplementary groups for mail processes. Typically -# these are used to set up access to shared mailboxes. Note that it may be -# dangerous to set these if users can create symlinks (e.g. if "mail" group is -# set here, ln -s /var/mail ~/mail/var could allow a user to delete others' -# mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it). -#mail_access_groups = vmail - -# Allow full filesystem access to clients. There's no access checks other than -# what the operating system does for the active UID/GID. It works with both -# maildir and mboxes, allowing you to prefix mailboxes names with eg. /path/ -# or ~user/. -#mail_full_filesystem_access = no - -# Dictionary for key=value mailbox attributes. Currently used by URLAUTH, but -# soon intended to be used by METADATA as well. -#mail_attribute_dict = - -## -## Mail processes -## - -# Don't use mmap() at all. This is required if you store indexes to shared -# filesystems (NFS or clustered filesystem). -#mmap_disable = no - -# Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL -# since version 3, so this should be safe to use nowadays by default. -#dotlock_use_excl = yes - -# When to use fsync() or fdatasync() calls: -# optimized (default): Whenever necessary to avoid losing important data -# always: Useful with e.g. NFS when write()s are delayed -# never: Never use it (best performance, but crashes can lose data) -#mail_fsync = optimized - -# Mail storage exists in NFS. Set this to yes to make Dovecot flush NFS caches -# whenever needed. If you're using only a single mail server this isn't needed. -#mail_nfs_storage = no -# Mail index files also exist in NFS. Setting this to yes requires -# mmap_disable=yes and fsync_disable=no. -#mail_nfs_index = no - -# Locking method for index files. Alternatives are fcntl, flock and dotlock. -# Dotlocking uses some tricks which may create more disk I/O than other locking -# methods. NFS users: flock doesn't work, remember to change mmap_disable. -#lock_method = fcntl - -# Directory in which LDA/LMTP temporarily stores incoming mails >128 kB. -#mail_temp_dir = /tmp - -# Valid UID range for users, defaults to 500 and above. This is mostly -# to make sure that users can't log in as daemons or other system users. -# Note that denying root logins is hardcoded to dovecot binary and can't -# be done even if first_valid_uid is set to 0. -first_valid_uid = 150 -last_valid_uid = 150 - -# Valid GID range for users, defaults to non-root/wheel. Users having -# non-valid GID as primary group ID aren't allowed to log in. If user -# belongs to supplementary groups with non-valid GIDs, those groups are -# not set. -first_valid_gid = 12 -last_valid_gid = 12 - -# Maximum allowed length for mail keyword name. It's only forced when trying -# to create new keywords. -#mail_max_keyword_length = 50 - -# ':' separated list of directories under which chrooting is allowed for mail -# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too). -# This setting doesn't affect login_chroot, mail_chroot or auth chroot -# settings. If this setting is empty, "/./" in home dirs are ignored. -# WARNING: Never add directories here which local users can modify, that -# may lead to root exploit. Usually this should be done only if you don't -# allow shell access for users. -#valid_chroot_dirs = - -# Default chroot directory for mail processes. This can be overridden for -# specific users in user database by giving /./ in user's home directory -# (eg. /home/./user chroots into /home). Note that usually there is no real -# need to do chrooting, Dovecot doesn't allow users to access files outside -# their mail directory anyway. If your home directories are prefixed with -# the chroot directory, append "/." to mail_chroot. -#mail_chroot = - -# UNIX socket path to master authentication server to find users. -# This is used by imap (for shared users) and lda. -#auth_socket_path = /var/run/dovecot/auth-userdb - -# Directory where to look up mail plugins. -#mail_plugin_dir = /usr/lib/dovecot - -# Space separated list of plugins to load for all services. Plugins specific to -# IMAP, LDA, etc. are added to this list in their own .conf files. -#mail_plugins = - -## -## Mailbox handling optimizations -## - -# Mailbox list indexes can be used to optimize IMAP STATUS commands. They are -# also required for IMAP NOTIFY extension to be enabled. -#mailbox_list_index = no - -# The minimum number of mails in a mailbox before updates are done to cache -# file. This allows optimizing Dovecot's behavior to do less disk writes at -# the cost of more disk reads. -#mail_cache_min_mail_count = 0 - -# When IDLE command is running, mailbox is checked once in a while to see if -# there are any new mails or other changes. This setting defines the minimum -# time to wait between those checks. Dovecot can also use dnotify, inotify and -# kqueue to find out immediately when changes occur. -#mailbox_idle_check_interval = 30 secs - -# Save mails with CR+LF instead of plain LF. This makes sending those mails -# take less CPU, especially with sendfile() syscall with Linux and FreeBSD. -# But it also creates a bit more disk I/O which may just make it slower. -# Also note that if other software reads the mboxes/maildirs, they may handle -# the extra CRs wrong and cause problems. -#mail_save_crlf = no - -# Max number of mails to keep open and prefetch to memory. This only works with -# some mailbox formats and/or operating systems. -#mail_prefetch_count = 0 - -# How often to scan for stale temporary files and delete them (0 = never). -# These should exist only after Dovecot dies in the middle of saving mails. -#mail_temp_scan_interval = 1w - -## -## Maildir-specific settings -## - -# By default LIST command returns all entries in maildir beginning with a dot. -# Enabling this option makes Dovecot return only entries which are directories. -# This is done by stat()ing each entry, so it causes more disk I/O. -# (For systems setting struct dirent->d_type, this check is free and it's -# done always regardless of this setting) -#maildir_stat_dirs = no - -# When copying a message, do it with hard links whenever possible. This makes -# the performance much better, and it's unlikely to have any side effects. -#maildir_copy_with_hardlinks = yes - -# Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only -# when its mtime changes unexpectedly or when we can't find the mail otherwise. -#maildir_very_dirty_syncs = no - -# If enabled, Dovecot doesn't use the S= in the Maildir filenames for -# getting the mail's physical size, except when recalculating Maildir++ quota. -# This can be useful in systems where a lot of the Maildir filenames have a -# broken size. The performance hit for enabling this is very small. -#maildir_broken_filename_sizes = no - -## -## mbox-specific settings -## - -# Which locking methods to use for locking mbox. There are four available: -# dotlock: Create .lock file. This is the oldest and most NFS-safe -# solution. If you want to use /var/mail/ like directory, the users -# will need write access to that directory. -# dotlock_try: Same as dotlock, but if it fails because of permissions or -# because there isn't enough disk space, just skip it. -# fcntl : Use this if possible. Works with NFS too if lockd is used. -# flock : May not exist in all systems. Doesn't work with NFS. -# lockf : May not exist in all systems. Doesn't work with NFS. -# -# You can use multiple locking methods; if you do the order they're declared -# in is important to avoid deadlocks if other MTAs/MUAs are using multiple -# locking methods as well. Some operating systems don't allow using some of -# them simultaneously. -#mbox_read_locks = fcntl -#mbox_write_locks = dotlock fcntl -mbox_write_locks = fcntl - -# Maximum time to wait for lock (all of them) before aborting. -#mbox_lock_timeout = 5 mins - -# If dotlock exists but the mailbox isn't modified in any way, override the -# lock file after this much time. -#mbox_dotlock_change_timeout = 2 mins - -# When mbox changes unexpectedly we have to fully read it to find out what -# changed. If the mbox is large this can take a long time. Since the change -# is usually just a newly appended mail, it'd be faster to simply read the -# new mails. If this setting is enabled, Dovecot does this but still safely -# fallbacks to re-reading the whole mbox file whenever something in mbox isn't -# how it's expected to be. The only real downside to this setting is that if -# some other MUA changes message flags, Dovecot doesn't notice it immediately. -# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK -# commands. -#mbox_dirty_syncs = yes - -# Like mbox_dirty_syncs, but don't do full syncs even with SELECT, EXAMINE, -# EXPUNGE or CHECK commands. If this is set, mbox_dirty_syncs is ignored. -#mbox_very_dirty_syncs = no - -# Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK -# commands and when closing the mailbox). This is especially useful for POP3 -# where clients often delete all mails. The downside is that our changes -# aren't immediately visible to other MUAs. -#mbox_lazy_writes = yes - -# If mbox size is smaller than this (e.g. 100k), don't write index files. -# If an index file already exists it's still read, just not updated. -#mbox_min_index_size = 0 - -# Mail header selection algorithm to use for MD5 POP3 UIDLs when -# pop3_uidl_format=%m. For backwards compatibility we use apop3d inspired -# algorithm, but it fails if the first Received: header isn't unique in all -# mails. An alternative algorithm is "all" that selects all headers. -#mbox_md5 = apop3d - -## -## mdbox-specific settings -## - -# Maximum dbox file size until it's rotated. -#mdbox_rotate_size = 2M - -# Maximum dbox file age until it's rotated. Typically in days. Day begins -# from midnight, so 1d = today, 2d = yesterday, etc. 0 = check disabled. -#mdbox_rotate_interval = 0 - -# When creating new mdbox files, immediately preallocate their size to -# mdbox_rotate_size. This setting currently works only in Linux with some -# filesystems (ext4, xfs). -#mdbox_preallocate_space = no - -## -## Mail attachments -## - -# sdbox and mdbox support saving mail attachments to external files, which -# also allows single instance storage for them. Other backends don't support -# this for now. - -# Directory root where to store mail attachments. Disabled, if empty. -#mail_attachment_dir = - -# Attachments smaller than this aren't saved externally. It's also possible to -# write a plugin to disable saving specific attachments externally. -#mail_attachment_min_size = 128k - -# Filesystem backend to use for saving attachments: -# posix : No SiS done by Dovecot (but this might help FS's own deduplication) -# sis posix : SiS with immediate byte-by-byte comparison during saving -# sis-queue posix : SiS with delayed comparison and deduplication -#mail_attachment_fs = sis posix - -# Hash format to use in attachment filenames. You can add any text and -# variables: %{md4}, %{md5}, %{sha1}, %{sha256}, %{sha512}, %{size}. -# Variables can be truncated, e.g. %{sha256:80} returns only first 80 bits -#mail_attachment_hash = %{sha1} diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-master.conf b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-master.conf deleted file mode 100644 index 441f95a7..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-master.conf +++ /dev/null @@ -1,119 +0,0 @@ -#default_process_limit = 100 -#default_client_limit = 1000 - -# Default VSZ (virtual memory size) limit for service processes. This is mainly -# intended to catch and kill processes that leak memory before they eat up -# everything. -#default_vsz_limit = 256M - -# Login user is internally used by login processes. This is the most untrusted -# user in Dovecot system. It shouldn't have access to anything at all. -#default_login_user = dovenull - -# Internal user is used by unprivileged processes. It should be separate from -# login user, so that login processes can't disturb other processes. -#default_internal_user = dovecot - -service imap-login { - inet_listener imap { - #port = 143 - } - inet_listener imaps { - #port = 993 - #ssl = yes - } - - # Number of connections to handle before starting a new process. Typically - # the only useful values are 0 (unlimited) or 1. 1 is more secure, but 0 - # is faster. - #service_count = 1 - - # Number of processes to always keep waiting for more connections. - #process_min_avail = 0 - - # If you set service_count=0, you probably need to grow this. - #vsz_limit = $default_vsz_limit -} - -service pop3-login { - inet_listener pop3 { - #port = 110 - } - inet_listener pop3s { - #port = 995 - #ssl = yes - } -} - -service lmtp { - unix_listener lmtp { - #mode = 0666 - } - - # Create inet listener only if you can't use the above UNIX socket - #inet_listener lmtp { - # Avoid making LMTP visible for the entire internet - #address = - #port = - #} -} - -service imap { - # Most of the memory goes to mmap()ing files. You may need to increase this - # limit if you have huge mailboxes. - #vsz_limit = $default_vsz_limit - - # Max. number of IMAP processes (connections) - #process_limit = 1024 -} - -service pop3 { - # Max. number of POP3 processes (connections) - #process_limit = 1024 -} - -service auth { - # auth_socket_path points to this userdb socket by default. It's typically - # used by dovecot-lda, doveadm, possibly imap process, etc. Users that have - # full permissions to this socket are able to get a list of all usernames and - # get the results of everyone's userdb lookups. - # - # The default 0666 mode allows anyone to connect to the socket, but the - # userdb lookups will succeed only if the userdb returns an "uid" field that - # matches the caller process's UID. Also if caller's uid or gid matches the - # socket's uid or gid the lookup succeeds. Anything else causes a failure. - # - # To give the caller full permissions to lookup all users, set the mode to - # something else than 0666 and Dovecot lets the kernel enforce the - # permissions (e.g. 0777 allows everyone full permissions). - unix_listener auth-userdb { - #mode = 0666 - #user = - #group = - } - - # Postfix smtp-auth - unix_listener /var/spool/postfix/private/auth { - mode = 0666 - } - - # Auth process is run as this user. - #user = $default_internal_user -} - -service auth-worker { - # Auth worker process is run as root by default, so that it can access - # /etc/shadow. If this isn't necessary, the user should be changed to - # $default_internal_user. - #user = root -} - -service dict { - # If dict proxy is used, mail processes should have access to its socket. - # For example: mode=0660, group=vmail and global mail_access_groups=vmail - unix_listener dict { - #mode = 0600 - #user = - #group = - } -} diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-ssl.conf b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-ssl.conf deleted file mode 100644 index 29dd497a..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-ssl.conf +++ /dev/null @@ -1,60 +0,0 @@ -## -## SSL settings -## - -# SSL/TLS support: yes, no, required. -# disable plain pop3 and imap, allowed are only pop3+TLS, pop3s, imap+TLS and imaps -# plain imap and pop3 are still allowed for local connections -ssl = no - -# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before -# dropping root privileges, so keep the key file unreadable by anyone but -# root. Included doc/mkcert.sh can be used to easily generate self-signed -# certificate, just make sure to update the domains in dovecot-openssl.cnf -#ssl_cert = . %d expands to recipient domain. -postmaster_address = postmaster@ - -# Hostname to use in various parts of sent mails (e.g. in Message-Id) and -# in LMTP replies. Default is the system's real hostname@domain. -#hostname = - -# If user is over quota, return with temporary failure instead of -# bouncing the mail. -#quota_full_tempfail = no - -# Binary to use for sending mails. -#sendmail_path = /usr/sbin/sendmail - -# If non-empty, send mails via this SMTP host[:port] instead of sendmail. -#submission_host = - -# Subject: header to use for rejection mails. You can use the same variables -# as for rejection_reason below. -#rejection_subject = Rejected: %s - -# Human readable error message for rejection mails. You can use variables: -# %n = CRLF, %r = reason, %s = original subject, %t = recipient -#rejection_reason = Your message to <%t> was automatically rejected:%n%r - -# Delimiter character between local-part and detail in email address. -#recipient_delimiter = + - -# Header where the original recipient address (SMTP's RCPT TO: address) is taken -# from if not available elsewhere. With dovecot-lda -a parameter overrides this. -# A commonly used header for this is X-Original-To. -#lda_original_recipient_header = - -# Should saving a mail to a nonexistent mailbox automatically create it? -#lda_mailbox_autocreate = no - -# Should automatically created mailboxes be also automatically subscribed? -#lda_mailbox_autosubscribe = no - -protocol lda { - # Space separated list of plugins to load (default is global mail_plugins). - mail_plugins = $mail_plugins quota sieve -} diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_15-mailboxes.conf b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_15-mailboxes.conf deleted file mode 100644 index 490d0910..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_15-mailboxes.conf +++ /dev/null @@ -1,52 +0,0 @@ -## -## Mailbox definitions -## - -# NOTE: Assumes "namespace inbox" has been defined in 10-mail.conf. -namespace inbox { - - #mailbox name { - # auto=create will automatically create this mailbox. - # auto=subscribe will both create and subscribe to the mailbox. - #auto = no - - # Space separated list of IMAP SPECIAL-USE attributes as specified by - # RFC 6154: \All \Archive \Drafts \Flagged \Junk \Sent \Trash - #special_use = - #} - - # These mailboxes are widely used and could perhaps be created automatically: - mailbox Drafts { - special_use = \Drafts - auto=subscribe - } - mailbox Junk { - special_use = \Junk - auto=subscribe - } - mailbox Trash { - special_use = \Trash - auto=subscribe - } - - # For \Sent mailboxes there are two widely used names. We'll mark both of - # them as \Sent. User typically deletes one of them if duplicates are created. - mailbox Sent { - special_use = \Sent - auto=subscribe - } - #mailbox "Sent Messages" { - # special_use = \Sent - #} - - # If you have a virtual "All messages" mailbox: - #mailbox virtual/All { - # special_use = \All - #} - - # If you have a virtual "Flagged" mailbox: - #mailbox virtual/Flagged { - # special_use = \Flagged - #} -} - diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-imap.conf b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-imap.conf deleted file mode 100644 index 4f3b109f..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-imap.conf +++ /dev/null @@ -1,61 +0,0 @@ -## -## IMAP specific settings -## - -# Maximum IMAP command line length. Some clients generate very long command -# lines with huge mailboxes, so you may need to raise this if you get -# "Too long argument" or "IMAP command line too large" errors often. -#imap_max_line_length = 64k - -# IMAP logout format string: -# %i - total number of bytes read from client -# %o - total number of bytes sent to client -imap_logout_format = in=%i out=%o - -# Override the IMAP CAPABILITY response. If the value begins with '+', -# add the given capabilities on top of the defaults (e.g. +XFOO XBAR). -#imap_capability = - -# How long to wait between "OK Still here" notifications when client is -# IDLEing. -#imap_idle_notify_interval = 2 mins - -# ID field names and values to send to clients. Using * as the value makes -# Dovecot use the default value. The following fields have default values -# currently: name, version, os, os-version, support-url, support-email. -#imap_id_send = - -# ID fields sent by client to log. * means everything. -#imap_id_log = - -# Workarounds for various client bugs: -# delay-newmail: -# Send EXISTS/RECENT new mail notifications only when replying to NOOP -# and CHECK commands. Some clients ignore them otherwise, for example OSX -# Mail ( - #service_count = 1 - - # Number of processes to always keep waiting for more connections. - #process_min_avail = 0 - - # If you set service_count=0, you probably need to grow this. - #vsz_limit = 64M -#} - -#service managesieve { - # Max. number of ManageSieve processes (connections) - #process_limit = 1024 -#} - -# Service configuration - -protocol sieve { - # Maximum ManageSieve command line length in bytes. ManageSieve usually does - # not involve overly long command lines, so this setting will not normally - # need adjustment - #managesieve_max_line_length = 65536 - - # Maximum number of ManageSieve connections allowed for a user from each IP - # address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 - - # Space separated list of plugins to load (none known to be useful so far). - # Do NOT try to load IMAP plugins here. - #mail_plugins = - - # MANAGESIEVE logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - #managesieve_logout_format = bytes=%i/%o - - # To fool ManageSieve clients that are focused on CMU's timesieved you can - # specify the IMPLEMENTATION capability that Dovecot reports to clients. - # For example: 'Cyrus timsieved v2.2.13' - #managesieve_implementation_string = Dovecot Pigeonhole - - # Explicitly specify the SIEVE and NOTIFY capability reported by the server - # before login. If left unassigned these will be reported dynamically - # according to what the Sieve interpreter supports by default (after login - # this may differ depending on the user). - #managesieve_sieve_capability = - #managesieve_notify_capability = - - # The maximum number of compile errors that are returned to the client upon - # script upload or script verification. - #managesieve_max_compile_errors = 5 - - # Refer to 90-sieve.conf for script quota configuration and configuration of - # Sieve execution limits. -} diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-pop3.conf b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-pop3.conf deleted file mode 100644 index b37a735e..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-pop3.conf +++ /dev/null @@ -1,98 +0,0 @@ -## -## POP3 specific settings -## - -# Don't try to set mails non-recent or seen with POP3 sessions. This is -# mostly intended to reduce disk I/O. With maildir it doesn't move files -# from new/ to cur/, with mbox it doesn't write Status-header. -#pop3_no_flag_updates = no - -# Support LAST command which exists in old POP3 specs, but has been removed -# from new ones. Some clients still wish to use this though. Enabling this -# makes RSET command clear all \Seen flags from messages. -#pop3_enable_last = no - -# If mail has X-UIDL header, use it as the mail's UIDL. -#pop3_reuse_xuidl = no - -# Allow only one POP3 session to run simultaneously for the same user. -#pop3_lock_session = no - -# POP3 requires message sizes to be listed as if they had CR+LF linefeeds. -# Many POP3 servers violate this by returning the sizes with LF linefeeds, -# because it's faster to get. When this setting is enabled, Dovecot still -# tries to do the right thing first, but if that requires opening the -# message, it fallbacks to the easier (but incorrect) size. -#pop3_fast_size_lookups = no - -# POP3 UIDL (unique mail identifier) format to use. You can use following -# variables, along with the variable modifiers described in -# doc/wiki/Variables.txt (e.g. %Uf for the filename in uppercase) -# -# %v - Mailbox's IMAP UIDVALIDITY -# %u - Mail's IMAP UID -# %m - MD5 sum of the mailbox headers in hex (mbox only) -# %f - filename (maildir only) -# %g - Mail's GUID -# -# If you want UIDL compatibility with other POP3 servers, use: -# UW's ipop3d : %08Xv%08Xu -# Courier : %f or %v-%u (both might be used simultaneosly) -# Cyrus (<= 2.1.3) : %u -# Cyrus (>= 2.1.4) : %v.%u -# Dovecot v0.99.x : %v.%u -# tpop3d : %Mf -# -# Note that Outlook 2003 seems to have problems with %v.%u format which was -# Dovecot's default, so if you're building a new server it would be a good -# idea to change this. %08Xu%08Xv should be pretty fail-safe. -# -#pop3_uidl_format = %08Xu%08Xv - -# Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes -# won't change those UIDLs. Currently this works only with Maildir. -#pop3_save_uidl = no - -# What to do about duplicate UIDLs if they exist? -# allow: Show duplicates to clients. -# rename: Append a temporary -2, -3, etc. counter after the UIDL. -#pop3_uidl_duplicates = allow - -# This option changes POP3 behavior so that it's not possible to actually -# delete mails via POP3, only hide them from future POP3 sessions. The mails -# will still be counted towards user's quota until actually deleted via IMAP. -# Use e.g. "$POP3Deleted" as the value (it will be visible as IMAP keyword). -# Make sure you can legally archive mails before enabling this setting. -#pop3_deleted_flag = - -# POP3 logout format string: -# %i - total number of bytes read from client -# %o - total number of bytes sent to client -# %t - number of TOP commands -# %p - number of bytes sent to client as a result of TOP command -# %r - number of RETR commands -# %b - number of bytes sent to client as a result of RETR command -# %d - number of deleted messages -# %m - number of messages (before deletion) -# %s - mailbox size in bytes (before deletion) -# %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly -#pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - -# Workarounds for various client bugs: -# outlook-no-nuls: -# Outlook and Outlook Express hang if mails contain NUL characters. -# This setting replaces them with 0x80 character. -# oe-ns-eoh: -# Outlook Express and Netscape Mail breaks if end of headers-line is -# missing. This option simply sends it if it's missing. -# The list is space-separated. -#pop3_client_workarounds = - -protocol pop3 { - # Space separated list of plugins to load (default is global mail_plugins). - mail_plugins = $mail_plugins quota - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 -} diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_90-sieve.conf b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_90-sieve.conf deleted file mode 100644 index f7e3d4c7..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_90-sieve.conf +++ /dev/null @@ -1,111 +0,0 @@ -## -## Settings for the Sieve interpreter -## - -# Do not forget to enable the Sieve plugin in 15-lda.conf and 20-lmtp.conf -# by adding it to the respective mail_plugins= settings. - -plugin { - # The path to the user's main active script. If ManageSieve is used, this the - # location of the symbolic link controlled by ManageSieve. - #sieve = ~/.dovecot.sieve - sieve = /var/sieve-userscripts/script-%u.sieve - - # The default Sieve script when the user has none. This is a path to a global - # sieve script file, which gets executed ONLY if user's private Sieve script - # doesn't exist. Be sure to pre-compile this script manually using the sievec - # command line tool. - # --> See sieve_before fore executing scripts before the user's personal - # script. - #sieve_default = /var/lib/dovecot/sieve/default.sieve - sieve_global_path = /var/lib/dovecot/sieve/default.sieve - - # Directory for :personal include scripts for the include extension. This - # is also where the ManageSieve service stores the user's scripts. - #sieve_dir = ~/sieve - sieve_dir = /var/sieve-userscripts/%u - - # Directory for :global include scripts for the include extension. - #sieve_global_dir = - sieve_global_dir = /var/lib/dovecot/sieve/global - - # Path to a script file or a directory containing script files that need to be - # executed before the user's script. If the path points to a directory, all - # the Sieve scripts contained therein (with the proper .sieve extension) are - # executed. The order of execution within a directory is determined by the - # file names, using a normal 8bit per-character comparison. Multiple script - # file or directory paths can be specified by appending an increasing number. - #sieve_before = - #sieve_before2 = - #sieve_before3 = (etc...) - sieve_before = /var/lib/dovecot/sieve/before/ - - # Identical to sieve_before, only the specified scripts are executed after the - # user's script (only when keep is still in effect!). Multiple script file or - # directory paths can be specified by appending an increasing number. - #sieve_after = - #sieve_after2 = - #sieve_after2 = (etc...) - - # Which Sieve language extensions are available to users. By default, all - # supported extensions are available, except for deprecated extensions or - # those that are still under development. Some system administrators may want - # to disable certain Sieve extensions or enable those that are not available - # by default. This setting can use '+' and '-' to specify differences relative - # to the default. For example `sieve_extensions = +imapflags' will enable the - # deprecated imapflags extension in addition to all extensions were already - # enabled by default. - #sieve_extensions = +notify +imapflags - sieve_extensions = +spamtest +spamtestplus +relational +comparator-i;ascii-numeric +notify +imapflags - - # Which Sieve language extensions are ONLY available in global scripts. This - # can be used to restrict the use of certain Sieve extensions to administrator - # control, for instance when these extensions can cause security concerns. - # This setting has higher precedence than the `sieve_extensions' setting - # (above), meaning that the extensions enabled with this setting are never - # available to the user's personal script no matter what is specified for the - # `sieve_extensions' setting. The syntax of this setting is similar to the - # `sieve_extensions' setting, with the difference that extensions are - # enabled or disabled for exclusive use in global scripts. Currently, no - # extensions are marked as such by default. - #sieve_global_extensions = - - # The Pigeonhole Sieve interpreter can have plugins of its own. Using this - # setting, the used plugins can be specified. Check the Dovecot wiki - # (wiki2.dovecot.org) or the pigeonhole website - # (http://pigeonhole.dovecot.org) for available plugins. - # The sieve_extprograms plugin is included in this release. - #sieve_plugins = - - # The separator that is expected between the :user and :detail - # address parts introduced by the subaddress extension. This may - # also be a sequence of characters (e.g. '--'). The current - # implementation looks for the separator from the left of the - # localpart and uses the first one encountered. The :user part is - # left of the separator and the :detail part is right. This setting - # is also used by Dovecot's LMTP service. - #recipient_delimiter = + - - # The maximum size of a Sieve script. The compiler will refuse to compile any - # script larger than this limit. If set to 0, no limit on the script size is - # enforced. - #sieve_max_script_size = 1M - - # The maximum number of actions that can be performed during a single script - # execution. If set to 0, no limit on the total number of actions is enforced. - #sieve_max_actions = 32 - - # The maximum number of redirect actions that can be performed during a single - # script execution. If set to 0, no redirect actions are allowed. - #sieve_max_redirects = 4 - - # The maximum number of personal Sieve scripts a single user can have. If set - # to 0, no limit on the number of scripts is enforced. - # (Currently only relevant for ManageSieve) - #sieve_quota_max_scripts = 0 - - # The maximum amount of disk storage a single user's scripts may occupy. If - # set to 0, no limit on the used amount of disk storage is enforced. - # (Currently only relevant for ManageSieve) - #sieve_quota_max_storage = 0 -} diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_dovecot-sql.conf.ext b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_dovecot-sql.conf.ext deleted file mode 100644 index 0078d173..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_dovecot-sql.conf.ext +++ /dev/null @@ -1,141 +0,0 @@ -# This file is opened as root, so it should be owned by root and mode 0600. -# -# http://wiki.dovecot.org/AuthDatabase/SQL -# -# For the sql passdb module, you'll need a database with a table that -# contains fields for at least the username and password. If you want to -# use the user@domain syntax, you might want to have a separate domain -# field as well. -# -# If your users all have the same uig/gid, and have predictable home -# directories, you can use the static userdb module to generate the home -# dir based on the username and domain. In this case, you won't need fields -# for home, uid, or gid in the database. -# -# If you prefer to use the sql userdb module, you'll want to add fields -# for home, uid, and gid. Here is an example table: -# -# CREATE TABLE users ( -# username VARCHAR(128) NOT NULL, -# domain VARCHAR(128) NOT NULL, -# password VARCHAR(64) NOT NULL, -# home VARCHAR(255) NOT NULL, -# uid INTEGER NOT NULL, -# gid INTEGER NOT NULL, -# active CHAR(1) DEFAULT 'Y' NOT NULL -# ); - -# Database driver: mysql, pgsql, sqlite -driver = mysql - -# Database connection string. This is driver-specific setting. -# -# HA / round-robin load-balancing is supported by giving multiple host -# settings, like: host=sql1.host.org host=sql2.host.org -# -# pgsql: -# For available options, see the PostgreSQL documention for the -# PQconnectdb function of libpq. -# Use maxconns=n (default 5) to change how many connections Dovecot can -# create to pgsql. -# -# mysql: -# Basic options emulate PostgreSQL option names: -# host, port, user, password, dbname -# -# But also adds some new settings: -# client_flags - See MySQL manual -# ssl_ca, ssl_ca_path - Set either one or both to enable SSL -# ssl_cert, ssl_key - For sending client-side certificates to server -# ssl_cipher - Set minimum allowed cipher security (default: HIGH) -# option_file - Read options from the given file instead of -# the default my.cnf location -# option_group - Read options from the given group (default: client) -# -# You can connect to UNIX sockets by using host: host=/var/run/mysql.sock -# Note that currently you can't use spaces in parameters. -# -# sqlite: -# The path to the database file. -# -# Examples: -# connect = host=192.168.1.1 dbname=users -# connect = host=sql.example.com dbname=virtual user=virtual password=blarg -# connect = /etc/dovecot/authdb.sqlite -# -connect = host= dbname= user= password= - -# Default password scheme. -# -# List of supported schemes is in -# http://wiki.dovecot.org/Authentication/PasswordSchemes -# -default_pass_scheme = CRYPT - -# passdb query to retrieve the password. It can return fields: -# password - The user's password. This field must be returned. -# user - user@domain from the database. Needed with case-insensitive lookups. -# username and domain - An alternative way to represent the "user" field. -# -# The "user" field is often necessary with case-insensitive lookups to avoid -# e.g. "name" and "nAme" logins creating two different mail directories. If -# your user and domain names are in separate fields, you can return "username" -# and "domain" fields instead of "user". -# -# The query can also return other fields which have a special meaning, see -# http://wiki.dovecot.org/PasswordDatabase/ExtraFields -# -# Commonly used available substitutions (see http://wiki.dovecot.org/Variables -# for full list): -# %u = entire user@domain -# %n = user part of user@domain -# %d = domain part of user@domain -# -# Note that these can be used only as input to SQL query. If the query outputs -# any of these substitutions, they're not touched. Otherwise it would be -# difficult to have eg. usernames containing '%' characters. -# -# Example: -# password_query = SELECT userid AS user, pw AS password \ -# FROM users WHERE userid = '%u' AND active = 'Y' -# -#password_query = \ -# SELECT username, domain, password \ -# FROM users WHERE username = '%n' AND domain = '%d' -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('*:storage=', (quota*1024)) as userdb_quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve') -#password_query = SELECT username as user, password, '/var/vmail/%d/%n' as userdb_home, 'maildir:/var/vmail/%d/%n' as userdb_mail, 150 as userdb_uid, 12 as userdb_gid FROM mailbox WHERE username = '%u' AND active = '1' - -# userdb query to retrieve the user information. It can return fields: -# uid - System UID (overrides mail_uid setting) -# gid - System GID (overrides mail_gid setting) -# home - Home directory -# mail - Mail location (overrides mail_location setting) -# -# None of these are strictly required. If you use a single UID and GID, and -# home or mail directory fits to a template string, you could use userdb static -# instead. For a list of all fields that can be returned, see -# http://wiki.dovecot.org/UserDatabase/ExtraFields -# -# Examples: -# user_query = SELECT home, uid, gid FROM users WHERE userid = '%u' -# user_query = SELECT dir AS home, user AS uid, group AS gid FROM users where userid = '%u' -# user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u' -# -#user_query = \ -# SELECT home, uid, gid \ -# FROM users WHERE username = '%n' AND domain = '%d' -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') -#user_query = SELECT '/var/vmail/%d/%n' as home, 'maildir:/var/vmail/%d/%n' as mail, 150 AS uid, 12 AS gid FROM mailbox WHERE username = '%u' AND active = '1' - -# If you wish to avoid two SQL lookups (passdb + userdb), you can use -# userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll -# also have to return userdb fields in password_query prefixed with "userdb_" -# string. For example: -#password_query = \ -# SELECT userid AS user, password, \ -# home AS userdb_home, uid AS userdb_uid, gid AS userdb_gid \ -# FROM users WHERE userid = '%u' - -# Query to get a list of all usernames. -#iterate_query = SELECT username AS user FROM users -iterate_query = SELECT username AS user FROM mail_users diff --git a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_dovecot.conf deleted file mode 100644 index 5934b952..00000000 --- a/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_dovecot.conf +++ /dev/null @@ -1,84 +0,0 @@ -## Dovecot configuration file - -# If you're in a hurry, see http://wiki.dovecot.org/QuickConfiguration - -# "doveconf -n" command gives a clean output of the changed settings. Use it -# instead of copy&pasting files when posting to the Dovecot mailing list. - -# '#' character and everything after it is treated as comments. Extra spaces -# and tabs are ignored. If you want to use either of these explicitly, put the -# value inside quotes, eg.: key = "# char and trailing whitespace " - -# Default values are shown for each setting, it's not required to uncomment -# those. These are exceptions to this though: No sections (e.g. namespace {}) -# or plugin settings are added by default, they're listed only as examples. -# Paths are also just examples with the real defaults being based on configure -# options. The paths listed here are for configure --prefix=/usr -# --sysconfdir=/etc --localstatedir=/var - -# Protocols we want to be serving. -protocols = imap pop3 sieve -#protocols = imap pop3 lmtp -#protocols = imap pop3 lmtp sieve - -# A comma separated list of IPs or hosts where to listen in for connections. -# "*" listens in all IPv4 interfaces, "::" listens in all IPv6 interfaces. -# If you want to specify non-default ports or anything more complex, -# edit conf.d/master.conf. -listen = *, :: - -# Base directory where to store runtime data. -base_dir = /var/run/dovecot/ - -# Greeting message for clients. -login_greeting = Dovecot ready. - -# Space separated list of trusted network ranges. Connections from these -# IPs are allowed to override their IP addresses and ports (for logging and -# for authentication checks). disable_plaintext_auth is also ignored for -# these networks. Typically you'd specify your IMAP proxy servers here. -#login_trusted_networks = - -# Sepace separated list of login access check sockets (e.g. tcpwrap) -#login_access_sockets = - -# Show more verbose process titles (in ps). Currently shows user name and -# IP address. Useful for seeing who are actually using the IMAP processes -# (eg. shared mailboxes or if same uid is used for multiple accounts). -#verbose_proctitle = no - -# Should all processes be killed when Dovecot master process shuts down. -# Setting this to "no" means that Dovecot can be upgraded without -# forcing existing client connections to close (although that could also be -# a problem if the upgrade is e.g. because of a security fix). -shutdown_clients = yes - -# If non-zero, run mail commands via this many connections to doveadm server, -# instead of running them directly in the same process. -#doveadm_worker_count = 0 -# UNIX socket or host:port used for connecting to doveadm server -#doveadm_socket_path = doveadm-server - -## -## Dictionary server settings -## - -# Dictionary can be used to store key=value lists. This is used by several -# plugins. The dictionary can be accessed either directly or though a -# dictionary server. The following dict block maps dictionary names to URIs -# when the server is used. These can then be referenced using URIs in format -# "proxy::". - -dict { - #quota = mysql:/etc/dovecot/dovecot-dict-sql.conf.ext - #expire = sqlite:/etc/dovecot/dovecot-dict-sql.conf.ext -} - -# Most of the actual configuration gets included below. The filenames are -# first sorted by their ASCII value and parsed in that order. The 00-prefixes -# in filenames are intended to make it easier to understand the ordering. -!include conf.d/*.conf - -# A config file can also tried to be included without giving an error if -# it's not found: -#!include_try /etc/dovecot/local.conf diff --git a/templates/misc/configfiles/rhel7/postfix/etc_postfix_main.cf b/templates/misc/configfiles/rhel7/postfix/etc_postfix_main.cf deleted file mode 100644 index 03851aeb..00000000 --- a/templates/misc/configfiles/rhel7/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,83 +0,0 @@ -## General Postfix configuration - -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 -mailbox_size_limit = 0 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes -## Dovecot Settings for deliver, SASL Auth and virtual transport -smtpd_sasl_type = dovecot -mailbox_command = /usr/lib/dovecot/deliver -virtual_transport = dovecot -dovecot_destination_recipient_limit = 1 -smtpd_sasl_path = private/auth - -# Virtual delivery settings -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 diff --git a/templates/misc/configfiles/rhel7/postfix/etc_postfix_master.cf b/templates/misc/configfiles/rhel7/postfix/etc_postfix_master.cf deleted file mode 100644 index 3bfab103..00000000 --- a/templates/misc/configfiles/rhel7/postfix/etc_postfix_master.cf +++ /dev/null @@ -1,3 +0,0 @@ - -# added for Froxlor -dovecot unix - n n - - pipe flags=DRhu user=vmail:mail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${recipient} diff --git a/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index 8b013775..00000000 --- a/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and TRIM(destination) <> '' -hosts = \ No newline at end of file diff --git a/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 817fea04..00000000 --- a/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = \ No newline at end of file diff --git a/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index f8544af6..00000000 --- a/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = -password = -dbname = -table = mail_users -select_field = maildir -where_field = email -hosts = \ No newline at end of file diff --git a/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 058faaec..00000000 --- a/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); -hosts = \ No newline at end of file diff --git a/templates/misc/configfiles/rhel7/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/rhel7/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index 696c6a5b..00000000 --- a/templates/misc/configfiles/rhel7/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,448 +0,0 @@ -# This is the ProFTPD configuration file -# -# See: http://www.proftpd.org/docs/directives/linked/by-name.html - -# Security-Enhanced Linux (SELinux) Notes: -# -# In Fedora and Red Hat Enterprise Linux, ProFTPD runs confined by SELinux -# in order to mitigate the effects of an attacker taking advantage of an -# unpatched vulnerability and getting control of the ftp server. By default, -# ProFTPD cannot read or write most files on a system nor connect to many -# external network services, but these restrictions can be relaxed by -# setting SELinux booleans as follows: -# -# setsebool -P allow_ftpd_anon_write=1 -# This allows the ftp daemon to write to files and directories labelled -# with the public_content_rw_t context type; the daemon would only have -# read access to these files normally. Files to be made available by ftp -# but not writeable should be labelled public_content_t. -# -# setsebool -P allow_ftpd_full_access=1 -# This allows the ftp daemon to read and write all files on the system. -# -# setsebool -P allow_ftpd_use_cifs=1 -# This allows the ftp daemon to read and write files on CIFS-mounted -# filesystems. -# -# setsebool -P allow_ftpd_use_nfs=1 -# This allows the ftp daemon to read and write files on NFS-mounted -# filesystems. -# -# setsebool -P ftp_home_dir=1 -# This allows the ftp daemon to read and write files in users' home -# directories. -# -# setsebool -P ftpd_connect_all_unreserved=1 -# This setting is only available from Fedora 16/RHEL-7 onwards, and is -# necessary for active-mode ftp transfers to work reliably with non-Linux -# clients (see http://bugzilla.redhat.com/782177), which may choose to -# use port numbers outside the "ephemeral port" range of 32768-61000. -# -# setsebool -P ftpd_connect_db=1 -# This setting allows the ftp daemon to connect to commonly-used database -# ports over the network, which is necessary if you are using a database -# back-end for user authentication, etc. -# -# setsebool -P ftpd_is_daemon=1 -# This setting is available only in Fedora releases 4 to 6 and Red Hat -# Enterprise Linux 5. It should be set if ProFTPD is running in standalone -# mode, and unset if running in inetd mode. -# -# setsebool -P ftpd_disable_trans=1 -# This setting is available only in Fedora releases 4 to 6 and Red Hat -# Enterprise Linux 5, and when set it removes the SELinux confinement of the -# ftp daemon. Needless to say, its use is not recommended. -# -# All of these booleans are unset by default. -# -# See also the "ftpd_selinux" manpage. -# -# Note that the "-P" option to setsebool makes the setting permanent, i.e. -# it will still be in effect after a reboot; without the "-P" option, the -# effect only lasts until the next reboot. -# -# Restrictions imposed by SELinux are on top of those imposed by ordinary -# file ownership and access permissions; in normal operation, the ftp daemon -# will not be able to read and/or write a file unless *all* of the ownership, -# permission and SELinux restrictions allow it. - -# Server Config - config used for anything outside a or context -# See: http://www.proftpd.org/docs/howto/Vhost.html - -# Trace logging, disabled by default for performance reasons -# (http://www.proftpd.org/docs/howto/Tracing.html) -#TraceLog /var/log/proftpd/trace.log -#Trace DEFAULT:0 - -ServerName " FTP server" -ServerIdent on "FTP Server ready." -ServerAdmin root@ -DefaultServer on - -# The DebugLevel directive configures the debugging level the server will use when logging. -# The level parameter must be between 0 and 9. -# This configuration directive will take precedence over any command-line debugging options used. -#DebugLevel 9 - -# Cause every FTP user except adm to be chrooted into their home directory -DefaultRoot ~ !adm - -# Use pam to authenticate (default) and be authoritative -AuthPAMConfig proftpd -AuthOrder mod_sql.c -#AuthOrder mod_auth_pam.c* mod_auth_unix.c -# If you use NIS/YP/LDAP you may need to disable PersistentPasswd -#PersistentPasswd off - -# Don't do reverse DNS lookups (hangs on DNS problems) -UseReverseDNS off - -# Set the user and group that the server runs as -User nobody -Group nobody - -# To prevent DoS attacks, set the maximum number of child processes -# to 20. If you need to allow more than 20 concurrent connections -# at once, simply increase this value. Note that this ONLY works -# in standalone mode; in inetd mode you should use an inetd server -# that allows you to limit maximum number of processes per service -# (such as xinetd) -MaxInstances 20 - -# Disable sendfile by default since it breaks displaying the download speeds in -# ftptop and ftpwho -UseSendfile off - -# Define the log formats -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" - -# Dynamic Shared Object (DSO) loading -# See README.DSO and howto/DSO.html for more details -# -# General database support (http://www.proftpd.org/docs/contrib/mod_sql.html) - LoadModule mod_sql.c -# -# Support for base-64 or hex encoded MD5 and SHA1 passwords from SQL tables -# (contrib/mod_sql_passwd.html) -# LoadModule mod_sql_passwd.c -# -# Mysql support (requires proftpd-mysql package) -# (http://www.proftpd.org/docs/contrib/mod_sql.html) - LoadModule mod_sql_mysql.c -# -# Postgresql support (requires proftpd-postgresql package) -# (http://www.proftpd.org/docs/contrib/mod_sql.html) -# LoadModule mod_sql_postgres.c -# -# Quota support (http://www.proftpd.org/docs/contrib/mod_quotatab.html) - LoadModule mod_quotatab.c -# -# File-specific "driver" for storing quota table information in files -# (http://www.proftpd.org/docs/contrib/mod_quotatab_file.html) -# LoadModule mod_quotatab_file.c -# -# SQL database "driver" for storing quota table information in SQL tables -# (http://www.proftpd.org/docs/contrib/mod_quotatab_sql.html) - LoadModule mod_quotatab_sql.c -# -# LDAP support (requires proftpd-ldap package) -# (http://www.proftpd.org/docs/directives/linked/config_ref_mod_ldap.html) -# LoadModule mod_ldap.c -# -# LDAP quota support (requires proftpd-ldap package) -# (http://www.proftpd.org/docs/contrib/mod_quotatab_ldap.html) -# LoadModule mod_quotatab_ldap.c -# -# Support for authenticating users using the RADIUS protocol -# (http://www.proftpd.org/docs/contrib/mod_radius.html) -# LoadModule mod_radius.c -# -# Retrieve quota limit table information from a RADIUS server -# (http://www.proftpd.org/docs/contrib/mod_quotatab_radius.html) -# LoadModule mod_quotatab_radius.c -# -# SITE CPFR and SITE CPTO commands (analogous to RNFR and RNTO), which can be -# used to copy files/directories from one place to another on the server -# without having to transfer the data to the client and back -# (http://www.castaglia.org/proftpd/modules/mod_copy.html) -# LoadModule mod_copy.c -# -# Administrative control actions for the ftpdctl program -# (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html) -LoadModule mod_ctrls_admin.c -# -# Support for MODE Z commands, which allows FTP clients and servers to -# compress data for transfer -# (http://www.castaglia.org/proftpd/modules/mod_deflate.html) -# LoadModule mod_deflate.c -# -# Execute external programs or scripts at various points in the process -# of handling FTP commands -# (http://www.castaglia.org/proftpd/modules/mod_exec.html) -# LoadModule mod_exec.c -# -# Support for POSIX ACLs -# (http://www.proftpd.org/docs/modules/mod_facl.html) -# LoadModule mod_facl.c -# -# Support for using the GeoIP library to look up geographical information on -# the connecting client and using that to set access controls for the server -# (http://www.castaglia.org/proftpd/modules/mod_geoip.html) -# LoadModule mod_geoip.c -# -# Allow for version-specific configuration sections of the proftpd config file, -# useful for using the same proftpd config across multiple servers where -# different proftpd versions may be in use -# (http://www.castaglia.org/proftpd/modules/mod_ifversion.html) -# LoadModule mod_ifversion.c -# -# Configure server availability based on system load -# (http://www.proftpd.org/docs/contrib/mod_load.html) -# LoadModule mod_load.c -# -# Limit downloads to a multiple of upload volume (see README.ratio) -# LoadModule mod_ratio.c -# -# Rewrite FTP commands sent by clients on-the-fly, -# using regular expression matching and substitution -# (http://www.proftpd.org/docs/contrib/mod_rewrite.html) -# LoadModule mod_rewrite.c -# -# Support for the SSH2, SFTP, and SCP protocols, for secure file transfer over -# an SSH2 connection (http://www.castaglia.org/proftpd/modules/mod_sftp.html) -# LoadModule mod_sftp.c -# -# Use PAM to provide a 'keyboard-interactive' SSH2 authentication method for -# mod_sftp (http://www.castaglia.org/proftpd/modules/mod_sftp_pam.html) -# LoadModule mod_sftp_pam.c -# -# Use SQL (via mod_sql) for looking up authorized SSH2 public keys for user -# and host based authentication -# (http://www.castaglia.org/proftpd/modules/mod_sftp_sql.html) -# LoadModule mod_sftp_sql.c -# -# Provide data transfer rate "shaping" across the entire server -# (http://www.castaglia.org/proftpd/modules/mod_shaper.html) -# LoadModule mod_shaper.c -# -# Support for miscellaneous SITE commands such as SITE MKDIR, SITE SYMLINK, -# and SITE UTIME (http://www.proftpd.org/docs/contrib/mod_site_misc.html) -# LoadModule mod_site_misc.c -# -# Provide an external SSL session cache using shared memory -# (contrib/mod_tls_shmcache.html) -# LoadModule mod_tls_shmcache.c -# -# Provide a memcached-based implementation of an external SSL session cache -# (contrib/mod_tls_memcache.html) -# LoadModule mod_tls_memcache.c -# -# Use the /etc/hosts.allow and /etc/hosts.deny files, or other allow/deny -# files, for IP-based access control -# (http://www.proftpd.org/docs/contrib/mod_wrap.html) -# LoadModule mod_wrap.c -# -# Use the /etc/hosts.allow and /etc/hosts.deny files, or other allow/deny -# files, as well as SQL-based access rules, for IP-based access control -# (http://www.proftpd.org/docs/contrib/mod_wrap2.html) -# LoadModule mod_wrap2.c -# -# Support module for mod_wrap2 that handles access rules stored in specially -# formatted files on disk -# (http://www.proftpd.org/docs/contrib/mod_wrap2_file.html) -# LoadModule mod_wrap2_file.c -# -# Support module for mod_wrap2 that handles access rules stored in SQL -# database tables (http://www.proftpd.org/docs/contrib/mod_wrap2_sql.html) -# LoadModule mod_wrap2_sql.c -# -# Implement a virtual chroot capability that does not require root privileges -# (http://www.castaglia.org/proftpd/modules/mod_vroot.html) -# Using this module rather than the kernel's chroot() system call works -# around issues with PAM and chroot (http://bugzilla.redhat.com/506735) -LoadModule mod_vroot.c -# -# Provide a flexible way of specifying that certain configuration directives -# only apply to certain sessions, based on credentials such as connection -# class, user, or group membership -# (http://www.proftpd.org/docs/contrib/mod_ifsession.html) -# LoadModule mod_ifsession.c - -# Allow only user root to load and unload modules, but allow everyone -# to see which modules have been loaded -# (http://www.proftpd.org/docs/modules/mod_dso.html#ModuleControlsACLs) -ModuleControlsACLs insmod,rmmod allow user root -ModuleControlsACLs lsmod allow user * - -# Enable basic controls via ftpdctl -# (http://www.proftpd.org/docs/modules/mod_ctrls.html) -ControlsEngine on -ControlsACLs all allow user root -ControlsSocketACL allow user * -ControlsLog /var/log/proftpd/controls.log - -# Enable admin controls via ftpdctl -# (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html) - - AdminControlsEngine on - AdminControlsACLs all allow user root - - -# Enable mod_vroot by default for better compatibility with PAM -# (http://bugzilla.redhat.com/506735) - - VRootEngine on - - -# TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html) - - TLSEngine on - TLSRequired on - TLSRSACertificateFile /etc/pki/tls/certs/proftpd.pem - TLSRSACertificateKeyFile /etc/pki/tls/certs/proftpd.pem - TLSCipherSuite ALL:!ADH:!DES - TLSOptions NoCertRequest - TLSVerifyClient off - #TLSRenegotiate ctrl 3600 data 512000 required off timeout 300 - TLSLog /var/log/proftpd/tls.log - - TLSSessionCache shm:/file=/var/run/proftpd/sesscache - - - -# Dynamic ban lists (http://www.proftpd.org/docs/contrib/mod_ban.html) -# Enable this with PROFTPD_OPTIONS=-DDYNAMIC_BAN_LISTS in /etc/sysconfig/proftpd - - LoadModule mod_ban.c - BanEngine on - BanLog /var/log/proftpd/ban.log - BanTable /var/run/proftpd/ban.tab - - # If the same client reaches the MaxLoginAttempts limit 2 times - # within 10 minutes, automatically add a ban for that client that - # will expire after one hour. - BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00 - - # Inform the user that it's not worth persisting - BanMessage "Host %a has been banned" - - # Allow the FTP admin to manually add/remove bans - BanControlsACLs all allow user ftpadm - - -# Set networking-specific "Quality of Service" (QoS) bits on the packets used -# by the server (contrib/mod_qos.html) - - LoadModule mod_qos.c - # RFC791 TOS parameter compatibility - QoSOptions dataqos throughput ctrlqos lowdelay - # For a DSCP environment (may require tweaking) - #QoSOptions dataqos CS2 ctrlqos AF41 - - -# Global Config - config common to Server Config and all virtual hosts -# See: http://www.proftpd.org/docs/howto/Vhost.html - - - # Umask 022 is a good standard umask to prevent new dirs and files - # from being group and world writable - Umask 077 - - # Allow users to overwrite files and change permissions - AllowOverwrite yes - - AllowAll - - -# CH-Root all users - DefaultRoot ~ -# Reject rootlogin (just for security) - RootLogin off -# Noo need to require valid shell, because user is virtual - RequireValidShell off - - -# A basic anonymous configuration, with an upload directory -# Enable this with PROFTPD_OPTIONS=-DANONYMOUS_FTP in /etc/sysconfig/proftpd - - # - #User ftp - #Group ftp - #AccessGrantMsg "Anonymous login ok, restrictions apply." - - ## We want clients to be able to login with "anonymous" as well as "ftp" - #UserAlias anonymous ftp - - ## Limit the maximum number of anonymous logins - #MaxClients 10 "Sorry, max %m users -- try again later" - - ## Put the user into /pub right after login - ##DefaultChdir /pub - - ## We want 'welcome.msg' displayed at login, '.message' displayed in - ## each newly chdired directory and tell users to read README* files. - #DisplayLogin /welcome.msg - #DisplayChdir .message - #DisplayReadme README* - - ## Cosmetic option to make all files appear to be owned by user "ftp" - #DirFakeUser on ftp - #DirFakeGroup on ftp - - ## Limit WRITE everywhere in the anonymous chroot - # - #DenyAll - # - - ## An upload directory that allows storing files but not retrieving - ## or creating directories. - # - #AllowOverwrite no - # - #DenyAll - # - - # - #AllowAll - # - # - - ## Don't write anonymous accesses to the system wtmp file (good idea!) - #WtmpLog off - - ## Logging for the anonymous transfers - #ExtendedLog /var/log/proftpd/access.log WRITE,READ default - #ExtendedLog /var/log/proftpd/auth.log AUTH auth - - # - - - - SQLLogFile /var/log/proftpd/sql.log - SQLAuthTypes Crypt - SQLAuthenticate users* groups* - SQLConnectInfo @ - SQLUserInfo ftp_users username password uid gid homedir shell - SQLGroupInfo ftp_groups groupname gid members - SQLUserWhereClause "login_enabled = 'y'" - - SQLLog PASS login - #SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - - SQLLog RETR download - #SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - - SQLLog STOR upload - #SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - #QuotaEngine on - #QuotaShowQuotas on - #QuotaDisplayUnits Mb - #QuotaLock /var/lock/ftpd.quotatab.lock - #QuotaLimitTable sql:/get-quota-limit - #QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally - #SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" - #SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" - #SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies - #SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies - diff --git a/templates/misc/configfiles/sle_10/courier/etc_authlib_authdaemonrc b/templates/misc/configfiles/sle_10/courier/etc_authlib_authdaemonrc deleted file mode 100644 index 428a68da..00000000 --- a/templates/misc/configfiles/sle_10/courier/etc_authlib_authdaemonrc +++ /dev/null @@ -1,103 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.13 2005/10/05 00:07:32 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authldap authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authcustom authcram authuserdb authldap authmysql authpam" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/run/authdaemon.courier-imap - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" - -##NAME: LDAP_TLS_OPTIONS:0 -# -# Options documented in ldap.conf(5) can be set here, prefixed with 'LDAP'. -# Examples: -# -#LDAPTLS_CACERT=/path/to/cacert.pem -#LDAPTLS_REQCERT=demand -#LDAPTLS_CERT=/path/to/clientcert.pem -#LDAPTLS_KEY=/path/to/clientkey.pem diff --git a/templates/misc/configfiles/sle_10/courier/etc_authlib_authmysqlrc b/templates/misc/configfiles/sle_10/courier/etc_authlib_authmysqlrc deleted file mode 100644 index 8e5eef90..00000000 --- a/templates/misc/configfiles/sle_10/courier/etc_authlib_authmysqlrc +++ /dev/null @@ -1,14 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 3306 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD uid -MYSQL_GID_FIELD gid -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD homedir -MYSQL_MAILDIR_FIELD maildir -MYSQL_QUOTA_FIELD (quota*1024*1024) -MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3) diff --git a/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor b/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor deleted file mode 100644 index ef6033d4..00000000 --- a/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the froxlor package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/sle_10/dkim/dkim-filter.conf b/templates/misc/configfiles/sle_10/dkim/dkim-filter.conf deleted file mode 100644 index 86cdb1b6..00000000 --- a/templates/misc/configfiles/sle_10/dkim/dkim-filter.conf +++ /dev/null @@ -1,3 +0,0 @@ -Syslog yes -Domain /etc/postfix/dkim/domains -KeyList /etc/postfix/dkim/dkim-keys.conf diff --git a/templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf deleted file mode 100644 index e915ceba..00000000 --- a/templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,66 +0,0 @@ -queue_directory = /var/spool/postfix -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -mail_owner = postfix -inet_interfaces = all -unknown_local_recipient_reject_code = 550 -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - xxgdb $daemon_directory/$process_name $process_id & sleep 5 -sendmail_path = /usr/sbin/sendmail -newaliases_path = /usr/bin/newaliases -mailq_path = /usr/bin/mailq -setgid_group = maildrop -html_directory = /usr/share/doc/packages/postfix/html -manpage_directory = /usr/share/man -sample_directory = /usr/share/doc/packages/postfix/samples -readme_directory = /usr/share/doc/packages/postfix/README_FILES -inet_protocols = all -biff = no -append_dot_mydomain = no -mail_spool_directory = /var/mail -canonical_maps = hash:/etc/postfix/canonical -virtual_mailbox_base = /var/kunden/mail/ -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_domains = -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: -virtual_maps = hash:/etc/postfix/virtual -relocated_maps = hash:/etc/postfix/relocated -transport_maps = hash:/etc/postfix/transport -sender_canonical_maps = hash:/etc/postfix/sender_canonical -masquerade_exceptions = root -masquerade_classes = envelope_sender, header_sender, header_recipient -myhostname = mail.$mydomain -mydomain = -program_directory = /usr/lib/postfix -masquerade_domains = -mydestination = $myhostname $mydomain localhost localhost.$mydomain -mynetworks = 127.0.0.0/8 -defer_transports = -disable_dns_lookups = no -relayhost = -mailbox_command = -mailbox_transport = -strict_8bitmime = no -disable_mime_output_conversion = no -smtpd_client_restrictions = -smtpd_helo_required = no -smtpd_helo_restrictions = -strict_rfc821_envelopes = no -smtpd_recipient_restrictions = permit_mynetworks permit_sasl_authenticated reject_unauth_destination -smtpd_relay_restrictions = -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes -#smtpd_use_tls = no -#smtp_use_tls = no -alias_maps = $alias_database -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 -message_size_limit = 10240000 \ No newline at end of file diff --git a/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index 090b6465..00000000 --- a/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index a962d086..00000000 --- a/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/sle_10/postfix/usr_lib_sasl2_smtpd.conf b/templates/misc/configfiles/sle_10/postfix/usr_lib_sasl2_smtpd.conf deleted file mode 100644 index 3d4dff60..00000000 --- a/templates/misc/configfiles/sle_10/postfix/usr_lib_sasl2_smtpd.conf +++ /dev/null @@ -1,9 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -mech_list: plain login cram-md5 digest-md5 -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: select password from mail_users where username='%u@%r' diff --git a/templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_main.cf deleted file mode 100644 index 82b23a03..00000000 --- a/templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_main.cf +++ /dev/null @@ -1,25 +0,0 @@ -# -# ATTENTION - this is not the full postfix-main.cf file -# -# it only provides additional configuration-entries! -# - -# -# look for the follow statement -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient - -# -# and extend it with the following line -# so it looks like this -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient, - check_recipient_mx_access cidr:/etc/postfix/mx_access diff --git a/templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_mx_access deleted file mode 100644 index 18a1ec5f..00000000 --- a/templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_mx_access +++ /dev/null @@ -1,9 +0,0 @@ -0.0.0.0/8 REJECT Domain MX in broadcast network -10.0.0.0/8 REJECT Domain MX in RFC 1918 private network -169.254.0.0/16 REJECT Domain MX in link local network -172.16.0.0/12 REJECT Domain MX in RFC 1918 private network -192.0.2.0/24 REJECT Domain MX in TEST-NET network -192.168.0.0/16 REJECT Domain MX in RFC 1918 private network -224.0.0.0/4 REJECT Domain MX in class D multicast network -240.0.0.0/5 REJECT Domain MX in class E reserved network -248.0.0.0/5 REJECT Domain MX in reserved network diff --git a/templates/misc/configfiles/sle_10/proftpd/etc_proftpd_modules.conf b/templates/misc/configfiles/sle_10/proftpd/etc_proftpd_modules.conf deleted file mode 100644 index abf2ecd2..00000000 --- a/templates/misc/configfiles/sle_10/proftpd/etc_proftpd_modules.conf +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is used to manage DSO modules and features. -# - -# This is the directory where DSO modules resides - -ModulePath /usr/lib/proftpd - -# Allow only user root to load and unload modules, but allow everyone -# to see which modules have been loaded - -ModuleControlsACLs insmod,rmmod allow user root -ModuleControlsACLs lsmod allow user * - -#LoadModule mod_ctrls_admin.c -LoadModule mod_tls.c -LoadModule mod_sql.c -#LoadModule mod_ldap.c -LoadModule mod_sql_mysql.c -#LoadModule mod_sql_postgres.c -LoadModule mod_quotatab.c -#LoadModule mod_quotatab_file.c -#LoadModule mod_quotatab_ldap.c -LoadModule mod_quotatab_sql.c -#LoadModule mod_radius.c -LoadModule mod_wrap.c -LoadModule mod_rewrite.c - -# keep this module the last one -LoadModule mod_ifsession.c diff --git a/templates/misc/configfiles/sle_10/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/sle_10/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index ffb69691..00000000 --- a/templates/misc/configfiles/sle_10/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,84 +0,0 @@ -Include /etc/proftpd/modules.conf - -ServerName " FTP Server" -ServerType standalone -DeferWelcome off - -MultilineRFC2228 on -DefaultServer on -ShowSymlinks on -AllowOverwrite on - -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 1200 - -DisplayLogin welcome.msg -DisplayChdir .message -ListOptions "-l" - -DenyFilter \*.*/ - -Port 21 -MaxInstances 30 -UseIPv6 off - -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - -# Allow up- and downloads to be continued -AllowRetrieveRestart On -AllowStoreRestart On - -# make proftpd faster / do not perform ident and reverse dns lookup -UseReverseDNS off - -# Set the user and group that the server normally runs at. -User nobody -Group nogroup - - -# Umask 022 is a good standard umask to prevent new files and dirs -# (second parm) from being group and world writable. - Umask 022 022 -# Normally, we want files to be overwriteable. - AllowOverwrite on - - - -# CH-Root all users -DefaultRoot ~ -# Reject rootlogin (just for security) -RootLogin off -# Noo need to require valid shell, because user is virtual -RequireValidShell off - - -AuthOrder mod_sql.c - -SQLAuthTypes Crypt Plaintext -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -QuotaEngine on -QuotaShowQuotas on -QuotaDisplayUnits Mb -QuotaLock /var/lock/ftpd.quotatab.lock -QuotaLimitTable sql:/get-quota-limit -QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally -SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" -SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" -SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies -SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies diff --git a/templates/misc/configfiles/ubuntu_lucid/apache2/etc_apache2_mods-enabled_fastcgi.conf b/templates/misc/configfiles/ubuntu_lucid/apache2/etc_apache2_mods-enabled_fastcgi.conf deleted file mode 100644 index db1a4557..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/apache2/etc_apache2_mods-enabled_fastcgi.conf +++ /dev/null @@ -1,10 +0,0 @@ - - FastCgiIpcDir - - - Order Deny,Allow - Deny from All - # Prevent accessing this path directly - Allow from env=REDIRECT_STATUS - - diff --git a/templates/misc/configfiles/ubuntu_lucid/courier/etc_courier_authdaemonrc b/templates/misc/configfiles/ubuntu_lucid/courier/etc_courier_authdaemonrc deleted file mode 100644 index 29346e54..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/courier/etc_courier_authdaemonrc +++ /dev/null @@ -1,68 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $ -# -# Copyright 2000-2001 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:0 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authcustom authcram authuserdb authldap authmysql authpam - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:1 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authcustom authcram authuserdb authldap authmysql authpam" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: version:0 -# -# When you have multiple versions of authdaemond.* installed, authdaemond -# just picks the first one it finds. Set "version" to override that. -# For example: version=authdaemond.plain - -version="" - -##NAME: authdaemonvar:0 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/run/courier/authdaemon diff --git a/templates/misc/configfiles/ubuntu_lucid/courier/etc_courier_authmysqlrc b/templates/misc/configfiles/ubuntu_lucid/courier/etc_courier_authmysqlrc deleted file mode 100644 index 8e5eef90..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/courier/etc_courier_authmysqlrc +++ /dev/null @@ -1,14 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 3306 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD uid -MYSQL_GID_FIELD gid -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD homedir -MYSQL_MAILDIR_FIELD maildir -MYSQL_QUOTA_FIELD (quota*1024*1024) -MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3) diff --git a/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor deleted file mode 100644 index ef6033d4..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the froxlor package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/ubuntu_lucid/dkim/dkim-filter.conf b/templates/misc/configfiles/ubuntu_lucid/dkim/dkim-filter.conf deleted file mode 100644 index 92ff0946..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/dkim/dkim-filter.conf +++ /dev/null @@ -1,11 +0,0 @@ -# -# !!! DO NOT REPLACE THE ORIGINAL CONFIG WITH THIS FILE !!! -# -# Instead, just set the shown values in the file to the -# given values ;-) -# - -Syslog yes -Domain /etc/postfix/dkim/domains -KeyList /etc/postfix/dkim/dkim-keys.conf -Socket inet:8891@localhost diff --git a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_auth.d_01-dovecot-postfix.auth b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_auth.d_01-dovecot-postfix.auth deleted file mode 100644 index 78ac2f5b..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_auth.d_01-dovecot-postfix.auth +++ /dev/null @@ -1,28 +0,0 @@ -mechanisms = plain login -socket listen { - client { - path = /var/spool/postfix/private/dovecot-auth - mode = 0660 - user = postfix - group = postfix - } - master { - path = /var/run/dovecot/auth-master - mode = 0660 - user = vmail - group = vmail - } -} - -passdb sql { - args = /etc/dovecot/dovecot-sql.conf -} - -userdb prefetch { -} - -userdb sql { - args = /etc/dovecot/dovecot-sql.conf -} - -user = vmail \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf deleted file mode 100644 index 766f349d..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf +++ /dev/null @@ -1,58 +0,0 @@ -# Some general options -protocols = imap pop3 -mail_access_groups = vmail -## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS -disable_plaintext_auth = no -ssl = yes -ssl_cert_file = /etc/ssl/certs/ssl-mail.pem -ssl_key_file = /etc/ssl/private/ssl-mail.key -ssl_cipher_list = ALL:!LOW:!SSLv2:ALL:!aNULL:!ADH:!eNULL:!EXP:RC4+RSA:+HIGH:+MEDIUM -mail_location = maildir:~/Maildir -auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ - -# IMAP configuration -protocol imap { - mail_plugins = quota imap_quota - mail_max_userip_connections = 10 - imap_client_workarounds = outlook-idle delay-newmail - - # IMAP logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - imap_logout_format = in=%i out=%o -} - -# POP3 configuration -protocol pop3 { - mail_max_userip_connections = 10 - pop3_client_workarounds = outlook-no-nuls oe-ns-eoh - pop3_uidl_format = UID%u-%v - mail_plugins = quota - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s -} - -# LDA configuration -protocol lda { - # postmaster is the one in charge of the mail system. MUST be set to a valid address! - postmaster_address = postmaster@ - mail_plugins = quota - deliver_log_format = msgid=%m: %$ - rejection_reason = Your message to <%t> was automatically rejected:%n%r -} - -# Plugins configuration -plugin { - quota = maildir -} diff --git a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf deleted file mode 100644 index d1685ba8..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf +++ /dev/null @@ -1,6 +0,0 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve') -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') - diff --git a/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul b/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul deleted file mode 100644 index 93bf877e..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul +++ /dev/null @@ -1,125 +0,0 @@ -### acl/30_exim4-config_check_rcpt -################################# - -acl_check_rcpt: - accept - hosts = : - - warn - hosts = +relay_from_hosts - control = submission/sender_retain - - .ifdef CHECK_RCPT_LOCAL_LOCALPARTS - deny - domains = +local_domains:+froxlor_domain - local_parts = CHECK_RCPT_LOCAL_LOCALPARTS - message = restricted characters in address - .endif - - .ifdef CHECK_RCPT_REMOTE_LOCALPARTS - deny - domains = !+local_domains - local_parts = CHECK_RCPT_REMOTE_LOCALPARTS - message = restricted characters in address - .endif - - accept - .ifndef CHECK_RCPT_POSTMASTER - local_parts = postmaster - .else - local_parts = CHECK_RCPT_POSTMASTER - .endif - domains = +local_domains:+froxlor_domain - - deny - message = sender envelope address $sender_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_local_deny_exceptions - senders = ${if exists{CONFDIR/local_sender_blacklist}\ - {CONFDIR/local_sender_blacklist}\ - {}} - - deny - message = sender IP address $sender_host_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_local_deny_exceptions - hosts = ${if exists{CONFDIR/local_host_blacklist}\ - {CONFDIR/local_host_blacklist}\ - {}} - - .ifdef CHECK_RCPT_VERIFY_SENDER - deny - message = Sender verification failed - !acl = acl_local_deny_exceptions - !verify = sender - .endif - - deny - !acl = acl_local_deny_exceptions - senders = ${if exists{CONFDIR/local_sender_callout}\ - {CONFDIR/local_sender_callout}\ - {}} - !verify = sender/callout - - deny - !acl = acl_local_deny_exceptions - recipients = ${if exists{CONFDIR/local_rcpt_callout}\ - {CONFDIR/local_rcpt_callout}\ - {}} - !verify = recipient/callout - - .ifdef CHECK_RCPT_REVERSE_DNS - warn - message = X-Host-Lookup-Failed: Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}}) - condition = ${if and{{def:sender_host_address}{!def:sender_host_name}}\ - {yes}{no}} - .endif - - .ifdef CHECK_RCPT_IP_DNSBLS - warn - message = X-Warning: $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - dnslists = CHECK_RCPT_IP_DNSBLS - .endif - - .ifdef CHECK_RCPT_DOMAIN_DNSBLS - warn - message = X-Warning: $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - !senders = ${if exists{CONFDIR/local_domain_dnsbl_whitelist}\ - {CONFDIR/local_domain_dnsbl_whitelist}\ - {}} - dnslists = CHECK_RCPT_DOMAIN_DNSBLS/$sender_address_domain - .endif - - .ifdef CHECK_RCPT_LOCAL_ACL_FILE - .include CHECK_RCPT_LOCAL_ACL_FILE - .endif - - accept - domains = +local_domains:+froxlor_domain - endpass - message = unknown user - verify = recipient - - accept - domains = +relay_to_domains - endpass - .ifdef CHECK_RCPT_GIVE_UNKNOWN_USER - message = ${if eq{$acl_verify_message}{Unrouteable address}{unknown user}{$acl_verify_message}} - .else - message = unrouteable address - .endif - verify = recipient - - ############ - # If control reaches this point, the domain is neither in +local_domains - # nor in +relay_to_domains. - ############ - - accept - hosts = +relay_from_hosts - - accept - authenticated = * - - deny - message = relay not permitted \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_auth_30_froxlor-config b/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_auth_30_froxlor-config deleted file mode 100644 index b0b13de8..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_auth_30_froxlor-config +++ /dev/null @@ -1,30 +0,0 @@ -### auth/30_froxlor-config -################################# - -plain_server: - driver = plaintext - public_name = PLAIN - server_condition = "${if and { \ - {!eq{$2}{}} \ - {!eq{$3}{}} \ - {crypteq{$3}{${lookup mysql{FROXLOR_AUTH_PLAIN}{$value}fail}}} \ - } {yes}{no}}" - server_set_id = $2 - server_prompts = : -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} -# .endif - -login_server: - driver = plaintext - public_name = LOGIN - server_prompts = "Username:: : Password::" - server_condition = "${if and { \ - {!eq{$1}{}} \ - {!eq{$2}{}} \ - {crypteq{$2}{${lookup mysql{FROXLOR_AUTH_LOGIN}{$value}fail}}} \ - } {yes}{no}}" - server_set_id = $1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} -# .endif \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_main_10_froxlor-config_options b/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_main_10_froxlor-config_options deleted file mode 100644 index 8a070db6..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_main_10_froxlor-config_options +++ /dev/null @@ -1,20 +0,0 @@ -hide mysql_servers = /// - -FROXLOR_LOCAL_DOMAIN = SELECT domain FROM panel_domains WHERE domain = '${quote_mysql:$domain}' AND isemaildomain = '1' - -FROXLOR_MAILALIAS = SELECT REPLACE(destination,' ',',') FROM mail_virtual WHERE \ - (( email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' ) \ - OR ( email = '@${quote_mysql:$domain}' AND iscatchall > 0 )) \ - AND destination <> '' AND destination <> ' ' ORDER BY iscatchall ASC LIMIT 1 - -FROXLOR_MAILUSER = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE \ - email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' AND postfix = 'y' - -FROXLOR_PARENT_DOMAIN = SELECT parent.domain FROM `panel_domains` AS parent INNER JOIN panel_domains AS alias \ - ON alias.domain = '${quote_mysql:$domain}' AND parent.id = alias.aliasdomain - -FROXLOR_AUTH_PLAIN = SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$2}' - -FROXLOR_AUTH_LOGIN = SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$1}' - -domainlist froxlor_domain = mysql;FROXLOR_LOCAL_DOMAIN \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_router_180_froxlor-config b/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_router_180_froxlor-config deleted file mode 100644 index dbb6a020..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_router_180_froxlor-config +++ /dev/null @@ -1,13 +0,0 @@ -froxlor_mailalias: - debug_print = "R: froxlor_mailalias for $local_part@$domain" - driver = redirect - domains = +froxlor_domain - data = ${lookup mysql {FROXLOR_MAILALIAS}{$value}fail} - -froxlor_mailuser: - debug_print = "R: froxlor_mailuser for $local_part@$domain" - driver = redirect - domains = +froxlor_domain - data = ${lookup mysql {FROXLOR_MAILUSER}{$value}fail} - directory_transport = maildir_froxlor - no_more \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_transport_30_froxlor-config b/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_transport_30_froxlor-config deleted file mode 100644 index 6f00c2f7..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/exim4/etc_exim4_conf.d_transport_30_froxlor-config +++ /dev/null @@ -1,13 +0,0 @@ -maildir_froxlor: - debug_print = "T: maildir_froxlor for $local_part@$domain" - driver = appendfile - create_directory - delivery_date_add - envelope_to_add - return_path_add - maildir_format - directory_mode = 0770 - mode = 0660 - mode_fail_narrower = false - user = 2000 - group = 2000 \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql-root.conf b/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql-root.conf deleted file mode 100644 index 3c880f47..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql-root.conf +++ /dev/null @@ -1,16 +0,0 @@ -conf.version = 2; -shadow.host = inet::3306; -shadow.database = ; -shadow.db_user = ; -shadow.db_password = ; -shadow.table = ftp_users u; -shadow.where_clause = ; -shadow.userid_column = u.customerid; -shadow.user_column = u.username; -shadow.password_column = u.password; -shadow.lastchange_column = FLOOR(UNIX_TIMESTAMP()/86400-1); -shadow.min_column = 0; -shadow.max_column = 99999; -shadow.warn_column = 7; -shadow.inact_column = -1; -shadow.expire_column = -1; diff --git a/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql.conf b/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql.conf deleted file mode 100644 index 26dd9928..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql.conf +++ /dev/null @@ -1,24 +0,0 @@ -conf.version = 2; -users.host = inet::3306; -users.database = ; -users.db_user = ; -users.db_password = ; -users.table = ftp_users u; -users.where_clause = u.login_enabled = 'Y'; -users.user_column = u.username; -users.password_column = u.password; -users.userid_column = u.customerid; -users.uid_column = u.uid; -users.gid_column = u.gid; -users.realname_column = u.username; -users.homedir_column = u.homedir; -users.shell_column = u.shell; -groups.group_info_table = ftp_groups g; -groups.where_clause = ; -groups.group_name_column = g.groupname; -groups.groupid_column = g.id; -groups.gid_column = g.gid; -groups.password_column = "x"; -groups.members_table = ftp_groups ug; -groups.member_userid_column = ug.customerid; -groups.member_groupid_column = ug.id; diff --git a/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nsswitch.conf b/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nsswitch.conf deleted file mode 100644 index 22a74dda..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nsswitch.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Make sure that `passwd`, `group` and `shadow` have mysql in their lines -# You should place mysql at the end, so that it is queried after the other mechanisams -# -passwd: compat mysql -group: compat mysql -shadow: compat mysql - -hosts: files dns -networks: files dns - -services: db files -protocols: db files -rpc: db files -ethers: db files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_lucid/lighttpd/etc_lighttpd.conf b/templates/misc/configfiles/ubuntu_lucid/lighttpd/etc_lighttpd.conf deleted file mode 100644 index 14e7e42f..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/lighttpd/etc_lighttpd.conf +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# Default lighttpd.conf for Froxlor. -############################################################################### -var.basedir = "/var/www" -var.logdir = "/var/log/lighttpd" -var.statedir = "/var/lib/lighttpd" - -server.modules = ( - "mod_rewrite", - "mod_redirect", - "mod_alias", - "mod_access", - "mod_auth", - "mod_fastcgi", - "mod_cgi", - "mod_accesslog" -) - -server.username = "www-data" -server.groupname = "www-data" -server.document-root = var.basedir -server.pid-file = "/var/run/lighttpd.pid" -accesslog.filename = var.logdir + "/access.log" -server.errorlog = var.logdir + "/error.log" - -server.indexfiles = ("index.php", "index.html", - "index.htm", "default.htm") - -server.name = "" -server.port = 80 -server.bind = "" -url.access-deny = ("~", ".inc") - -fastcgi.server = ( -".php" => ( - "localhost" => ( - "socket" => "/tmp/lighttpd-fcgi-sock-lighttpd", - "broken-scriptfilename" => "enable", - "bin-path" => "/usr/bin/php5-cgi", - "min-procs" => 1, - "max-procs" => 1, - "max-load-per-proc" => 4, - "idle-timeout" => 60, - "bin-environment" => ( - "UID" => "www-data", - "GID" => "www-data", - "PHP_FCGI_CHILDREN" => "0", - "PHP_FCGI_MAX_REQUESTS" => "10000" - ), - "bin-copy-environment" => ( "" ) - ) - ) -) - -#### external configuration files -## mimetype mapping -include_shell "/usr/share/lighttpd/create-mime.assign.pl" diff --git a/templates/misc/configfiles/ubuntu_lucid/logrotate/etc_logrotated_froxlor b/templates/misc/configfiles/ubuntu_lucid/logrotate/etc_logrotated_froxlor deleted file mode 100644 index d7f7deeb..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/logrotate/etc_logrotated_froxlor +++ /dev/null @@ -1,16 +0,0 @@ -# -# Froxlor logrotate snipet -# -*.log { - missingok - weekly - rotate 4 - compress - delaycompress - notifempty - create - sharedscripts - postrotate - > /dev/null 2>&1 || true - endscript -} diff --git a/templates/misc/configfiles/ubuntu_lucid/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/ubuntu_lucid/nginx/etc_init.d_php-fcgi deleted file mode 100644 index 29e0cc4a..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/nginx/etc_init.d_php-fcgi +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -BIND="127.0.0.1:8888" -USER="www-data" -PHP_FCGI_CHILDREN="15" -PHP_FCGI_MAX_REQUESTS="1000" - -PHP_CGI="/usr/bin/php-cgi" -PHP_CGI_NAME="$(basename ${PHP_CGI})" -PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}" -RETVAL="0" - -start() { - echo -n "Starting PHP FastCGI: " - start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $PHP_CGI_ARGS - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} -stop() { - echo -n "Stopping PHP FastCGI: " - killall -q -w -u ${USER} ${PHP_CGI} - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "Usage: php-fastcgi {start|stop|restart}" - exit 1 - ;; -esac -exit "$RETVAL" diff --git a/templates/misc/configfiles/ubuntu_lucid/nginx/etc_nginx_fastcgi.conf b/templates/misc/configfiles/ubuntu_lucid/nginx/etc_nginx_fastcgi.conf deleted file mode 100644 index 10bcaba4..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/nginx/etc_nginx_fastcgi.conf +++ /dev/null @@ -1,15 +0,0 @@ -fastcgi_param GATEWAY_INTERFACE CGI/1.1; -fastcgi_param SERVER_SOFTWARE nginx; -fastcgi_param QUERY_STRING $query_string; -fastcgi_param REQUEST_METHOD $request_method; -fastcgi_param CONTENT_TYPE $content_type; -fastcgi_param CONTENT_LENGTH $content_length; -fastcgi_param REQUEST_URI $request_uri; -fastcgi_param DOCUMENT_URI $document_uri; -fastcgi_param DOCUMENT_ROOT $document_root; -fastcgi_param SERVER_PROTOCOL $server_protocol; -fastcgi_param REMOTE_ADDR $remote_addr; -fastcgi_param REMOTE_PORT $remote_port; -fastcgi_param SERVER_ADDR $server_addr; -fastcgi_param SERVER_PORT $server_port; -fastcgi_param SERVER_NAME $server_name; diff --git a/templates/misc/configfiles/ubuntu_lucid/nginx/etc_nginx_nginx.conf b/templates/misc/configfiles/ubuntu_lucid/nginx/etc_nginx_nginx.conf deleted file mode 100644 index a3f22ed0..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/nginx/etc_nginx_nginx.conf +++ /dev/null @@ -1,26 +0,0 @@ -user www-data; -worker_processes 4; - -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - access_log /var/log/nginx/access.log; - - sendfile on; - tcp_nodelay on; - - keepalive_timeout 65; - - gzip on; - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; -} - diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf deleted file mode 100644 index 7bf3b4be..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf +++ /dev/null @@ -1,85 +0,0 @@ -## General Postfix configuration -# should be the default domain from your provider eg. "server100.provider.tld" -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes - -# Virtual delivery settings -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = $smtpd_tls_cert_file -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c0a12256..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index dfef131e..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_sasl_smtpd.conf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_sasl_smtpd.conf deleted file mode 100644 index de3699d8..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_sasl_smtpd.conf +++ /dev/null @@ -1,11 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: plain login cram-md5 digest-md5 -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: SELECT password FROM mail_users WHERE username='%u@%r' OR email='%u@%r' \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf deleted file mode 100644 index 961e0ee2..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf +++ /dev/null @@ -1,91 +0,0 @@ -## General Postfix configuration -# should be the default domain from your provider eg. "server100.provider.tld" -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes -## Dovecot Settings for deliver, SASL Auth and virtual transport -smtpd_sasl_type = dovecot -mailbox_command = /usr/lib/dovecot/deliver -virtual_transport = dovecot -dovecot_destination_recipient_limit = 1 -smtpd_sasl_path = private/dovecot-auth - -# Virtual delivery settings -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = $smtpd_tls_cert_file -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_master.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_master.cf deleted file mode 100644 index f613a782..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_master.cf +++ /dev/null @@ -1,4 +0,0 @@ -# Add this lines to be able to use dovecot as delivery agent -# Dovecot LDA -dovecot unix - n n - - pipe - flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -c /etc/dovecot/conf.d/01-dovecot-postfix.conf -d ${recipient} diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index 090b6465..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index a962d086..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_mxaccess/etc_postfix_main.cf deleted file mode 100644 index 82b23a03..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_mxaccess/etc_postfix_main.cf +++ /dev/null @@ -1,25 +0,0 @@ -# -# ATTENTION - this is not the full postfix-main.cf file -# -# it only provides additional configuration-entries! -# - -# -# look for the follow statement -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient - -# -# and extend it with the following line -# so it looks like this -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient, - check_recipient_mx_access cidr:/etc/postfix/mx_access diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/ubuntu_lucid/postfix_mxaccess/etc_postfix_mx_access deleted file mode 100644 index 18a1ec5f..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_mxaccess/etc_postfix_mx_access +++ /dev/null @@ -1,9 +0,0 @@ -0.0.0.0/8 REJECT Domain MX in broadcast network -10.0.0.0/8 REJECT Domain MX in RFC 1918 private network -169.254.0.0/16 REJECT Domain MX in link local network -172.16.0.0/12 REJECT Domain MX in RFC 1918 private network -192.0.2.0/24 REJECT Domain MX in TEST-NET network -192.168.0.0/16 REJECT Domain MX in RFC 1918 private network -224.0.0.0/4 REJECT Domain MX in class D multicast network -240.0.0.0/5 REJECT Domain MX in class E reserved network -248.0.0.0/5 REJECT Domain MX in reserved network diff --git a/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns-froxlor.conf b/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns-froxlor.conf deleted file mode 100644 index 5e12377d..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns-froxlor.conf +++ /dev/null @@ -1,7 +0,0 @@ -allow-axfr-ips= -#local-ipv6=YOUR_IPv6_(if_any) -bind-config=named.conf -bind-check-interval=180 -log-dns-details=yes -local-address=,127.0.0.1 - diff --git a/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns.conf b/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns.conf deleted file mode 100644 index 56d4b2a0..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/powerdns/etc_powerdns_pdns.conf +++ /dev/null @@ -1,17 +0,0 @@ -allow-recursion=127.0.0.1 -config-dir=/etc/powerdns -daemon=yes -guardian=yes -launch=bind -lazy-recursion=yes -local-port=53 -master=yes -module-dir=/usr/lib/powerdns -setgid=pdns -setuid=pdns -socket-dir=/var/run -version-string=powerdns -bind-config=named.conf -bind-check-interval=300 -include=/etc/powerdns/pdns_froxlor.conf - diff --git a/templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_modules.conf b/templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_modules.conf deleted file mode 100644 index da6fb9c6..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_modules.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# This file is used to manage DSO modules and features. -# - -# This is the directory where DSO modules reside - -ModulePath /usr/lib/proftpd - -# Allow only user root to load and unload modules, but allow everyone -# to see which modules have been loaded - -ModuleControlsACLs insmod,rmmod allow user root -ModuleControlsACLs lsmod allow user * - -LoadModule mod_ctrls_admin.c -LoadModule mod_tls.c - -# Install proftpd-mod-mysql or proftpd-mod-pgsql to use this -LoadModule mod_sql.c - -# Install proftpd-mod-ldap to use this -#LoadModule mod_ldap.c - -# -# 'SQLBackend mysql' or 'SQLBackend postgres' directives are required -# to have SQL authorization working. You can also comment out the -# unused module here, in alternative. -# - -# Install proftpd-mod-mysql to use this -LoadModule mod_sql_mysql.c - -# Install proftpd-mod-pgsql to use this -#LoadModule mod_sql_postgres.c - -#LoadModule mod_radius.c -LoadModule mod_quotatab.c -LoadModule mod_quotatab_file.c - -# Install proftpd-mod-ldap to use this -#LoadModule mod_quotatab_ldap.c - -# Install proftpd-mod-pgsql or proftpd-mod-mysql to use this -LoadModule mod_quotatab_sql.c -LoadModule mod_quotatab_radius.c -LoadModule mod_wrap.c -LoadModule mod_rewrite.c -LoadModule mod_load.c -LoadModule mod_ban.c -LoadModule mod_wrap2.c -LoadModule mod_wrap2_file.c -# Install proftpd-mod-pgsql or proftpd-mod-mysql to use this -#LoadModule mod_wrap2_sql.c -LoadModule mod_dynmasq.c - - -# keep this module the last one -LoadModule mod_ifsession.c diff --git a/templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index d50330c4..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,131 +0,0 @@ -# -# /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file. -# To really apply changes reload proftpd after modifications. -# - -# Includes DSO modules -Include /etc/proftpd/modules.conf - -# Set off to disable IPv6 support which is annoying on IPv4 only boxes. -UseIPv6 on - -ServerName " FTP Server" -ServerType standalone -DeferWelcome off - -MultilineRFC2228 on -DefaultServer on -ShowSymlinks on - -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 1200 - -DisplayLogin welcome.msg -DisplayChdir .message true -ListOptions "-l" - -DenyFilter \*.*/ - -# Use this to jail all users in their homes -# DefaultRoot ~ - -# Users require a valid shell listed in /etc/shells to login. -# Use this directive to release that constrain. -# RequireValidShell off - -# Port 21 is the standard FTP port. -Port 21 - -# In some cases you have to specify passive ports range to by-pass -# firewall limitations. Ephemeral ports can be used for that, but -# feel free to use a more narrow range. -# PassivePorts 49152 65534 - -# If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public -# address and opening the passive ports used on your firewall as well. -# MasqueradeAddress 1.2.3.4 - -# This is useful for masquerading address with dynamic IPs: -# refresh any configured MasqueradeAddress directives every 8 hours - -# DynMasqRefresh 28800 - - -# To prevent DoS attacks, set the maximum number of child processes -# to 30. If you need to allow more than 30 concurrent connections -# at once, simply increase this value. Note that this ONLY works -# in standalone mode, in inetd mode you should use an inetd server -# that allows you to limit maximum number of processes per service -# (such as xinetd) -MaxInstances 30 - -# Set the user and group that the server normally runs at. -User proftpd -Group nogroup - -# Umask 022 is a good standard umask to prevent new files and dirs -# (second parm) from being group and world writable. -Umask 022 022 -# Normally, we want files to be overwriteable. -AllowOverwrite on - -# Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: -# PersistentPasswd off - -# This is required to use both PAM-based authentication and local passwords -# AuthOrder mod_auth_pam.c* mod_auth_unix.c - -# Be warned: use of this directive impacts CPU average load! -# Uncomment this if you like to see progress and transfer rate with ftpwho -# in downloads. That is not needed for uploads rates. -# -# UseSendFile off - -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - -# Allow up- and downloads to be continued -AllowRetrieveRestart On -AllowStoreRestart On - - -QuotaEngine on - - - -Ratios off - - - -# Delay engine reduces impact of the so-called Timing Attack described in -# http://security.lss.hr/index.php?page=details&ID=LSS-2004-10-02 -# It is on by default. - -DelayEngine off - - - -ControlsEngine off -ControlsMaxClients 2 -ControlsLog /var/log/proftpd/controls.log -ControlsInterval 5 -ControlsSocket /var/run/proftpd/proftpd.sock - - - -AdminControlsEngine off - - -# -# Alternative authentication frameworks -# -#Include /etc/proftpd/ldap.conf -Include /etc/proftpd/sql.conf - -# -# This is used for FTPS connections -# -#Include /etc/proftpd/tls.conf - diff --git a/templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_sql.conf b/templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_sql.conf deleted file mode 100644 index d05bdb3f..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/proftpd/etc_proftpd_sql.conf +++ /dev/null @@ -1,37 +0,0 @@ - -DefaultRoot ~ -RequireValidShell off -AuthOrder mod_sql.c - -SQLBackend mysql -SQLEngine on -SQLAuthenticate on - -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -QuotaEngine on -QuotaShowQuotas on -QuotaDisplayUnits Mb -QuotaLock /var/lock/ftpd.quotatab.lock -QuotaLimitTable sql:/get-quota-limit -QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally -SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" -SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" -SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies -SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies - - diff --git a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_default_pure-ftpd-common b/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_default_pure-ftpd-common deleted file mode 100644 index b2653904..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_default_pure-ftpd-common +++ /dev/null @@ -1,5 +0,0 @@ -STANDALONE_OR_INETD=standalone -VIRTUALCHROOT=false -UPLOADSCRIPT= -UPLOADUID= -UPLOADGID= diff --git a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_Bind b/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_Bind deleted file mode 100644 index aabe6ec3..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_Bind +++ /dev/null @@ -1 +0,0 @@ -21 diff --git a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone b/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone deleted file mode 100644 index 7cfab5b0..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_CustomerProof b/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_CustomerProof deleted file mode 100644 index d00491fd..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_CustomerProof +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime b/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime deleted file mode 100644 index 60d3b2f4..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime +++ /dev/null @@ -1 +0,0 @@ -15 diff --git a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MinUID b/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MinUID deleted file mode 100644 index 83b33d23..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MinUID +++ /dev/null @@ -1 +0,0 @@ -1000 diff --git a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile b/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile deleted file mode 100644 index be85bafe..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile +++ /dev/null @@ -1 +0,0 @@ -/etc/pure-ftpd/db/mysql.conf diff --git a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous b/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous deleted file mode 100644 index 7cfab5b0..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication b/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication deleted file mode 100644 index 7ecb56eb..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication +++ /dev/null @@ -1 +0,0 @@ -no diff --git a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_db_mysql.conf b/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_db_mysql.conf deleted file mode 100644 index 22ecee5c..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/pure-ftpd/etc_pure-ftpd_db_mysql.conf +++ /dev/null @@ -1,11 +0,0 @@ -MYSQLServer -MYSQLUser -MYSQLPassword -MYSQLDatabase -MYSQLCrypt any - -MYSQLGetPW SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetUID SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetGID SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y" -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) diff --git a/templates/misc/configfiles/ubuntu_precise/apache2/etc_apache2_mods-enabled_fastcgi.conf b/templates/misc/configfiles/ubuntu_precise/apache2/etc_apache2_mods-enabled_fastcgi.conf deleted file mode 100644 index db1a4557..00000000 --- a/templates/misc/configfiles/ubuntu_precise/apache2/etc_apache2_mods-enabled_fastcgi.conf +++ /dev/null @@ -1,10 +0,0 @@ - - FastCgiIpcDir - - - Order Deny,Allow - Deny from All - # Prevent accessing this path directly - Allow from env=REDIRECT_STATUS - - diff --git a/templates/misc/configfiles/ubuntu_precise/courier/etc_courier_authdaemonrc b/templates/misc/configfiles/ubuntu_precise/courier/etc_courier_authdaemonrc deleted file mode 100644 index 29346e54..00000000 --- a/templates/misc/configfiles/ubuntu_precise/courier/etc_courier_authdaemonrc +++ /dev/null @@ -1,68 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $ -# -# Copyright 2000-2001 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:0 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authcustom authcram authuserdb authldap authmysql authpam - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:1 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authcustom authcram authuserdb authldap authmysql authpam" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: version:0 -# -# When you have multiple versions of authdaemond.* installed, authdaemond -# just picks the first one it finds. Set "version" to override that. -# For example: version=authdaemond.plain - -version="" - -##NAME: authdaemonvar:0 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/run/courier/authdaemon diff --git a/templates/misc/configfiles/ubuntu_precise/courier/etc_courier_authmysqlrc b/templates/misc/configfiles/ubuntu_precise/courier/etc_courier_authmysqlrc deleted file mode 100644 index 8e5eef90..00000000 --- a/templates/misc/configfiles/ubuntu_precise/courier/etc_courier_authmysqlrc +++ /dev/null @@ -1,14 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 3306 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD uid -MYSQL_GID_FIELD gid -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD homedir -MYSQL_MAILDIR_FIELD maildir -MYSQL_QUOTA_FIELD (quota*1024*1024) -MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3) diff --git a/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor deleted file mode 100644 index ef6033d4..00000000 --- a/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the froxlor package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf b/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf deleted file mode 100644 index 1aa2fb8d..00000000 --- a/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf +++ /dev/null @@ -1,83 +0,0 @@ -# Some general options -protocols = imap pop3 sieve -disable_plaintext_auth = no -ssl = yes -ssl_cert = - mail_plugins = sieve quota - quota_full_tempfail = yes - deliver_log_format = msgid=%m: %$ - rejection_reason = Your message to <%t> was automatically rejected:%n%r -} - -# Sieve configuration -protocol sieve { -} - -service managesieve-login { - inet_listener sieve { - port = 4190 - } -} - -service managesieve { -} - -# Plugins configuration -plugin { - sieve = ~/sieve/.dovecot.sieve - sieve_dir = ~/sieve - quota = maildir -} - -# Authentication configuration -auth_mechanisms = plain login - -service auth { - # Postfix smtp-auth - unix_listener /var/spool/postfix/private/dovecot-auth { - mode = 0660 - user = postfix - group = postfix - } -} diff --git a/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_10_auth.conf b/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_10_auth.conf deleted file mode 100644 index 5541d354..00000000 --- a/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_10_auth.conf +++ /dev/null @@ -1,127 +0,0 @@ -## -## Authentication processes -## - -# Disable LOGIN command and all other plaintext authentications unless -# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP -# matches the local IP (ie. you're connecting from the same computer), the -# connection is considered secure and plaintext authentication is allowed. -#disable_plaintext_auth = yes - -# Authentication cache size (e.g. 10M). 0 means it's disabled. Note that -# bsdauth, PAM and vpopmail require cache_key to be set for caching to be used. -#auth_cache_size = 0 -# Time to live for cached data. After TTL expires the cached record is no -# longer used, *except* if the main database lookup returns internal failure. -# We also try to handle password changes automatically: If user's previous -# authentication was successful, but this one wasn't, the cache isn't used. -# For now this works only with plaintext authentication. -#auth_cache_ttl = 1 hour -# TTL for negative hits (user not found, password mismatch). -# 0 disables caching them completely. -#auth_cache_negative_ttl = 1 hour - -# Space separated list of realms for SASL authentication mechanisms that need -# them. You can leave it empty if you don't want to support multiple realms. -# Many clients simply use the first one listed here, so keep the default realm -# first. -#auth_realms = - -# Default realm/domain to use if none was specified. This is used for both -# SASL realms and appending @domain to username in plaintext logins. -#auth_default_realm = - -# List of allowed characters in username. If the user-given username contains -# a character not listed in here, the login automatically fails. This is just -# an extra check to make sure user can't exploit any potential quote escaping -# vulnerabilities with SQL/LDAP databases. If you want to allow all characters, -# set this value to empty. -#auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ - -# Username character translations before it's looked up from databases. The -# value contains series of from -> to characters. For example "#@/@" means -# that '#' and '/' characters are translated to '@'. -#auth_username_translation = - -# Username formatting before it's looked up from databases. You can use -# the standard variables here, eg. %Lu would lowercase the username, %n would -# drop away the domain if it was given, or "%n-AT-%d" would change the '@' into -# "-AT-". This translation is done after auth_username_translation changes. -#auth_username_format = - -# If you want to allow master users to log in by specifying the master -# username within the normal username string (ie. not using SASL mechanism's -# support for it), you can specify the separator character here. The format -# is then . UW-IMAP uses "*" as the -# separator, so that could be a good choice. -#auth_master_user_separator = - -# Username to use for users logging in with ANONYMOUS SASL mechanism -#auth_anonymous_username = anonymous - -# Maximum number of dovecot-auth worker processes. They're used to execute -# blocking passdb and userdb queries (eg. MySQL and PAM). They're -# automatically created and destroyed as needed. -#auth_worker_max_count = 30 - -# Host name to use in GSSAPI principal names. The default is to use the -# name returned by gethostname(). Use "$ALL" (with quotes) to allow all keytab -# entries. -#auth_gssapi_hostname = - -# Kerberos keytab to use for the GSSAPI mechanism. Will use the system -# default (usually /etc/krb5.keytab) if not specified. You may need to change -# the auth service to run as root to be able to read this file. -#auth_krb5_keytab = - -# Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and -# ntlm_auth helper. -#auth_use_winbind = no - -# Path for Samba's ntlm_auth helper binary. -#auth_winbind_helper_path = /usr/bin/ntlm_auth - -# Time to delay before replying to failed authentications. -#auth_failure_delay = 2 secs - -# Require a valid SSL client certificate or the authentication fails. -#auth_ssl_require_client_cert = no - -# Take the username from client's SSL certificate, using -# X509_NAME_get_text_by_NID() which returns the subject's DN's -# CommonName. -#auth_ssl_username_from_cert = no - -# Space separated list of wanted authentication mechanisms: -# plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey -# gss-spnego -# NOTE: See also disable_plaintext_auth setting. -auth_mechanisms = plain login - -## -## Password and user databases -## - -# -# Password database is used to verify user's password (and nothing more). -# You can have multiple passdbs and userdbs. This is useful if you want to -# allow both system users (/etc/passwd) and virtual users to login without -# duplicating the system users into virtual database. -# -# -# -# User database specifies where mails are located and what user/group IDs -# own them. For single-UID configuration use "static" userdb. -# -# - -#!include auth-deny.conf.ext -#!include auth-master.conf.ext - -#!include auth-system.conf.ext -!include auth-sql.conf.ext -#!include auth-ldap.conf.ext -#!include auth-passwdfile.conf.ext -#!include auth-checkpassword.conf.ext -#!include auth-vpopmail.conf.ext -#!include auth-static.conf.ext diff --git a/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext b/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext deleted file mode 100644 index 156a491b..00000000 --- a/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext +++ /dev/null @@ -1,8 +0,0 @@ -passdb { - driver = sql - args = /etc/dovecot/dovecot-sql.conf.ext -} -userdb { - driver = sql - args = /etc/dovecot/dovecot-sql.conf.ext -} diff --git a/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_dovecot-sql.conf.ext b/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_dovecot-sql.conf.ext deleted file mode 100644 index f4ec7e23..00000000 --- a/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_dovecot-sql.conf.ext +++ /dev/null @@ -1,6 +0,0 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve') -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE (username = '%u' OR email = '%u') -iterate_query = SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3 = 1) diff --git a/templates/misc/configfiles/ubuntu_precise/libnss/etc_libnss-mysql-root.cfg b/templates/misc/configfiles/ubuntu_precise/libnss/etc_libnss-mysql-root.cfg deleted file mode 100644 index 64989771..00000000 --- a/templates/misc/configfiles/ubuntu_precise/libnss/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username -password diff --git a/templates/misc/configfiles/ubuntu_precise/libnss/etc_libnss-mysql.cfg b/templates/misc/configfiles/ubuntu_precise/libnss/etc_libnss-mysql.cfg deleted file mode 100644 index 22d27921..00000000 --- a/templates/misc/configfiles/ubuntu_precise/libnss/etc_libnss-mysql.cfg +++ /dev/null @@ -1,41 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT members \ - FROM ftp_groups \ - WHERE gid='%1$u' -gidsbymem SELECT CONCAT_WS(',', gid) as gid \ - FROM ftp_groups \ - WHERE FIND_IN_SET('%1$s', members) - -host -database -username -password -socket /var/run/mysqld/mysqld.sock diff --git a/templates/misc/configfiles/ubuntu_precise/libnss/etc_nsswitch.conf b/templates/misc/configfiles/ubuntu_precise/libnss/etc_nsswitch.conf deleted file mode 100644 index 22a74dda..00000000 --- a/templates/misc/configfiles/ubuntu_precise/libnss/etc_nsswitch.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Make sure that `passwd`, `group` and `shadow` have mysql in their lines -# You should place mysql at the end, so that it is queried after the other mechanisams -# -passwd: compat mysql -group: compat mysql -shadow: compat mysql - -hosts: files dns -networks: files dns - -services: db files -protocols: db files -rpc: db files -ethers: db files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_precise/lighttpd/etc_lighttpd.conf b/templates/misc/configfiles/ubuntu_precise/lighttpd/etc_lighttpd.conf deleted file mode 100644 index 14e7e42f..00000000 --- a/templates/misc/configfiles/ubuntu_precise/lighttpd/etc_lighttpd.conf +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# Default lighttpd.conf for Froxlor. -############################################################################### -var.basedir = "/var/www" -var.logdir = "/var/log/lighttpd" -var.statedir = "/var/lib/lighttpd" - -server.modules = ( - "mod_rewrite", - "mod_redirect", - "mod_alias", - "mod_access", - "mod_auth", - "mod_fastcgi", - "mod_cgi", - "mod_accesslog" -) - -server.username = "www-data" -server.groupname = "www-data" -server.document-root = var.basedir -server.pid-file = "/var/run/lighttpd.pid" -accesslog.filename = var.logdir + "/access.log" -server.errorlog = var.logdir + "/error.log" - -server.indexfiles = ("index.php", "index.html", - "index.htm", "default.htm") - -server.name = "" -server.port = 80 -server.bind = "" -url.access-deny = ("~", ".inc") - -fastcgi.server = ( -".php" => ( - "localhost" => ( - "socket" => "/tmp/lighttpd-fcgi-sock-lighttpd", - "broken-scriptfilename" => "enable", - "bin-path" => "/usr/bin/php5-cgi", - "min-procs" => 1, - "max-procs" => 1, - "max-load-per-proc" => 4, - "idle-timeout" => 60, - "bin-environment" => ( - "UID" => "www-data", - "GID" => "www-data", - "PHP_FCGI_CHILDREN" => "0", - "PHP_FCGI_MAX_REQUESTS" => "10000" - ), - "bin-copy-environment" => ( "" ) - ) - ) -) - -#### external configuration files -## mimetype mapping -include_shell "/usr/share/lighttpd/create-mime.assign.pl" diff --git a/templates/misc/configfiles/ubuntu_precise/logrotate/etc_logrotated_froxlor b/templates/misc/configfiles/ubuntu_precise/logrotate/etc_logrotated_froxlor deleted file mode 100644 index d7f7deeb..00000000 --- a/templates/misc/configfiles/ubuntu_precise/logrotate/etc_logrotated_froxlor +++ /dev/null @@ -1,16 +0,0 @@ -# -# Froxlor logrotate snipet -# -*.log { - missingok - weekly - rotate 4 - compress - delaycompress - notifempty - create - sharedscripts - postrotate - > /dev/null 2>&1 || true - endscript -} diff --git a/templates/misc/configfiles/ubuntu_precise/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/ubuntu_precise/nginx/etc_init.d_php-fcgi deleted file mode 100644 index 29e0cc4a..00000000 --- a/templates/misc/configfiles/ubuntu_precise/nginx/etc_init.d_php-fcgi +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -BIND="127.0.0.1:8888" -USER="www-data" -PHP_FCGI_CHILDREN="15" -PHP_FCGI_MAX_REQUESTS="1000" - -PHP_CGI="/usr/bin/php-cgi" -PHP_CGI_NAME="$(basename ${PHP_CGI})" -PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}" -RETVAL="0" - -start() { - echo -n "Starting PHP FastCGI: " - start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $PHP_CGI_ARGS - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} -stop() { - echo -n "Stopping PHP FastCGI: " - killall -q -w -u ${USER} ${PHP_CGI} - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "Usage: php-fastcgi {start|stop|restart}" - exit 1 - ;; -esac -exit "$RETVAL" diff --git a/templates/misc/configfiles/ubuntu_precise/nginx/etc_nginx_fastcgi.conf b/templates/misc/configfiles/ubuntu_precise/nginx/etc_nginx_fastcgi.conf deleted file mode 100644 index 10bcaba4..00000000 --- a/templates/misc/configfiles/ubuntu_precise/nginx/etc_nginx_fastcgi.conf +++ /dev/null @@ -1,15 +0,0 @@ -fastcgi_param GATEWAY_INTERFACE CGI/1.1; -fastcgi_param SERVER_SOFTWARE nginx; -fastcgi_param QUERY_STRING $query_string; -fastcgi_param REQUEST_METHOD $request_method; -fastcgi_param CONTENT_TYPE $content_type; -fastcgi_param CONTENT_LENGTH $content_length; -fastcgi_param REQUEST_URI $request_uri; -fastcgi_param DOCUMENT_URI $document_uri; -fastcgi_param DOCUMENT_ROOT $document_root; -fastcgi_param SERVER_PROTOCOL $server_protocol; -fastcgi_param REMOTE_ADDR $remote_addr; -fastcgi_param REMOTE_PORT $remote_port; -fastcgi_param SERVER_ADDR $server_addr; -fastcgi_param SERVER_PORT $server_port; -fastcgi_param SERVER_NAME $server_name; diff --git a/templates/misc/configfiles/ubuntu_precise/nginx/etc_nginx_nginx.conf b/templates/misc/configfiles/ubuntu_precise/nginx/etc_nginx_nginx.conf deleted file mode 100644 index a3f22ed0..00000000 --- a/templates/misc/configfiles/ubuntu_precise/nginx/etc_nginx_nginx.conf +++ /dev/null @@ -1,26 +0,0 @@ -user www-data; -worker_processes 4; - -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - access_log /var/log/nginx/access.log; - - sendfile on; - tcp_nodelay on; - - keepalive_timeout 65; - - gzip on; - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; -} - diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf deleted file mode 100644 index 7bf3b4be..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf +++ /dev/null @@ -1,85 +0,0 @@ -## General Postfix configuration -# should be the default domain from your provider eg. "server100.provider.tld" -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes - -# Virtual delivery settings -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = $smtpd_tls_cert_file -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c0a12256..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index a962d086..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_sasl_smtpd.conf b/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_sasl_smtpd.conf deleted file mode 100644 index de3699d8..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_sasl_smtpd.conf +++ /dev/null @@ -1,11 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: plain login cram-md5 digest-md5 -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: SELECT password FROM mail_users WHERE username='%u@%r' OR email='%u@%r' \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf deleted file mode 100644 index c08d0e4c..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf +++ /dev/null @@ -1,90 +0,0 @@ -## General Postfix configuration -# should be the default domain from your provider eg. "server100.provider.tld" -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes -## Dovecot Settings for deliver, SASL Auth and virtual transport -smtpd_sasl_type = dovecot -virtual_transport = dovecot -dovecot_destination_recipient_limit = 1 -smtpd_sasl_path = private/dovecot-auth - -# Virtual delivery settings -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = $smtpd_tls_cert_file -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_master.cf b/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_master.cf deleted file mode 100644 index 39feed7f..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_master.cf +++ /dev/null @@ -1,4 +0,0 @@ -# Add these lines to be able to use dovecot as delivery agent -# Dovecot LDA -dovecot unix - n n - - pipe - flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient} diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index 090b6465..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> '' diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index a962d086..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1' diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 677c53ee..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT maildir FROM mail_users WHERE email = '%s' diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 62a5f76e..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -hosts = -query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s')); diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_precise/postfix_mxaccess/etc_postfix_main.cf deleted file mode 100644 index 82b23a03..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_mxaccess/etc_postfix_main.cf +++ /dev/null @@ -1,25 +0,0 @@ -# -# ATTENTION - this is not the full postfix-main.cf file -# -# it only provides additional configuration-entries! -# - -# -# look for the follow statement -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient - -# -# and extend it with the following line -# so it looks like this -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient, - check_recipient_mx_access cidr:/etc/postfix/mx_access diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/ubuntu_precise/postfix_mxaccess/etc_postfix_mx_access deleted file mode 100644 index 18a1ec5f..00000000 --- a/templates/misc/configfiles/ubuntu_precise/postfix_mxaccess/etc_postfix_mx_access +++ /dev/null @@ -1,9 +0,0 @@ -0.0.0.0/8 REJECT Domain MX in broadcast network -10.0.0.0/8 REJECT Domain MX in RFC 1918 private network -169.254.0.0/16 REJECT Domain MX in link local network -172.16.0.0/12 REJECT Domain MX in RFC 1918 private network -192.0.2.0/24 REJECT Domain MX in TEST-NET network -192.168.0.0/16 REJECT Domain MX in RFC 1918 private network -224.0.0.0/4 REJECT Domain MX in class D multicast network -240.0.0.0/5 REJECT Domain MX in class E reserved network -248.0.0.0/5 REJECT Domain MX in reserved network diff --git a/templates/misc/configfiles/ubuntu_precise/powerdns/etc_powerdns_pdns-froxlor.conf b/templates/misc/configfiles/ubuntu_precise/powerdns/etc_powerdns_pdns-froxlor.conf deleted file mode 100644 index 5e12377d..00000000 --- a/templates/misc/configfiles/ubuntu_precise/powerdns/etc_powerdns_pdns-froxlor.conf +++ /dev/null @@ -1,7 +0,0 @@ -allow-axfr-ips= -#local-ipv6=YOUR_IPv6_(if_any) -bind-config=named.conf -bind-check-interval=180 -log-dns-details=yes -local-address=,127.0.0.1 - diff --git a/templates/misc/configfiles/ubuntu_precise/powerdns/etc_powerdns_pdns.conf b/templates/misc/configfiles/ubuntu_precise/powerdns/etc_powerdns_pdns.conf deleted file mode 100644 index 56d4b2a0..00000000 --- a/templates/misc/configfiles/ubuntu_precise/powerdns/etc_powerdns_pdns.conf +++ /dev/null @@ -1,17 +0,0 @@ -allow-recursion=127.0.0.1 -config-dir=/etc/powerdns -daemon=yes -guardian=yes -launch=bind -lazy-recursion=yes -local-port=53 -master=yes -module-dir=/usr/lib/powerdns -setgid=pdns -setuid=pdns -socket-dir=/var/run -version-string=powerdns -bind-config=named.conf -bind-check-interval=300 -include=/etc/powerdns/pdns_froxlor.conf - diff --git a/templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_modules.conf b/templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_modules.conf deleted file mode 100644 index da6fb9c6..00000000 --- a/templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_modules.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# This file is used to manage DSO modules and features. -# - -# This is the directory where DSO modules reside - -ModulePath /usr/lib/proftpd - -# Allow only user root to load and unload modules, but allow everyone -# to see which modules have been loaded - -ModuleControlsACLs insmod,rmmod allow user root -ModuleControlsACLs lsmod allow user * - -LoadModule mod_ctrls_admin.c -LoadModule mod_tls.c - -# Install proftpd-mod-mysql or proftpd-mod-pgsql to use this -LoadModule mod_sql.c - -# Install proftpd-mod-ldap to use this -#LoadModule mod_ldap.c - -# -# 'SQLBackend mysql' or 'SQLBackend postgres' directives are required -# to have SQL authorization working. You can also comment out the -# unused module here, in alternative. -# - -# Install proftpd-mod-mysql to use this -LoadModule mod_sql_mysql.c - -# Install proftpd-mod-pgsql to use this -#LoadModule mod_sql_postgres.c - -#LoadModule mod_radius.c -LoadModule mod_quotatab.c -LoadModule mod_quotatab_file.c - -# Install proftpd-mod-ldap to use this -#LoadModule mod_quotatab_ldap.c - -# Install proftpd-mod-pgsql or proftpd-mod-mysql to use this -LoadModule mod_quotatab_sql.c -LoadModule mod_quotatab_radius.c -LoadModule mod_wrap.c -LoadModule mod_rewrite.c -LoadModule mod_load.c -LoadModule mod_ban.c -LoadModule mod_wrap2.c -LoadModule mod_wrap2_file.c -# Install proftpd-mod-pgsql or proftpd-mod-mysql to use this -#LoadModule mod_wrap2_sql.c -LoadModule mod_dynmasq.c - - -# keep this module the last one -LoadModule mod_ifsession.c diff --git a/templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index d50330c4..00000000 --- a/templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,131 +0,0 @@ -# -# /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file. -# To really apply changes reload proftpd after modifications. -# - -# Includes DSO modules -Include /etc/proftpd/modules.conf - -# Set off to disable IPv6 support which is annoying on IPv4 only boxes. -UseIPv6 on - -ServerName " FTP Server" -ServerType standalone -DeferWelcome off - -MultilineRFC2228 on -DefaultServer on -ShowSymlinks on - -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 1200 - -DisplayLogin welcome.msg -DisplayChdir .message true -ListOptions "-l" - -DenyFilter \*.*/ - -# Use this to jail all users in their homes -# DefaultRoot ~ - -# Users require a valid shell listed in /etc/shells to login. -# Use this directive to release that constrain. -# RequireValidShell off - -# Port 21 is the standard FTP port. -Port 21 - -# In some cases you have to specify passive ports range to by-pass -# firewall limitations. Ephemeral ports can be used for that, but -# feel free to use a more narrow range. -# PassivePorts 49152 65534 - -# If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public -# address and opening the passive ports used on your firewall as well. -# MasqueradeAddress 1.2.3.4 - -# This is useful for masquerading address with dynamic IPs: -# refresh any configured MasqueradeAddress directives every 8 hours - -# DynMasqRefresh 28800 - - -# To prevent DoS attacks, set the maximum number of child processes -# to 30. If you need to allow more than 30 concurrent connections -# at once, simply increase this value. Note that this ONLY works -# in standalone mode, in inetd mode you should use an inetd server -# that allows you to limit maximum number of processes per service -# (such as xinetd) -MaxInstances 30 - -# Set the user and group that the server normally runs at. -User proftpd -Group nogroup - -# Umask 022 is a good standard umask to prevent new files and dirs -# (second parm) from being group and world writable. -Umask 022 022 -# Normally, we want files to be overwriteable. -AllowOverwrite on - -# Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: -# PersistentPasswd off - -# This is required to use both PAM-based authentication and local passwords -# AuthOrder mod_auth_pam.c* mod_auth_unix.c - -# Be warned: use of this directive impacts CPU average load! -# Uncomment this if you like to see progress and transfer rate with ftpwho -# in downloads. That is not needed for uploads rates. -# -# UseSendFile off - -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - -# Allow up- and downloads to be continued -AllowRetrieveRestart On -AllowStoreRestart On - - -QuotaEngine on - - - -Ratios off - - - -# Delay engine reduces impact of the so-called Timing Attack described in -# http://security.lss.hr/index.php?page=details&ID=LSS-2004-10-02 -# It is on by default. - -DelayEngine off - - - -ControlsEngine off -ControlsMaxClients 2 -ControlsLog /var/log/proftpd/controls.log -ControlsInterval 5 -ControlsSocket /var/run/proftpd/proftpd.sock - - - -AdminControlsEngine off - - -# -# Alternative authentication frameworks -# -#Include /etc/proftpd/ldap.conf -Include /etc/proftpd/sql.conf - -# -# This is used for FTPS connections -# -#Include /etc/proftpd/tls.conf - diff --git a/templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_sql.conf b/templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_sql.conf deleted file mode 100644 index d05bdb3f..00000000 --- a/templates/misc/configfiles/ubuntu_precise/proftpd/etc_proftpd_sql.conf +++ /dev/null @@ -1,37 +0,0 @@ - -DefaultRoot ~ -RequireValidShell off -AuthOrder mod_sql.c - -SQLBackend mysql -SQLEngine on -SQLAuthenticate on - -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -QuotaEngine on -QuotaShowQuotas on -QuotaDisplayUnits Mb -QuotaLock /var/lock/ftpd.quotatab.lock -QuotaLimitTable sql:/get-quota-limit -QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally -SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" -SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" -SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies -SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies - - diff --git a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_default_pure-ftpd-common b/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_default_pure-ftpd-common deleted file mode 100644 index b2653904..00000000 --- a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_default_pure-ftpd-common +++ /dev/null @@ -1,5 +0,0 @@ -STANDALONE_OR_INETD=standalone -VIRTUALCHROOT=false -UPLOADSCRIPT= -UPLOADUID= -UPLOADGID= diff --git a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_Bind b/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_Bind deleted file mode 100644 index aabe6ec3..00000000 --- a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_Bind +++ /dev/null @@ -1 +0,0 @@ -21 diff --git a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone b/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone deleted file mode 100644 index 7cfab5b0..00000000 --- a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_CustomerProof b/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_CustomerProof deleted file mode 100644 index d00491fd..00000000 --- a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_CustomerProof +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime b/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime deleted file mode 100644 index 60d3b2f4..00000000 --- a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime +++ /dev/null @@ -1 +0,0 @@ -15 diff --git a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MinUID b/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MinUID deleted file mode 100644 index 83b33d23..00000000 --- a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MinUID +++ /dev/null @@ -1 +0,0 @@ -1000 diff --git a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile b/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile deleted file mode 100644 index be85bafe..00000000 --- a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile +++ /dev/null @@ -1 +0,0 @@ -/etc/pure-ftpd/db/mysql.conf diff --git a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous b/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous deleted file mode 100644 index 7cfab5b0..00000000 --- a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication b/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication deleted file mode 100644 index 7ecb56eb..00000000 --- a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication +++ /dev/null @@ -1 +0,0 @@ -no diff --git a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_db_mysql.conf b/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_db_mysql.conf deleted file mode 100644 index 22ecee5c..00000000 --- a/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_db_mysql.conf +++ /dev/null @@ -1,11 +0,0 @@ -MYSQLServer -MYSQLUser -MYSQLPassword -MYSQLDatabase -MYSQLCrypt any - -MYSQLGetPW SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetUID SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetGID SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y" -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) diff --git a/templates/misc/configfiles/ubuntu_trusty/apache2/etc_apache2_mods-enabled_fastcgi.conf b/templates/misc/configfiles/ubuntu_trusty/apache2/etc_apache2_mods-enabled_fastcgi.conf deleted file mode 100644 index db1a4557..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/apache2/etc_apache2_mods-enabled_fastcgi.conf +++ /dev/null @@ -1,10 +0,0 @@ - - FastCgiIpcDir - - - Order Deny,Allow - Deny from All - # Prevent accessing this path directly - Allow from env=REDIRECT_STATUS - - diff --git a/templates/misc/configfiles/ubuntu_trusty/courier/etc_courier_authdaemonrc b/templates/misc/configfiles/ubuntu_trusty/courier/etc_courier_authdaemonrc deleted file mode 100644 index 29346e54..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/courier/etc_courier_authdaemonrc +++ /dev/null @@ -1,68 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $ -# -# Copyright 2000-2001 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:0 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authcustom authcram authuserdb authldap authmysql authpam - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:1 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authcustom authcram authuserdb authldap authmysql authpam" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: version:0 -# -# When you have multiple versions of authdaemond.* installed, authdaemond -# just picks the first one it finds. Set "version" to override that. -# For example: version=authdaemond.plain - -version="" - -##NAME: authdaemonvar:0 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/run/courier/authdaemon diff --git a/templates/misc/configfiles/ubuntu_trusty/courier/etc_courier_authmysqlrc b/templates/misc/configfiles/ubuntu_trusty/courier/etc_courier_authmysqlrc deleted file mode 100644 index 8e5eef90..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/courier/etc_courier_authmysqlrc +++ /dev/null @@ -1,14 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 3306 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD uid -MYSQL_GID_FIELD gid -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD homedir -MYSQL_MAILDIR_FIELD maildir -MYSQL_QUOTA_FIELD (quota*1024*1024) -MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3) diff --git a/templates/misc/configfiles/ubuntu_trusty/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_trusty/cron/etc_cron.d_froxlor deleted file mode 100644 index ef6033d4..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/cron/etc_cron.d_froxlor +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the froxlor package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf b/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf deleted file mode 100644 index f720ec21..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf +++ /dev/null @@ -1,70 +0,0 @@ -# Some general options -protocols = imap pop3 sieve -disable_plaintext_auth = no -ssl = yes -ssl_cert = - mail_plugins = sieve quota - quota_full_tempfail = yes - deliver_log_format = msgid=%m: %$ - rejection_reason = Your message to <%t> was automatically rejected:%n%r -} - -# Plugins configuration -plugin { - sieve=~/.dovecot.sieve - sieve_dir=~/sieve - quota = maildir -} - -# Authentication configuration -auth_mechanisms = plain login - -service auth { - # Postfix smtp-auth - unix_listener /var/spool/postfix/private/dovecot-auth { - mode = 0660 - user = postfix - group = postfix - } -} diff --git a/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_10_auth.conf b/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_10_auth.conf deleted file mode 100644 index 5541d354..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_10_auth.conf +++ /dev/null @@ -1,127 +0,0 @@ -## -## Authentication processes -## - -# Disable LOGIN command and all other plaintext authentications unless -# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP -# matches the local IP (ie. you're connecting from the same computer), the -# connection is considered secure and plaintext authentication is allowed. -#disable_plaintext_auth = yes - -# Authentication cache size (e.g. 10M). 0 means it's disabled. Note that -# bsdauth, PAM and vpopmail require cache_key to be set for caching to be used. -#auth_cache_size = 0 -# Time to live for cached data. After TTL expires the cached record is no -# longer used, *except* if the main database lookup returns internal failure. -# We also try to handle password changes automatically: If user's previous -# authentication was successful, but this one wasn't, the cache isn't used. -# For now this works only with plaintext authentication. -#auth_cache_ttl = 1 hour -# TTL for negative hits (user not found, password mismatch). -# 0 disables caching them completely. -#auth_cache_negative_ttl = 1 hour - -# Space separated list of realms for SASL authentication mechanisms that need -# them. You can leave it empty if you don't want to support multiple realms. -# Many clients simply use the first one listed here, so keep the default realm -# first. -#auth_realms = - -# Default realm/domain to use if none was specified. This is used for both -# SASL realms and appending @domain to username in plaintext logins. -#auth_default_realm = - -# List of allowed characters in username. If the user-given username contains -# a character not listed in here, the login automatically fails. This is just -# an extra check to make sure user can't exploit any potential quote escaping -# vulnerabilities with SQL/LDAP databases. If you want to allow all characters, -# set this value to empty. -#auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ - -# Username character translations before it's looked up from databases. The -# value contains series of from -> to characters. For example "#@/@" means -# that '#' and '/' characters are translated to '@'. -#auth_username_translation = - -# Username formatting before it's looked up from databases. You can use -# the standard variables here, eg. %Lu would lowercase the username, %n would -# drop away the domain if it was given, or "%n-AT-%d" would change the '@' into -# "-AT-". This translation is done after auth_username_translation changes. -#auth_username_format = - -# If you want to allow master users to log in by specifying the master -# username within the normal username string (ie. not using SASL mechanism's -# support for it), you can specify the separator character here. The format -# is then . UW-IMAP uses "*" as the -# separator, so that could be a good choice. -#auth_master_user_separator = - -# Username to use for users logging in with ANONYMOUS SASL mechanism -#auth_anonymous_username = anonymous - -# Maximum number of dovecot-auth worker processes. They're used to execute -# blocking passdb and userdb queries (eg. MySQL and PAM). They're -# automatically created and destroyed as needed. -#auth_worker_max_count = 30 - -# Host name to use in GSSAPI principal names. The default is to use the -# name returned by gethostname(). Use "$ALL" (with quotes) to allow all keytab -# entries. -#auth_gssapi_hostname = - -# Kerberos keytab to use for the GSSAPI mechanism. Will use the system -# default (usually /etc/krb5.keytab) if not specified. You may need to change -# the auth service to run as root to be able to read this file. -#auth_krb5_keytab = - -# Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and -# ntlm_auth helper. -#auth_use_winbind = no - -# Path for Samba's ntlm_auth helper binary. -#auth_winbind_helper_path = /usr/bin/ntlm_auth - -# Time to delay before replying to failed authentications. -#auth_failure_delay = 2 secs - -# Require a valid SSL client certificate or the authentication fails. -#auth_ssl_require_client_cert = no - -# Take the username from client's SSL certificate, using -# X509_NAME_get_text_by_NID() which returns the subject's DN's -# CommonName. -#auth_ssl_username_from_cert = no - -# Space separated list of wanted authentication mechanisms: -# plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey -# gss-spnego -# NOTE: See also disable_plaintext_auth setting. -auth_mechanisms = plain login - -## -## Password and user databases -## - -# -# Password database is used to verify user's password (and nothing more). -# You can have multiple passdbs and userdbs. This is useful if you want to -# allow both system users (/etc/passwd) and virtual users to login without -# duplicating the system users into virtual database. -# -# -# -# User database specifies where mails are located and what user/group IDs -# own them. For single-UID configuration use "static" userdb. -# -# - -#!include auth-deny.conf.ext -#!include auth-master.conf.ext - -#!include auth-system.conf.ext -!include auth-sql.conf.ext -#!include auth-ldap.conf.ext -#!include auth-passwdfile.conf.ext -#!include auth-checkpassword.conf.ext -#!include auth-vpopmail.conf.ext -#!include auth-static.conf.ext diff --git a/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_dovecot-sql.conf.ext b/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_dovecot-sql.conf.ext deleted file mode 100644 index f4ec7e23..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_dovecot-sql.conf.ext +++ /dev/null @@ -1,6 +0,0 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve') -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE (username = '%u' OR email = '%u') -iterate_query = SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3 = 1) diff --git a/templates/misc/configfiles/ubuntu_trusty/libnss/etc_libnss-mysql-root.cfg b/templates/misc/configfiles/ubuntu_trusty/libnss/etc_libnss-mysql-root.cfg deleted file mode 100644 index 64989771..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/libnss/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username -password diff --git a/templates/misc/configfiles/ubuntu_trusty/libnss/etc_libnss-mysql.cfg b/templates/misc/configfiles/ubuntu_trusty/libnss/etc_libnss-mysql.cfg deleted file mode 100644 index 22d27921..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/libnss/etc_libnss-mysql.cfg +++ /dev/null @@ -1,41 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - AND login_enabled = 'Y' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT members \ - FROM ftp_groups \ - WHERE gid='%1$u' -gidsbymem SELECT CONCAT_WS(',', gid) as gid \ - FROM ftp_groups \ - WHERE FIND_IN_SET('%1$s', members) - -host -database -username -password -socket /var/run/mysqld/mysqld.sock diff --git a/templates/misc/configfiles/ubuntu_trusty/libnss/etc_nsswitch.conf b/templates/misc/configfiles/ubuntu_trusty/libnss/etc_nsswitch.conf deleted file mode 100644 index 22a74dda..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/libnss/etc_nsswitch.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Make sure that `passwd`, `group` and `shadow` have mysql in their lines -# You should place mysql at the end, so that it is queried after the other mechanisams -# -passwd: compat mysql -group: compat mysql -shadow: compat mysql - -hosts: files dns -networks: files dns - -services: db files -protocols: db files -rpc: db files -ethers: db files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_trusty/lighttpd/etc_lighttpd.conf b/templates/misc/configfiles/ubuntu_trusty/lighttpd/etc_lighttpd.conf deleted file mode 100644 index 14e7e42f..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/lighttpd/etc_lighttpd.conf +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# Default lighttpd.conf for Froxlor. -############################################################################### -var.basedir = "/var/www" -var.logdir = "/var/log/lighttpd" -var.statedir = "/var/lib/lighttpd" - -server.modules = ( - "mod_rewrite", - "mod_redirect", - "mod_alias", - "mod_access", - "mod_auth", - "mod_fastcgi", - "mod_cgi", - "mod_accesslog" -) - -server.username = "www-data" -server.groupname = "www-data" -server.document-root = var.basedir -server.pid-file = "/var/run/lighttpd.pid" -accesslog.filename = var.logdir + "/access.log" -server.errorlog = var.logdir + "/error.log" - -server.indexfiles = ("index.php", "index.html", - "index.htm", "default.htm") - -server.name = "" -server.port = 80 -server.bind = "" -url.access-deny = ("~", ".inc") - -fastcgi.server = ( -".php" => ( - "localhost" => ( - "socket" => "/tmp/lighttpd-fcgi-sock-lighttpd", - "broken-scriptfilename" => "enable", - "bin-path" => "/usr/bin/php5-cgi", - "min-procs" => 1, - "max-procs" => 1, - "max-load-per-proc" => 4, - "idle-timeout" => 60, - "bin-environment" => ( - "UID" => "www-data", - "GID" => "www-data", - "PHP_FCGI_CHILDREN" => "0", - "PHP_FCGI_MAX_REQUESTS" => "10000" - ), - "bin-copy-environment" => ( "" ) - ) - ) -) - -#### external configuration files -## mimetype mapping -include_shell "/usr/share/lighttpd/create-mime.assign.pl" diff --git a/templates/misc/configfiles/ubuntu_trusty/logrotate/etc_logrotated_froxlor b/templates/misc/configfiles/ubuntu_trusty/logrotate/etc_logrotated_froxlor deleted file mode 100644 index d7f7deeb..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/logrotate/etc_logrotated_froxlor +++ /dev/null @@ -1,16 +0,0 @@ -# -# Froxlor logrotate snipet -# -*.log { - missingok - weekly - rotate 4 - compress - delaycompress - notifempty - create - sharedscripts - postrotate - > /dev/null 2>&1 || true - endscript -} diff --git a/templates/misc/configfiles/ubuntu_trusty/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/ubuntu_trusty/nginx/etc_init.d_php-fcgi deleted file mode 100644 index 29e0cc4a..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/nginx/etc_init.d_php-fcgi +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -BIND="127.0.0.1:8888" -USER="www-data" -PHP_FCGI_CHILDREN="15" -PHP_FCGI_MAX_REQUESTS="1000" - -PHP_CGI="/usr/bin/php-cgi" -PHP_CGI_NAME="$(basename ${PHP_CGI})" -PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}" -RETVAL="0" - -start() { - echo -n "Starting PHP FastCGI: " - start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $PHP_CGI_ARGS - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} -stop() { - echo -n "Stopping PHP FastCGI: " - killall -q -w -u ${USER} ${PHP_CGI} - RETVAL="$?" - echo "${PHP_CGI_NAME}." -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - *) - echo "Usage: php-fastcgi {start|stop|restart}" - exit 1 - ;; -esac -exit "$RETVAL" diff --git a/templates/misc/configfiles/ubuntu_trusty/nginx/etc_nginx_fastcgi.conf b/templates/misc/configfiles/ubuntu_trusty/nginx/etc_nginx_fastcgi.conf deleted file mode 100644 index 10bcaba4..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/nginx/etc_nginx_fastcgi.conf +++ /dev/null @@ -1,15 +0,0 @@ -fastcgi_param GATEWAY_INTERFACE CGI/1.1; -fastcgi_param SERVER_SOFTWARE nginx; -fastcgi_param QUERY_STRING $query_string; -fastcgi_param REQUEST_METHOD $request_method; -fastcgi_param CONTENT_TYPE $content_type; -fastcgi_param CONTENT_LENGTH $content_length; -fastcgi_param REQUEST_URI $request_uri; -fastcgi_param DOCUMENT_URI $document_uri; -fastcgi_param DOCUMENT_ROOT $document_root; -fastcgi_param SERVER_PROTOCOL $server_protocol; -fastcgi_param REMOTE_ADDR $remote_addr; -fastcgi_param REMOTE_PORT $remote_port; -fastcgi_param SERVER_ADDR $server_addr; -fastcgi_param SERVER_PORT $server_port; -fastcgi_param SERVER_NAME $server_name; diff --git a/templates/misc/configfiles/ubuntu_trusty/nginx/etc_nginx_nginx.conf b/templates/misc/configfiles/ubuntu_trusty/nginx/etc_nginx_nginx.conf deleted file mode 100644 index a3f22ed0..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/nginx/etc_nginx_nginx.conf +++ /dev/null @@ -1,26 +0,0 @@ -user www-data; -worker_processes 4; - -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - access_log /var/log/nginx/access.log; - - sendfile on; - tcp_nodelay on; - - keepalive_timeout 65; - - gzip on; - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; -} - diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_main.cf deleted file mode 100644 index 7bf3b4be..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_main.cf +++ /dev/null @@ -1,85 +0,0 @@ -## General Postfix configuration -# should be the default domain from your provider eg. "server100.provider.tld" -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes - -# Virtual delivery settings -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = $smtpd_tls_cert_file -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index a9e71f83..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and TRIM(destination) <> '' -hosts = diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 4484bee2..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 7e0f79af..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = -password = -dbname = -table = mail_users -select_field = maildir -where_field = email -hosts = diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 410be470..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); -hosts = diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_sasl_smtpd.conf b/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_sasl_smtpd.conf deleted file mode 100644 index de3699d8..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_sasl_smtpd.conf +++ /dev/null @@ -1,11 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: plain login cram-md5 digest-md5 -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: SELECT password FROM mail_users WHERE username='%u@%r' OR email='%u@%r' \ No newline at end of file diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_main.cf deleted file mode 100644 index c08d0e4c..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_main.cf +++ /dev/null @@ -1,90 +0,0 @@ -## General Postfix configuration -# should be the default domain from your provider eg. "server100.provider.tld" -mydomain = - -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain - -mydestination = $myhostname, - $mydomain, - localhost.$myhostname, - localhost.$mydomain, - localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -append_dot_mydomain = no -biff = no - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -smtpd_helo_required = yes -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient -smtpd_sender_restrictions = permit_mynetworks, - reject_sender_login_mismatch, - permit_sasl_authenticated, - reject_unknown_helo_hostname, - reject_unknown_recipient_domain, - reject_unknown_sender_domain -smtpd_client_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unknown_client_hostname - -# Postfix 2.10 requires this option. Postfix < 2.10 ignores this. -# The option is intentionally left empty. -smtpd_relay_restrictions = - -# Maximum size of Message in bytes (50MB) -message_size_limit = 52428800 - -## SASL Auth Settings -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes -## Dovecot Settings for deliver, SASL Auth and virtual transport -smtpd_sasl_type = dovecot -virtual_transport = dovecot -dovecot_destination_recipient_limit = 1 -smtpd_sasl_path = private/dovecot-auth - -# Virtual delivery settings -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_maps = $alias_database - -# Default Mailbox size, is set to 0 which means unlimited! -mailbox_size_limit = 0 -virtual_mailbox_limit = 0 - -### TLS settings -### -## TLS for outgoing mails from the server to another server -#smtp_tls_security_level = may -#smtp_tls_note_starttls_offer = yes -## TLS for email client -#smtpd_tls_security_level = may -#smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = $smtpd_tls_cert_file -#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt -#smtpd_tls_loglevel = 1 -#smtpd_tls_received_header = yes - -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - ddd $daemon_directory/$process_name $process_id & sleep 5 - diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_master.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_master.cf deleted file mode 100644 index 39feed7f..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_master.cf +++ /dev/null @@ -1,4 +0,0 @@ -# Add these lines to be able to use dovecot as delivery agent -# Dovecot LDA -dovecot unix - n n - - pipe - flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient} diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index a9e71f83..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and TRIM(destination) <> '' -hosts = diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 4484bee2..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 7e0f79af..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = -password = -dbname = -table = mail_users -select_field = maildir -where_field = email -hosts = diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf deleted file mode 100644 index 410be470..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ /dev/null @@ -1,5 +0,0 @@ -user = -password = -dbname = -query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); -hosts = diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_trusty/postfix_mxaccess/etc_postfix_main.cf deleted file mode 100644 index 82b23a03..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_mxaccess/etc_postfix_main.cf +++ /dev/null @@ -1,25 +0,0 @@ -# -# ATTENTION - this is not the full postfix-main.cf file -# -# it only provides additional configuration-entries! -# - -# -# look for the follow statement -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient - -# -# and extend it with the following line -# so it looks like this -# -smtpd_recipient_restrictions = permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_unauth_pipelining, - reject_non_fqdn_recipient, - check_recipient_mx_access cidr:/etc/postfix/mx_access diff --git a/templates/misc/configfiles/ubuntu_trusty/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/ubuntu_trusty/postfix_mxaccess/etc_postfix_mx_access deleted file mode 100644 index 18a1ec5f..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/postfix_mxaccess/etc_postfix_mx_access +++ /dev/null @@ -1,9 +0,0 @@ -0.0.0.0/8 REJECT Domain MX in broadcast network -10.0.0.0/8 REJECT Domain MX in RFC 1918 private network -169.254.0.0/16 REJECT Domain MX in link local network -172.16.0.0/12 REJECT Domain MX in RFC 1918 private network -192.0.2.0/24 REJECT Domain MX in TEST-NET network -192.168.0.0/16 REJECT Domain MX in RFC 1918 private network -224.0.0.0/4 REJECT Domain MX in class D multicast network -240.0.0.0/5 REJECT Domain MX in class E reserved network -248.0.0.0/5 REJECT Domain MX in reserved network diff --git a/templates/misc/configfiles/ubuntu_trusty/powerdns/etc_powerdns_pdns-froxlor.conf b/templates/misc/configfiles/ubuntu_trusty/powerdns/etc_powerdns_pdns-froxlor.conf deleted file mode 100644 index 5e12377d..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/powerdns/etc_powerdns_pdns-froxlor.conf +++ /dev/null @@ -1,7 +0,0 @@ -allow-axfr-ips= -#local-ipv6=YOUR_IPv6_(if_any) -bind-config=named.conf -bind-check-interval=180 -log-dns-details=yes -local-address=,127.0.0.1 - diff --git a/templates/misc/configfiles/ubuntu_trusty/powerdns/etc_powerdns_pdns.conf b/templates/misc/configfiles/ubuntu_trusty/powerdns/etc_powerdns_pdns.conf deleted file mode 100644 index 56d4b2a0..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/powerdns/etc_powerdns_pdns.conf +++ /dev/null @@ -1,17 +0,0 @@ -allow-recursion=127.0.0.1 -config-dir=/etc/powerdns -daemon=yes -guardian=yes -launch=bind -lazy-recursion=yes -local-port=53 -master=yes -module-dir=/usr/lib/powerdns -setgid=pdns -setuid=pdns -socket-dir=/var/run -version-string=powerdns -bind-config=named.conf -bind-check-interval=300 -include=/etc/powerdns/pdns_froxlor.conf - diff --git a/templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_modules.conf b/templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_modules.conf deleted file mode 100644 index da6fb9c6..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_modules.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# This file is used to manage DSO modules and features. -# - -# This is the directory where DSO modules reside - -ModulePath /usr/lib/proftpd - -# Allow only user root to load and unload modules, but allow everyone -# to see which modules have been loaded - -ModuleControlsACLs insmod,rmmod allow user root -ModuleControlsACLs lsmod allow user * - -LoadModule mod_ctrls_admin.c -LoadModule mod_tls.c - -# Install proftpd-mod-mysql or proftpd-mod-pgsql to use this -LoadModule mod_sql.c - -# Install proftpd-mod-ldap to use this -#LoadModule mod_ldap.c - -# -# 'SQLBackend mysql' or 'SQLBackend postgres' directives are required -# to have SQL authorization working. You can also comment out the -# unused module here, in alternative. -# - -# Install proftpd-mod-mysql to use this -LoadModule mod_sql_mysql.c - -# Install proftpd-mod-pgsql to use this -#LoadModule mod_sql_postgres.c - -#LoadModule mod_radius.c -LoadModule mod_quotatab.c -LoadModule mod_quotatab_file.c - -# Install proftpd-mod-ldap to use this -#LoadModule mod_quotatab_ldap.c - -# Install proftpd-mod-pgsql or proftpd-mod-mysql to use this -LoadModule mod_quotatab_sql.c -LoadModule mod_quotatab_radius.c -LoadModule mod_wrap.c -LoadModule mod_rewrite.c -LoadModule mod_load.c -LoadModule mod_ban.c -LoadModule mod_wrap2.c -LoadModule mod_wrap2_file.c -# Install proftpd-mod-pgsql or proftpd-mod-mysql to use this -#LoadModule mod_wrap2_sql.c -LoadModule mod_dynmasq.c - - -# keep this module the last one -LoadModule mod_ifsession.c diff --git a/templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index d50330c4..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,131 +0,0 @@ -# -# /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file. -# To really apply changes reload proftpd after modifications. -# - -# Includes DSO modules -Include /etc/proftpd/modules.conf - -# Set off to disable IPv6 support which is annoying on IPv4 only boxes. -UseIPv6 on - -ServerName " FTP Server" -ServerType standalone -DeferWelcome off - -MultilineRFC2228 on -DefaultServer on -ShowSymlinks on - -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 1200 - -DisplayLogin welcome.msg -DisplayChdir .message true -ListOptions "-l" - -DenyFilter \*.*/ - -# Use this to jail all users in their homes -# DefaultRoot ~ - -# Users require a valid shell listed in /etc/shells to login. -# Use this directive to release that constrain. -# RequireValidShell off - -# Port 21 is the standard FTP port. -Port 21 - -# In some cases you have to specify passive ports range to by-pass -# firewall limitations. Ephemeral ports can be used for that, but -# feel free to use a more narrow range. -# PassivePorts 49152 65534 - -# If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public -# address and opening the passive ports used on your firewall as well. -# MasqueradeAddress 1.2.3.4 - -# This is useful for masquerading address with dynamic IPs: -# refresh any configured MasqueradeAddress directives every 8 hours - -# DynMasqRefresh 28800 - - -# To prevent DoS attacks, set the maximum number of child processes -# to 30. If you need to allow more than 30 concurrent connections -# at once, simply increase this value. Note that this ONLY works -# in standalone mode, in inetd mode you should use an inetd server -# that allows you to limit maximum number of processes per service -# (such as xinetd) -MaxInstances 30 - -# Set the user and group that the server normally runs at. -User proftpd -Group nogroup - -# Umask 022 is a good standard umask to prevent new files and dirs -# (second parm) from being group and world writable. -Umask 022 022 -# Normally, we want files to be overwriteable. -AllowOverwrite on - -# Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: -# PersistentPasswd off - -# This is required to use both PAM-based authentication and local passwords -# AuthOrder mod_auth_pam.c* mod_auth_unix.c - -# Be warned: use of this directive impacts CPU average load! -# Uncomment this if you like to see progress and transfer rate with ftpwho -# in downloads. That is not needed for uploads rates. -# -# UseSendFile off - -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - -# Allow up- and downloads to be continued -AllowRetrieveRestart On -AllowStoreRestart On - - -QuotaEngine on - - - -Ratios off - - - -# Delay engine reduces impact of the so-called Timing Attack described in -# http://security.lss.hr/index.php?page=details&ID=LSS-2004-10-02 -# It is on by default. - -DelayEngine off - - - -ControlsEngine off -ControlsMaxClients 2 -ControlsLog /var/log/proftpd/controls.log -ControlsInterval 5 -ControlsSocket /var/run/proftpd/proftpd.sock - - - -AdminControlsEngine off - - -# -# Alternative authentication frameworks -# -#Include /etc/proftpd/ldap.conf -Include /etc/proftpd/sql.conf - -# -# This is used for FTPS connections -# -#Include /etc/proftpd/tls.conf - diff --git a/templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_sql.conf b/templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_sql.conf deleted file mode 100644 index d05bdb3f..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/proftpd/etc_proftpd_sql.conf +++ /dev/null @@ -1,37 +0,0 @@ - -DefaultRoot ~ -RequireValidShell off -AuthOrder mod_sql.c - -SQLBackend mysql -SQLEngine on -SQLAuthenticate on - -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -QuotaEngine on -QuotaShowQuotas on -QuotaDisplayUnits Mb -QuotaLock /var/lock/ftpd.quotatab.lock -QuotaLimitTable sql:/get-quota-limit -QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally -SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" -SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" -SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies -SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies - - diff --git a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_default_pure-ftpd-common b/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_default_pure-ftpd-common deleted file mode 100644 index b2653904..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_default_pure-ftpd-common +++ /dev/null @@ -1,5 +0,0 @@ -STANDALONE_OR_INETD=standalone -VIRTUALCHROOT=false -UPLOADSCRIPT= -UPLOADUID= -UPLOADGID= diff --git a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_Bind b/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_Bind deleted file mode 100644 index aabe6ec3..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_Bind +++ /dev/null @@ -1 +0,0 @@ -21 diff --git a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone b/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone deleted file mode 100644 index 7cfab5b0..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_CustomerProof b/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_CustomerProof deleted file mode 100644 index d00491fd..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_CustomerProof +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime b/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime deleted file mode 100644 index 60d3b2f4..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime +++ /dev/null @@ -1 +0,0 @@ -15 diff --git a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MinUID b/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MinUID deleted file mode 100644 index 83b33d23..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MinUID +++ /dev/null @@ -1 +0,0 @@ -1000 diff --git a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile b/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile deleted file mode 100644 index be85bafe..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile +++ /dev/null @@ -1 +0,0 @@ -/etc/pure-ftpd/db/mysql.conf diff --git a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous b/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous deleted file mode 100644 index 7cfab5b0..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication b/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication deleted file mode 100644 index 7ecb56eb..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication +++ /dev/null @@ -1 +0,0 @@ -no diff --git a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_db_mysql.conf b/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_db_mysql.conf deleted file mode 100644 index 22ecee5c..00000000 --- a/templates/misc/configfiles/ubuntu_trusty/pure-ftpd/etc_pure-ftpd_db_mysql.conf +++ /dev/null @@ -1,11 +0,0 @@ -MYSQLServer -MYSQLUser -MYSQLPassword -MYSQLDatabase -MYSQLCrypt any - -MYSQLGetPW SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetUID SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetGID SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y" -MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y" -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) From 116c0e19b20a647919c1d8df3eab217a1eb9a65f Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 4 Sep 2015 19:34:09 +0200 Subject: [PATCH 33/34] add managesieve/sieve config-template for dovecot to Gentoo Signed-off-by: Michael Kaufmann (d00p) --- lib/configfiles/gentoo.xml | 229 ++++++++++++++++++++++++++++++++++++- 1 file changed, 228 insertions(+), 1 deletion(-) diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index a3f0ca73..4c963308 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -1441,7 +1441,7 @@ sql_select: SELECT password_enc FROM mail_users WHERE username='%u@%r' OR email= - > /etc/portage/package.use]]> + > /etc/portage/package.use]]> @@ -1557,6 +1557,233 @@ default_pass_scheme = CRYPT password_query = "SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('*:storage=', quota,'M') AS userdb_quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve')" user_query = "SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', quota,'M') AS quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u')" iterate_query = "SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3 = 1)" +]]> + + + + + #service_count = 1 + + # Number of processes to always keep waiting for more connections. + #process_min_avail = 0 + + # If you set service_count=0, you probably need to grow this. + #vsz_limit = 64M +} + +#service managesieve { + # Max. number of ManageSieve processes (connections) + #process_limit = 1024 +#} + +# Service configuration + +protocol sieve { + # Maximum ManageSieve command line length in bytes. ManageSieve usually does + # not involve overly long command lines, so this setting will not normally + # need adjustment + #managesieve_max_line_length = 65536 + + # Maximum number of ManageSieve connections allowed for a user from each IP + # address. + # NOTE: The username is compared case-sensitively. + #mail_max_userip_connections = 10 + + # Space separated list of plugins to load (none known to be useful so far). + # Do NOT try to load IMAP plugins here. + #mail_plugins = + + # MANAGESIEVE logout format string: + # %i - total number of bytes read from client + # %o - total number of bytes sent to client + #managesieve_logout_format = bytes=%i/%o + + # To fool ManageSieve clients that are focused on CMU's timesieved you can + # specify the IMPLEMENTATION capability that Dovecot reports to clients. + # For example: 'Cyrus timsieved v2.2.13' + #managesieve_implementation_string = Dovecot Pigeonhole + + # Explicitly specify the SIEVE and NOTIFY capability reported by the server + # before login. If left unassigned these will be reported dynamically + # according to what the Sieve interpreter supports by default (after login + # this may differ depending on the user). + #managesieve_sieve_capability = + #managesieve_notify_capability = + + # The maximum number of compile errors that are returned to the client upon + # script upload or script verification. + #managesieve_max_compile_errors = 5 + + # Refer to 90-sieve.conf for script quota configuration and configuration of + # Sieve execution limits. +} +]]> + + + + :]path[; From 9bf784f64ea5560f2f6a53a88842ee694097d430 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 7 Sep 2015 13:33:22 +0200 Subject: [PATCH 34/34] set version to 0.9.34 for upcoming release Signed-off-by: Michael Kaufmann (d00p) --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 8 ++++++++ lib/version.inc.php | 2 +- templates/misc/standardcustomer/index.html | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 5ea4c9fd..d91e05ff 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -539,7 +539,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'password_numeric', '0'), ('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char', '!?<>ยง$%+#=@'), - ('panel', 'version', '0.9.34-dev4'); + ('panel', 'version', '0.9.34'); DROP TABLE IF EXISTS `panel_tasks`; diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index a59083ef..dfda7dcb 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2996,3 +2996,11 @@ if (isFroxlorVersion('0.9.34-dev3')) { updateToVersion('0.9.34-dev4'); } + +if (isFroxlorVersion('0.9.34-dev4')) { + + showUpdateStep("Updating from 0.9.34-dev4 to 0.9.34 final"); + lastStepStatus(0); + + updateToVersion('0.9.34'); +} diff --git a/lib/version.inc.php b/lib/version.inc.php index c40eb019..18c66676 100644 --- a/lib/version.inc.php +++ b/lib/version.inc.php @@ -16,7 +16,7 @@ */ // Main version variable -$version = '0.9.34-dev4'; +$version = '0.9.34'; // Database version (unused, old stuff from SysCP) $dbversion = '2'; diff --git a/templates/misc/standardcustomer/index.html b/templates/misc/standardcustomer/index.html index fb1b74dc..b60fd263 100644 --- a/templates/misc/standardcustomer/index.html +++ b/templates/misc/standardcustomer/index.html @@ -57,7 +57,7 @@