From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 20 Apr 2016 10:58:46 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- install/tpl/server.ini.master | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index dbff7ed..1f7df52 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -16,8 +16,9 @@ loglevel=2 admin_notify_events=1 backup_dir=/var/backup -backup_dir_is_mount=y +backup_dir_is_mount=n backup_mode=rootgz +backup_time=0:00 backup_delete=n monit_url= monit_user= @@ -46,7 +47,7 @@ mailbox_size_limit=0 message_size_limit=0 mailbox_quota_stats=y -realtime_blackhole_list= +realtime_blackhole_list=zen.spamhaus.org overquota_notify_admin=y overquota_notify_client=y overquota_notify_freq=7 @@ -72,12 +73,12 @@ group=www-data nginx_user=www-data nginx_group=www-data +apps_vhost_enabled=y 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 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 @@ -130,7 +131,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 /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_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 /usr/bin/which /usr/lib/x86_64-linux-gnu/libmemcached.so.11 /usr/lib/x86_64-linux-gnu/libmemcachedutil.so.2 /usr/lib/x86_64-linux-gnu/libMagickWand-6.Q16.so.2 /opt/php-5.6.8/bin/php /opt/php-5.6.8/include /opt/php-5.6.8/lib jailkit_chroot_cron_programs=/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php [vlogger] -- Gitblit v1.9.1