Skip to content

Commit 7cf3e98

Browse files
author
Marius Cramer
committed
Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: install/install.php install/tpl/server.ini.master interface/lib/classes/aps_guicontroller.inc.php interface/lib/classes/tform.inc.php interface/lib/lang/de.lng interface/web/admin/form/server_config.tform.php interface/web/admin/lib/lang/de.lng interface/web/admin/lib/lang/de_directive_snippets.lng interface/web/admin/lib/lang/de_directive_snippets_list.lng interface/web/admin/lib/lang/de_firewall.lng interface/web/admin/lib/lang/de_firewall_list.lng interface/web/admin/lib/lang/de_groups.lng interface/web/admin/lib/lang/de_groups_list.lng interface/web/admin/lib/lang/de_iptables.lng interface/web/admin/lib/lang/de_iptables_list.lng interface/web/admin/lib/lang/de_language_add.lng interface/web/admin/lib/lang/de_language_complete.lng interface/web/admin/lib/lang/de_language_edit.lng interface/web/admin/lib/lang/de_language_export.lng interface/web/admin/lib/lang/de_language_import.lng interface/web/admin/lib/lang/de_language_list.lng interface/web/admin/lib/lang/de_login_as.lng interface/web/admin/lib/lang/de_package_install.lng interface/web/admin/lib/lang/de_remote_action.lng interface/web/admin/lib/lang/de_remote_user.lng interface/web/admin/lib/lang/de_remote_user_list.lng interface/web/admin/lib/lang/de_server.lng interface/web/admin/lib/lang/de_server_config.lng interface/web/admin/lib/lang/de_server_config_list.lng interface/web/admin/lib/lang/de_server_ip.lng interface/web/admin/lib/lang/de_server_ip_list.lng interface/web/admin/lib/lang/de_server_list.lng interface/web/admin/lib/lang/de_server_php.lng interface/web/admin/lib/lang/de_server_php_list.lng interface/web/admin/lib/lang/de_software_package.lng interface/web/admin/lib/lang/de_software_package_install.lng interface/web/admin/lib/lang/de_software_package_list.lng interface/web/admin/lib/lang/de_software_repo.lng interface/web/admin/lib/lang/de_software_repo_list.lng interface/web/admin/lib/lang/de_software_update_list.lng interface/web/admin/lib/lang/de_system_config.lng interface/web/admin/lib/lang/de_tpl_default_admin.lng interface/web/admin/lib/lang/de_users.lng interface/web/admin/lib/lang/de_users_list.lng interface/web/admin/templates/server_config_server_edit.htm interface/web/client/lib/lang/de.lng interface/web/client/lib/lang/de_client.lng interface/web/client/lib/lang/de_client_circle.lng interface/web/client/lib/lang/de_client_circle_list.lng interface/web/client/lib/lang/de_client_del.lng interface/web/client/lib/lang/de_client_message.lng interface/web/client/lib/lang/de_client_template.lng interface/web/client/lib/lang/de_client_template_list.lng interface/web/client/lib/lang/de_clients_list.lng interface/web/client/lib/lang/de_domain.lng interface/web/client/lib/lang/de_domain_list.lng interface/web/client/lib/lang/de_reseller.lng interface/web/client/lib/lang/de_resellers_list.lng interface/web/dashboard/dashlets/quota.php interface/web/dashboard/lib/lang/de.lng interface/web/dashboard/lib/lang/de_dashlet_limits.lng interface/web/dashboard/lib/lang/de_dashlet_mailquota.lng interface/web/dashboard/lib/lang/de_dashlet_modules.lng interface/web/dashboard/lib/lang/de_dashlet_quota.lng interface/web/designer/lib/lang/de.lng interface/web/designer/lib/lang/de_form_edit.lng interface/web/designer/lib/lang/de_form_list.lng interface/web/designer/lib/lang/de_module_edit.lng interface/web/designer/lib/lang/de_module_list.lng interface/web/designer/lib/lang/de_module_nav_edit.lng interface/web/designer/lib/lang/de_module_nav_item_edit.lng interface/web/designer/lib/lang/de_module_show.lng interface/web/dns/lib/lang/de.lng interface/web/dns/lib/lang/de_dns_a.lng interface/web/dns/lib/lang/de_dns_a_list.lng interface/web/dns/lib/lang/de_dns_aaaa.lng interface/web/dns/lib/lang/de_dns_alias.lng interface/web/dns/lib/lang/de_dns_cname.lng interface/web/dns/lib/lang/de_dns_hinfo.lng interface/web/dns/lib/lang/de_dns_import.lng interface/web/dns/lib/lang/de_dns_mx.lng interface/web/dns/lib/lang/de_dns_ns.lng interface/web/dns/lib/lang/de_dns_ptr.lng interface/web/dns/lib/lang/de_dns_rp.lng interface/web/dns/lib/lang/de_dns_slave.lng interface/web/dns/lib/lang/de_dns_slave_list.lng interface/web/dns/lib/lang/de_dns_soa.lng interface/web/dns/lib/lang/de_dns_soa_list.lng interface/web/dns/lib/lang/de_dns_srv.lng interface/web/dns/lib/lang/de_dns_template.lng interface/web/dns/lib/lang/de_dns_template_list.lng interface/web/dns/lib/lang/de_dns_txt.lng interface/web/help/lib/lang/de.lng interface/web/help/lib/lang/de_faq_form.lng interface/web/help/lib/lang/de_faq_manage_questions_list.lng interface/web/help/lib/lang/de_faq_sections_form.lng interface/web/help/lib/lang/de_help_faq_list.lng interface/web/help/lib/lang/de_help_faq_sections_list.lng interface/web/help/lib/lang/de_support_message.lng interface/web/help/lib/lang/de_support_message_list.lng interface/web/login/lib/lang/de.lng interface/web/mail/lib/lang/de.lng interface/web/mail/lib/lang/de_mail_alias.lng interface/web/mail/lib/lang/de_mail_alias_list.lng interface/web/mail/lib/lang/de_mail_aliasdomain.lng interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng interface/web/mail/lib/lang/de_mail_blacklist.lng interface/web/mail/lib/lang/de_mail_blacklist_list.lng interface/web/mail/lib/lang/de_mail_content_filter.lng interface/web/mail/lib/lang/de_mail_content_filter_list.lng interface/web/mail/lib/lang/de_mail_domain.lng interface/web/mail/lib/lang/de_mail_domain_admin_list.lng interface/web/mail/lib/lang/de_mail_domain_catchall.lng interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng interface/web/mail/lib/lang/de_mail_domain_list.lng interface/web/mail/lib/lang/de_mail_forward.lng interface/web/mail/lib/lang/de_mail_forward_list.lng interface/web/mail/lib/lang/de_mail_get.lng interface/web/mail/lib/lang/de_mail_get_list.lng interface/web/mail/lib/lang/de_mail_mailinglist.lng interface/web/mail/lib/lang/de_mail_mailinglist_list.lng interface/web/mail/lib/lang/de_mail_relay_recipient.lng interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng interface/web/mail/lib/lang/de_mail_spamfilter.lng interface/web/mail/lib/lang/de_mail_spamfilter_list.lng interface/web/mail/lib/lang/de_mail_transport.lng interface/web/mail/lib/lang/de_mail_transport_list.lng interface/web/mail/lib/lang/de_mail_user.lng interface/web/mail/lib/lang/de_mail_user_filter.lng interface/web/mail/lib/lang/de_mail_user_filter_list.lng interface/web/mail/lib/lang/de_mail_user_list.lng interface/web/mail/lib/lang/de_mail_user_stats_list.lng interface/web/mail/lib/lang/de_mail_whitelist.lng interface/web/mail/lib/lang/de_mail_whitelist_list.lng interface/web/mail/lib/lang/de_spamfilter_blacklist.lng interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng interface/web/mail/lib/lang/de_spamfilter_config.lng interface/web/mail/lib/lang/de_spamfilter_config_list.lng interface/web/mail/lib/lang/de_spamfilter_policy.lng interface/web/mail/lib/lang/de_spamfilter_policy_list.lng interface/web/mail/lib/lang/de_spamfilter_users.lng interface/web/mail/lib/lang/de_spamfilter_users_list.lng interface/web/mail/lib/lang/de_spamfilter_whitelist.lng interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng interface/web/mail/lib/lang/de_user_quota_stats_list.lng interface/web/mailuser/lib/lang/de.lng interface/web/mailuser/lib/lang/de_index.lng interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng interface/web/mailuser/lib/lang/de_mail_user_cc.lng interface/web/mailuser/lib/lang/de_mail_user_filter.lng interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng interface/web/mailuser/lib/lang/de_mail_user_password.lng interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng interface/web/monitor/lib/lang/de.lng interface/web/monitor/lib/lang/de_datalog_list.lng interface/web/sites/aps_installedpackages_list.php interface/web/sites/lib/lang/de.lng interface/web/sites/lib/lang/de_aps.lng interface/web/sites/lib/lang/de_aps_instances_list.lng interface/web/sites/lib/lang/de_aps_packages_list.lng interface/web/sites/lib/lang/de_aps_update_packagelist.lng interface/web/sites/lib/lang/de_cron.lng interface/web/sites/lib/lang/de_cron_list.lng interface/web/sites/lib/lang/de_database.lng interface/web/sites/lib/lang/de_database_admin_list.lng interface/web/sites/lib/lang/de_database_list.lng interface/web/sites/lib/lang/de_database_user.lng interface/web/sites/lib/lang/de_database_user_admin_list.lng interface/web/sites/lib/lang/de_database_user_list.lng interface/web/sites/lib/lang/de_ftp_user.lng interface/web/sites/lib/lang/de_ftp_user_list.lng interface/web/sites/lib/lang/de_shell_user.lng interface/web/sites/lib/lang/de_shell_user_list.lng interface/web/sites/lib/lang/de_user_quota_stats_list.lng interface/web/sites/lib/lang/de_web_aliasdomain.lng interface/web/sites/lib/lang/de_web_aliasdomain_list.lng interface/web/sites/lib/lang/de_web_backup_list.lng interface/web/sites/lib/lang/de_web_domain.lng interface/web/sites/lib/lang/de_web_domain_admin_list.lng interface/web/sites/lib/lang/de_web_domain_list.lng interface/web/sites/lib/lang/de_web_folder.lng interface/web/sites/lib/lang/de_web_folder_list.lng interface/web/sites/lib/lang/de_web_folder_user.lng interface/web/sites/lib/lang/de_web_folder_user_list.lng interface/web/sites/lib/lang/de_web_sites_stats_list.lng interface/web/sites/lib/lang/de_web_subdomain.lng interface/web/sites/lib/lang/de_web_subdomain_list.lng interface/web/sites/lib/lang/de_web_vhost_subdomain.lng interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng interface/web/sites/lib/lang/de_webdav_user.lng interface/web/sites/lib/lang/de_webdav_user_list.lng interface/web/sites/templates/aps_install_package.htm interface/web/strengthmeter/lib/lang/de_strengthmeter.lng interface/web/themes/default/css/styles.css interface/web/tools/lib/lang/de.lng interface/web/tools/lib/lang/de_import_ispconfig.lng interface/web/tools/lib/lang/de_index.lng interface/web/tools/lib/lang/de_interface.lng interface/web/tools/lib/lang/de_resync.lng interface/web/tools/lib/lang/de_tpl_default.lng interface/web/tools/lib/lang/de_usersettings.lng interface/web/vm/lib/lang/de.lng interface/web/vm/lib/lang/de_openvz_action.lng interface/web/vm/lib/lang/de_openvz_ip.lng interface/web/vm/lib/lang/de_openvz_ip_list.lng interface/web/vm/lib/lang/de_openvz_ostemplate.lng interface/web/vm/lib/lang/de_openvz_ostemplate_list.lng interface/web/vm/lib/lang/de_openvz_template.lng interface/web/vm/lib/lang/de_openvz_template_list.lng interface/web/vm/lib/lang/de_openvz_vm.lng interface/web/vm/lib/lang/de_openvz_vm_list.lng server/cron_daily.php server/lib/classes/aps_installer.inc.php server/mods-available/rescue_core_module.inc.php
2 parents 78fc9a6 + 7d52e00 commit 7cf3e98

