From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 06 Aug 2015 03:18:44 -0400 Subject: [PATCH] - don't set password via remoting if field is empty --- install/tpl/server.ini.master | 67 ++++++++++++++++++++++++++------- 1 files changed, 52 insertions(+), 15 deletions(-) diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index 4dae4f6..dbff7ed 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -5,28 +5,41 @@ [server] -auto_network_configuration=n -ip_address=0.0.0.0 -netmask=255.255.255.0 -v6_prefix= -gateway=0.0.0.0 -hostname=server1.domain.tld -nameservers=8.8.8.8,8.8.4.4 +auto_network_configuration=n +ip_address=0.0.0.0 +netmask=255.255.255.0 +v6_prefix= +gateway=0.0.0.0 +hostname=server1.domain.tld +nameservers=8.8.8.8,8.8.4.4 firewall=bastille loglevel=2 +admin_notify_events=1 backup_dir=/var/backup +backup_dir_is_mount=y backup_mode=rootgz +backup_delete=n +monit_url= +monit_user= +monit_password= +munin_url= +munin_user= +munin_password= +monitor_system_updates=y [mail] module=postfix_mysql maildir_path=/var/vmail/[domain]/[localpart] homedir_path=/var/vmail +dkim_path=/var/lib/amavis/dkim +dkim_strength=1024 pop3_imap_daemon=courier mail_filter_syntax=maildrop mailuser_uid=5000 mailuser_gid=5000 mailuser_name=vmail mailuser_group=vmail +mailbox_virtual_uidgid_maps=n relayhost= relayhost_user= relayhost_password= @@ -34,6 +47,11 @@ message_size_limit=0 mailbox_quota_stats=y realtime_blackhole_list= +overquota_notify_admin=y +overquota_notify_client=y +overquota_notify_freq=7 +overquota_notify_onok=n +sendmail_path=/usr/sbin/sendmail [getmail] getmail_config_dir=/etc/getmail @@ -41,12 +59,13 @@ [web] server_type=apache website_basedir=/var/www -website_path=/var/www/clients/client[client_id]/web[website_id] -website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/ -website_symlinks_rel=n -vhost_conf_dir=/etc/apache2/sites-available -vhost_conf_enabled_dir=/etc/apache2/sites-enabled -nginx_vhost_conf_dir=/etc/nginx/sites-available +website_path=/var/www/clients/client[client_id]/web[website_id] +website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/ +website_symlinks_rel=n +network_filesystem=n +vhost_conf_dir=/etc/apache2/sites-available +vhost_conf_enabled_dir=/etc/apache2/sites-enabled +nginx_vhost_conf_dir=/etc/nginx/sites-available nginx_vhost_conf_enabled_dir=/etc/nginx/sites-enabled security_level=20 user=www-data @@ -56,8 +75,9 @@ apps_vhost_port=8081 apps_vhost_ip=_default_ apps_vhost_servername= -php_open_basedir=[website_path]/web:[website_path]/private:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/usr/share/php:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/usr/share/php +php_open_basedir=[website_path]/web:[website_path]/private:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/usr/share/php:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin htaccess_allow_override=All +enable_spdy=y awstats_conf_dir=/etc/awstats awstats_data_dir=/var/lib/awstats awstats_pl=/usr/lib/cgi-bin/awstats.pl @@ -66,6 +86,7 @@ php_ini_path_cgi=/etc/php5/cgi/php.ini check_apache_config=y enable_sni=y +enable_spdy=n enable_ip_wildcard=y overtraffic_notify_admin=y overtraffic_notify_client=y @@ -81,6 +102,12 @@ connect_userid_to_webid_start=10000 web_folder_protection=y php_ini_check_minutes=1 +overquota_notify_admin=y +overquota_notify_client=y +overquota_notify_freq=7 +overquota_db_notify_admin=y +overquota_db_notify_client=y +overquota_notify_onok=n [dns] bind_user=root @@ -88,6 +115,7 @@ bind_zonefiles_dir=/etc/bind named_conf_path=/etc/bind/named.conf named_conf_local_path=/etc/bind/named.conf.local +disable_bind_log=n [fastcgi] fastcgi_starter_path=/var/www/php-fcgi-scripts/[system_user]/ @@ -102,7 +130,7 @@ [jailkit] jailkit_chroot_home=/home/[username] jailkit_chroot_app_sections=basicshell editors extendedshell netutils ssh sftp scp groups jk_lsh -jailkit_chroot_app_programs=/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico +jailkit_chroot_app_programs=/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch jailkit_chroot_cron_programs=/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php [vlogger] @@ -119,3 +147,12 @@ do_not_try_rescue_mysql=n do_not_try_rescue_mail=n +[xmpp] +xmpp_use_ispv6=n +xmpp_bosh_max_inactivity=30 +xmpp_server_admins=admin@service.com, superuser@service.com +xmpp_modules_enabled=saslauth, tls, dialback, disco, discoitems, version, uptime, time, ping, admin_adhoc, admin_telnet, bosh, posix, announce, offline, webpresence, mam, stream_management, message_carbons +xmpp_port_http=5290 +xmpp_port_https=5291 +xmpp_port_pastebin=5292 +xmpp_port_bosh=5280 -- Gitblit v1.9.1