From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 7 Oct 2009 09:04:41 +0000 (+0000)
Subject: Updated mail config file position
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9f7e8cfd4e499f63dffdd5e83f892ee722128683;p=gosa.git

Updated mail config file position


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14554 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/mail/etc/mail/sieve-discard.txt b/gosa-plugins/mail/etc/mail/sieve-discard.txt
deleted file mode 100644
index 8ac4db68a..000000000
--- a/gosa-plugins/mail/etc/mail/sieve-discard.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not deliver to own mailbox
-discard;
-
diff --git a/gosa-plugins/mail/etc/mail/sieve-header.txt b/gosa-plugins/mail/etc/mail/sieve-header.txt
deleted file mode 100644
index 5222282e5..000000000
--- a/gosa-plugins/mail/etc/mail/sieve-header.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-###GOSA
-require ["fileinto", "reject", "vacation"];
-
diff --git a/gosa-plugins/mail/etc/mail/sieve-mailsize.txt b/gosa-plugins/mail/etc/mail/sieve-mailsize.txt
deleted file mode 100644
index de639c26c..000000000
--- a/gosa-plugins/mail/etc/mail/sieve-mailsize.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#  Reject mails with bigger size
-if size :over {$maxsize}M{
-        reject text:
-Dear sender,
-
-the mail you sent to our mailsystem has been rejected due
-to a user configured maximum mail size ($maxsize MB).
-
-Either ask the user to remove the sizelimit, or send smaller pieces.
-
-Thank you,
- the mailserver
-.
-        ;
-        discard;
-}
-
diff --git a/gosa-plugins/mail/etc/mail/sieve-spam.txt b/gosa-plugins/mail/etc/mail/sieve-spam.txt
deleted file mode 100644
index 63392d011..000000000
--- a/gosa-plugins/mail/etc/mail/sieve-spam.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Sort mails with higher spam level
-if header :contains "X-Spam-Level" "$spamlevel" {
-  fileinto "$spambox";
-}
-
diff --git a/gosa-plugins/mail/etc/mail/sieve-vacation.txt b/gosa-plugins/mail/etc/mail/sieve-vacation.txt
deleted file mode 100644
index 3aed3a916..000000000
--- a/gosa-plugins/mail/etc/mail/sieve-vacation.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Vacation message
-vacation :addresses [$addrlist]
-"$vacmsg" ;
-
diff --git a/gosa-plugins/mail/etc/mail/vacation_templates/vacation_example.txt b/gosa-plugins/mail/etc/mail/vacation_templates/vacation_example.txt
deleted file mode 100644
index 58cad1555..000000000
--- a/gosa-plugins/mail/etc/mail/vacation_templates/vacation_example.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-DESC: Funny message
-I am currently out at a job interview and will reply to you if I fail
-to get the position. Be prepared for my mood. In urgent cases you can
-reach me on the cell phone via %mobile or write a snail mail to:
-
-%homePostalAddress
-
-Greetings,
-%givenName %sn
diff --git a/gosa-plugins/mail/etc/sieve-discard.txt b/gosa-plugins/mail/etc/sieve-discard.txt
new file mode 100644
index 000000000..8ac4db68a
--- /dev/null
+++ b/gosa-plugins/mail/etc/sieve-discard.txt
@@ -0,0 +1,3 @@
+# Do not deliver to own mailbox
+discard;
+
diff --git a/gosa-plugins/mail/etc/sieve-header.txt b/gosa-plugins/mail/etc/sieve-header.txt
new file mode 100644
index 000000000..5222282e5
--- /dev/null
+++ b/gosa-plugins/mail/etc/sieve-header.txt
@@ -0,0 +1,3 @@
+###GOSA
+require ["fileinto", "reject", "vacation"];
+
diff --git a/gosa-plugins/mail/etc/sieve-mailsize.txt b/gosa-plugins/mail/etc/sieve-mailsize.txt
new file mode 100644
index 000000000..de639c26c
--- /dev/null
+++ b/gosa-plugins/mail/etc/sieve-mailsize.txt
@@ -0,0 +1,17 @@
+#  Reject mails with bigger size
+if size :over {$maxsize}M{
+        reject text:
+Dear sender,
+
+the mail you sent to our mailsystem has been rejected due
+to a user configured maximum mail size ($maxsize MB).
+
+Either ask the user to remove the sizelimit, or send smaller pieces.
+
+Thank you,
+ the mailserver
+.
+        ;
+        discard;
+}
+
diff --git a/gosa-plugins/mail/etc/sieve-spam.txt b/gosa-plugins/mail/etc/sieve-spam.txt
new file mode 100644
index 000000000..63392d011
--- /dev/null
+++ b/gosa-plugins/mail/etc/sieve-spam.txt
@@ -0,0 +1,5 @@
+# Sort mails with higher spam level
+if header :contains "X-Spam-Level" "$spamlevel" {
+  fileinto "$spambox";
+}
+
diff --git a/gosa-plugins/mail/etc/sieve-vacation.txt b/gosa-plugins/mail/etc/sieve-vacation.txt
new file mode 100644
index 000000000..3aed3a916
--- /dev/null
+++ b/gosa-plugins/mail/etc/sieve-vacation.txt
@@ -0,0 +1,4 @@
+# Vacation message
+vacation :addresses [$addrlist]
+"$vacmsg" ;
+
diff --git a/gosa-plugins/mail/etc/vacation/vacation_example.txt b/gosa-plugins/mail/etc/vacation/vacation_example.txt
new file mode 100644
index 000000000..58cad1555
--- /dev/null
+++ b/gosa-plugins/mail/etc/vacation/vacation_example.txt
@@ -0,0 +1,9 @@
+DESC: Funny message
+I am currently out at a job interview and will reply to you if I fail
+to get the position. Be prepared for my mood. In urgent cases you can
+reach me on the cell phone via %mobile or write a snail mail to:
+
+%homePostalAddress
+
+Greetings,
+%givenName %sn