Welcome mail is now from nobody@example.com

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index d238ff90cfd64b371d92bf93a1b22af3329fe531..1c8dc1a8fca34d4b9b1c0fed6ac88d0506c7514b 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -74,7 +74,7 @@ case "$1" in
                export SEPERATOR=2600908b3f21ae7f692b973ed26e212d
                export WELCOMEHTML=/usr/share/doc/citadel-server/welcomemail.html
                export WELCOMETXT=/usr/share/doc/citadel-server/welcomemail.txt
-               export FROM=room_citadel_stats@uncensored.citadel.org
+               export FROM=nobody@example.com
                export TO=room_lobby
                (
                     printf "MIME-Version: 1.0\r\nContent-Type: multipart/alternative; \r\n boundary=$SEPERATOR\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n--$SEPERATOR\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"; 

diff --git a/citadel/docs/welcomemail.html b/citadel/docs/welcomemail.html
index 5fbcaf2b0be81ffe97fe9a241726e0e928b781cf..e255e8c27f56c8504d73d04db9f07881bcfd0a5f 100644 (file)
--- a/citadel/docs/welcomemail.html
+++ b/citadel/docs/welcomemail.html
@@ -50,8 +50,8 @@ If Webcit does not yet speak your language, please tell us at
 Room, where you will be welcomed and encouraged to add a translation Working \r
 contributions in various forms are always welcome, in fact, so feel free to \r
 join us in improving the Citadel system!<br>\r
-Enjoying Citadel? Please let us know. Just reply to this email, or log into \r
-<a href="https://uncensored.citadel.org/">Uncensored!</a> and drop us a note! <br>\r
+Enjoying Citadel? Please let us know. Just log into \r
+<a href="http://uncensored.citadel.org/">Uncensored!</a> and drop us a note! <br>\r
 <br>\r
 \r
 Your Citadel Development Team <br>\r

diff --git a/citadel/docs/welcomemail.txt b/citadel/docs/welcomemail.txt
index 18db363943d20fb4f4f31ac7dfc67416be51ba5c..f5777aa3f75e4465182cb5bad60cd3be0024d082 100644 (file)
--- a/citadel/docs/welcomemail.txt
+++ b/citadel/docs/welcomemail.txt
@@ -35,7 +35,7 @@
    and encouraged to add a translation Working contributions in various forms
    are always welcome, in fact, so feel free to join us in improving the
    Citadel system!
-   Enjoying Citadel? Please let us know. Just reply to this email, or log
+   Enjoying Citadel? Please let us know. Just log
    into [9]Uncensored! and drop us a note!
 
    Your Citadel Development Team
@@ -47,11 +47,11 @@ References
    Visible links
    1. http://www.groupdav.org/
    2. http://www.citadel.org/clientmatrix
-   3. https://uncensored.citadel.org/
+   3. http://uncensored.citadel.org/
    4. http://citadel.org/index.php?option=com_content&task=section&id=3&Itemid=38
    5. http://easyinstall.citadel.org/citadel/docs/citadel.html
-   6. https://uncensored.citadel.org/
+   6. http://uncensored.citadel.org/
    7. irc://irc.citadel.org/#citadel
-   8. https://uncensored.citadel.org/
-   9. https://uncensored.citadel.org/
+   8. http://uncensored.citadel.org/
+   9. http://uncensored.citadel.org/
   10. http://en.wikipedia.org/wiki/Citadel/UX

diff --git a/citadel/sendwelcomemail.sh b/citadel/sendwelcomemail.sh
index f1ac8c1783cf83771905d92db877cdd5d8f8d54e..432b13135d66889af23d2c9e2335c7cdd0af53ad 100644 (file)
--- a/citadel/sendwelcomemail.sh
+++ b/citadel/sendwelcomemail.sh
@@ -4,7 +4,7 @@
 export FOO=2600908b3f21ae7f692b973ed26e212d
 export WELCOMEHTML=welcomemail.html
 export WELCOMETXT=welcomemail.txt
-export FROM=room_citadel_stats@uncensored.citadel.org
+export FROM=nobody@example.com
 export TO=room_lobby
 (
     printf "MIME-Version: 1.0\r\nContent-Type: multipart/alternative; \r\n boundary=$FOO\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n--$FOO\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n";