Merge branch 'master' into 'master'

Marius Cramer

2014-01-27 e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c

 install/tpl/server.ini.master

@@ -5,17 +5,21 @@


[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
backup_dir=/var/backup
backup_dir_is_mount=n
backup_dir_mount_cmd=
backup_mode=rootgz
backup_delete=y
monit_url=
monit_user=
monit_password=
@@ -34,6 +38,7 @@
mailuser_gid=5000
mailuser_name=vmail
mailuser_group=vmail
mailbox_virtual_uidgid_maps=n
relayhost=
relayhost_user=
relayhost_password=
@@ -45,6 +50,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 +58,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 +97,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