1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
diff --git a/share/templates/amavisd.conf.tpl b/share/templates/amavisd.conf.tpl
index 1fa43fb..794292a 100644
--- a/share/templates/amavisd.conf.tpl
+++ b/share/templates/amavisd.conf.tpl
@@ -20,7 +20,7 @@ use strict;
\$mydomain = '$primary_domain'; # a convenient default for other settings
-\$MYHOME = '/var/spool/amavisd'; # a convenient default for other settings, -H
+\$MYHOME = '/var/spool/amavis'; # a convenient default for other settings, -H
\$TEMPBASE = "\$MYHOME/tmp"; # working directory, needs to exist, -T
\$ENV{TMPDIR} = \$TEMPBASE; # environment variable TMPDIR, used by SA, etc.
\$QUARANTINEDIR = undef; # -Q
@@ -32,8 +32,8 @@ use strict;
\$db_home = "\$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D
# \$helpers_home = "\$MYHOME/var"; # working directory for SpamAssassin, -S
-\$lock_file = "/var/run/amavisd/amavisd.lock"; # -L
-\$pid_file = "/var/run/amavisd/amavisd.pid"; # -P
+\$lock_file = "/var/run/amavis/amavisd.lock"; # -L
+\$pid_file = "/var/run/amavis/amavisd.pid"; # -P
#NOTE: create directories \$MYHOME/tmp, \$MYHOME/var, \$MYHOME/db manually
\$log_level = 9; # verbosity 0..5, -d
diff --git a/share/templates/cyrus.conf.tpl b/share/templates/cyrus.conf.tpl
--- a/share/templates/cyrus.conf.tpl
+++ b/share/templates/cyrus.conf.tpl
@@ -13,11 +13,11 @@
sieve cmd="timsieved" listen="sieve" prefork=0
- ptloader cmd="ptloader" listen="/var/lib/imap/ptclient/ptsock" prefork=0
+ ptloader cmd="ptloader" listen="/var/imap/ptclient/ptsock" prefork=0
- lmtpunix cmd="lmtpd" listen="/var/lib/imap/socket/lmtp" prefork=1
+ lmtpunix cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=1
- notify cmd="notifyd" listen="/var/lib/imap/socket/notify" proto="udp" prefork=1
+ notify cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
}
EVENTS {
diff --git a/share/templates/imapd.conf.tpl b/share/templates/imapd.conf.tpl
index 194135e..2d397a7 100644
--- a/share/templates/imapd.conf.tpl
+++ b/share/templates/imapd.conf.tpl
@@ -1,13 +1,13 @@ sendmail: /usr/sbin/sendmail
-configdirectory: /var/lib/imap
+configdirectory: /var/imap
partition-default: /var/spool/imap
admins: $admins
-sievedir: /var/lib/imap/sieve
+sievedir: /var/imap/sieve
sendmail: /usr/sbin/sendmail
sasl_pwcheck_method: saslauthd
sasl_mech_list: PLAIN LOGIN
allowplaintext: no
-tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
-tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd.pem
+tls_server_cert: /etc/ssl/private/localhost.pem
+tls_server_key: /etc/ssl/private/localhost.pem
# uncomment this if you're operating in a DSCP environment (RFC-4594)
# qosmarking: af13
auth_mech: pts
@@ -30,7 +30,7 @@ ldap_timeout: 10
ldap_time_limit: 10
unixhierarchysep: 1
virtdomains: userid
-annotation_definitions: /etc/imapd.annotations.conf
+annotation_definitions: /etc/cyrus/imapd.annotations.conf
sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy date index
allowallsubscribe: 0
allowusermoves: 1
diff --git a/share/templates/master.cf.tpl b/share/templates/master.cf.tpl
index 114dca1..2a9aa61 100644
--- a/share/templates/master.cf.tpl
+++ b/share/templates/master.cf.tpl
@@ -105,17 +105,17 @@ smtp-wallace unix - - n - 3 smtp
-o smtpd_authorized_xforward_hosts=127.0.0.0/8
recipient_policy unix - n n - - spawn
- user=kolab-n argv=$kolab_sap_executable_path --verify-recipient
+ user=kolab argv=$kolab_sap_executable_path --verify-recipient
recipient_policy_incoming unix - n n - - spawn
- user=kolab-n argv=$kolab_sap_executable_path --verify-recipient --allow-unauthenticated
+ user=kolab argv=$kolab_sap_executable_path --verify-recipient --allow-unauthenticated
sender_policy unix - n n - - spawn
- user=kolab-n argv=$kolab_sap_executable_path --verify-sender
+ user=kolab argv=$kolab_sap_executable_path --verify-sender
sender_policy_incoming unix - n n - - spawn
- user=kolab-n argv=$kolab_sap_executable_path --verify-sender --allow-unauthenticated
+ user=kolab argv=$kolab_sap_executable_path --verify-sender --allow-unauthenticated
submission_policy unix - n n - - spawn
- user=kolab-n argv=$kolab_sap_executable_path --verify-sender --verify-recipient
+ user=kolab argv=$kolab_sap_executable_path --verify-sender --verify-recipient
diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index 7206a09..b8505e0 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -7,8 +7,8 @@
\$config['des_key'] = "$des_key";
\$config['username_domain'] = '$primary_domain';
\$config['use_secure_urls'] = true;
- \$config['assets_path'] = '/roundcubemail/assets/';
- \$config['assets_dir'] = '/usr/share/roundcubemail/public_html/assets/';
+ \$config['assets_path'] = '.';
+ \$config['assets_dir'] = '/usr/share/webapps/roundcubemail/';
\$config['mail_domain'] = '';
@@ -150,8 +150,8 @@
\$config['mime_magic'] = null;
\$config['im_identify_path'] = '/usr/bin/identify';
\$config['im_convert_path'] = '/usr/bin/convert';
- \$config['log_dir'] = 'logs/';
- \$config['temp_dir'] = '/var/lib/roundcubemail/';
+ \$config['log_dir'] = '/var/log/roundcubemail/';
+ \$config['temp_dir'] = '/var/cache/roundcubemail/';
// Some additional default folders (archive plugin)
\$config['archive_mbox'] = 'Archive';
--- a/share/templates/guam.sys.config.tpl 2016-02-18 21:09:16.817470574 +0100
+++ b/share/templates/guam.sys.config.tpl 2016-02-18 21:09:37.884137342 +0100
@@ -26,7 +26,7 @@
},
{
tls_config, [
- { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
+ { certfile, "/etc/ssl/private/localhost.pem" }
]
}
]
@@ -43,7 +43,7 @@
},
{
tls_config, [
- { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
+ { certfile, "/etc/ssl/private/localhost.pem" }
]
}
]
|