File tree

71 files changed

+627
-431
lines changed

Some content is hidden

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

71 files changed

+627
-431
lines changed

‎install/autoupdate.php‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -303,30 +303,32 @@
303303

304304
//** Restart services:
305305
swriteln('Restarting services ...');
306-
if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script'])) system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' reload');
306+
if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'reload'));
307307
if($conf['services']['mail']) {
308-
if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script'])) system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
309-
if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'])) system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
310-
if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script'])) system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
311-
if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script'])) system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
312-
if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
313-
if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
314-
if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
315-
if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
316-
if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
317-
if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
318-
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
308+
if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
309+
if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
310+
if($conf['amavis']['installed'] == true && $conf['amavis']['init_script'] != '') system($inst->getinitcommand($conf['amavis']['init_script'], 'restart'));
311+
if($conf['clamav']['installed'] == true && $conf['clamav']['init_script'] != '') system($inst->getinitcommand($conf['clamav']['init_script'], 'restart'));
312+
if($conf['courier']['installed'] == true){
313+
if($conf['courier']['courier-authdaemon'] != '') system($inst->getinitcommand($conf['courier']['courier-authdaemon'], 'restart'));
314+
if($conf['courier']['courier-imap'] != '') system($inst->getinitcommand($conf['courier']['courier-imap'], 'restart'));
315+
if($conf['courier']['courier-imap-ssl'] != '') system($inst->getinitcommand($conf['courier']['courier-imap-ssl'], 'restart'));
316+
if($conf['courier']['courier-pop'] != '') system($inst->getinitcommand($conf['courier']['courier-pop'], 'restart'));
317+
if($conf['courier']['courier-pop-ssl'] != '') system($inst->getinitcommand($conf['courier']['courier-pop-ssl'], 'restart'));
318+
}
319+
if($conf['dovecot']['installed'] == true && $conf['dovecot']['init_script'] != '') system($inst->getinitcommand($conf['dovecot']['init_script'], 'restart'));
320+
if($conf['mailman']['installed'] == true && $conf['mailman']['init_script'] != '') system($inst->getinitcommand($conf['mailman']['init_script'], 'restart'));
319321
}
320322
if($conf['services']['web']) {
321-
if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
323+
if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '') system($inst->getinitcommand($conf['apache']['init_script'], 'restart'));
322324
//* Reload is enough for nginx
323-
if($conf['webserver']['server_type'] == 'nginx' && $conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' reload');
324-
if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
325+
if($conf['webserver']['server_type'] == 'nginx' && $conf['nginx']['init_script'] != '') system($inst->getinitcommand($conf['nginx']['init_script'], 'reload'));
326+
if($conf['pureftpd']['installed'] == true && $conf['pureftpd']['init_script'] != '') system($inst->getinitcommand($conf['pureftpd']['init_script'], 'restart'));
325327
}
326328
if($conf['services']['dns']) {
327-
if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script'])) system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
328-
if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script'])) system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
329-
if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
329+
if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '') system($inst->getinitcommand($conf['mydns']['init_script'], 'restart').' &> /dev/null');
330+
if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '') system($inst->getinitcommand($conf['powerdns']['init_script'], 'restart').' &> /dev/null');
331+
if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '') system($inst->getinitcommand($conf['bind']['init_script'], 'restart').' &> /dev/null');
330332
}
331333

332334
echo "Update finished.\n";

0 commit comments

Comments
 (0)