Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 install/tpl/server.ini.master

@@ -5,12 +5,13 @@


[server]
auto_network_configuration=n

ip_address=0.0.0.0

netmask=255.255.255.0

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
@@ -45,6 +46,7 @@
overquota_notify_client=y
overquota_notify_freq=7
overquota_notify_onok=n
sendmail_path=/usr/sbin/sendmail

[getmail]
getmail_config_dir=/etc/getmail
@@ -52,12 +54,12 @@
[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
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
@@ -91,6 +93,7 @@
connect_userid_to_webid=n
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