- FHS 2.1 /var/state -> /var/lib

Changed files:
    cyrus-imapd-pop.pamd -> 1.3
    cyrus-imapd.conf -> 1.2
    cyrus-imapd.pamd -> 1.3

diff --git a/cyrus-imapd-pop.pamd b/cyrus-imapd-pop.pamd
index ff87c539e02a56be5e88ff4100f40085bf13a97b..05975cf5c468a64552bb0b7b0f714613c1c8b251 100644 (file)
--- a/cyrus-imapd-pop.pamd
+++ b/cyrus-imapd-pop.pamd
@@ -2,8 +2,8 @@
 auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist onerr=succeed
 auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist.pop onerr=succeed
 auth           required        /lib/security/pam_unix.so
-auth           required        /lib/security/pam_tally.so file=/var/state/imap/faillog onerr=succeed no_magic_root
+auth           required        /lib/security/pam_tally.so file=/var/lib/imap/faillog onerr=succeed no_magic_root
 auth           required        /lib/security/pam_nologin.so
-account                required        /lib/security/pam_tally.so deny=0 file=/var/state/imap/faillog onerr=succeed no_magic_root
+account                required        /lib/security/pam_tally.so deny=0 file=/var/lib/imap/faillog onerr=succeed no_magic_root
 #account               required        /lib/security/pam_access.so
 account                required        /lib/security/pam_unix.so

diff --git a/cyrus-imapd.conf b/cyrus-imapd.conf
index d295d5f1a44b4a170922312ee4834ae98ce01c14..f953bcb0b64bec650c3b6eae641e1700e48502dd 100644 (file)
--- a/cyrus-imapd.conf
+++ b/cyrus-imapd.conf
@@ -1,9 +1,9 @@
-configdirectory: /var/state/imap
+configdirectory: /var/lib/imap
 partition-default: /var/spool/imap
 admins: root
 allowanonymouslogin: no
 sieveuserhomedir: no
-sievedir: /var/state/imap/sieve
+sievedir: /var/lib/imap/sieve
 hashimapspool: yes
 umask: 077
 quotawarn: 90

diff --git a/cyrus-imapd.pamd b/cyrus-imapd.pamd
index a46c03fcdc38faf55f0eddfe4b97fca59625c357..0301f21351b8a4aa5a98f2ee486c270c341bdf5f 100644 (file)
--- a/cyrus-imapd.pamd
+++ b/cyrus-imapd.pamd
@@ -2,8 +2,8 @@
 auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist onerr=succeed
 auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist.imap onerr=succeed
 auth           required        /lib/security/pam_unix.so
-auth           required        /lib/security/pam_tally.so file=/var/state/imap/faillog onerr=succeed no_magic_root
+auth           required        /lib/security/pam_tally.so file=/var/lib/imap/faillog onerr=succeed no_magic_root
 auth           required        /lib/security/pam_nologin.so
-account                required        /lib/security/pam_tally.so deny=0 file=/var/state/imap/faillog onerr=succeed no_magic_root
+account                required        /lib/security/pam_tally.so deny=0 file=/var/lib/imap/faillog onerr=succeed no_magic_root
 #account               required        /lib/security/pam_access.so
 account                required        /lib/security/pam_unix.so