diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-10-29 20:46:21 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-10-29 20:46:21 +0000 |
commit | 5bc3ba824d7bb548a5ed264a4b1366294f7abd2d (patch) | |
tree | f6c10e9696a43b04696fec97821c337c9965ca3d /mc | |
parent | df4a2a61ce0cde5190def22309e9807cb5a56ab0 (diff) | |
download | gsc-5bc3ba824d7bb548a5ed264a4b1366294f7abd2d.tar.gz gsc-5bc3ba824d7bb548a5ed264a4b1366294f7abd2d.tar.bz2 |
Improve gnupload.
* upload/gnupload: Allow user@download.gnu.org.ua as a target.
Use canonical hostname (download.gnu.org.ua).
Remove obsolete modules.
* cvs/sv_logger: Remove.
* mc: Remove.
* fsf-move/fsf-move: Use `tar cf' to check for its presence.
* cvs/sv_sync_www_schedule: Use logger
* cvs/sv_www_loginfo: Likewise.
* doc/gsc.texi: Update.
git-svn-id: file:///svnroot/gsc/trunk@340 d2de0444-eb31-0410-8365-af798a554d48
Diffstat (limited to 'mc')
-rw-r--r-- | mc/Makefile.am | 35 | ||||
-rw-r--r-- | mc/common.mc | 28 | ||||
-rw-r--r-- | mc/mirddin.mc | 49 | ||||
-rw-r--r-- | mc/relay1.mc | 111 | ||||
-rw-r--r-- | mc/relay2.mc | 58 | ||||
-rw-r--r-- | mc/trurl.mc | 43 | ||||
-rw-r--r-- | mc/ulysses.mc | 52 |
7 files changed, 0 insertions, 376 deletions
diff --git a/mc/Makefile.am b/mc/Makefile.am deleted file mode 100644 index 2905bfc..0000000 --- a/mc/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -MCFILES=relay1.mc relay2.mc trurl.mc ulysses.mc -EXTRA_DIST=$(MCFILES) -SUFFIXES=.mc .cf - -cf: $(MCFILES:.mc=.cf) - -#ifeq (.sendmail,$(wildcard .sendmail)) -#include .sendmail -#endif - -clean:; rm -f *.cf - -.mc.cf: - @if [ -n "$$CFDIR" ]; then \ - :; \ - elif [ -z "$(SENDMAIL_CFDIR)" ]; then \ - if [ -n "$(SENDMAIL_VERSION)" ]; then \ - for dir in /usr/src /usr/local/src ;\ - do \ - if [ -r $${dir}/sendmail-$(SENDMAIL_VERSION)/cf/cf/Makefile ];\ - then \ - CFDIR=$${dir}/sendmail-$(SENDMAIL_VERSION)/cf; \ - break; \ - fi; \ - done; \ - fi ; \ - if [ -z "$$CFDIR" ]; then \ - echo "Neither SENDMAIL_CFDIR nor SENDMAIL_VERSION set." >&2; \ - echo "Use --with-sendmail-cfdir --with-sendmail-version when configuring" >&2; \ - exit 1; \ - fi; \ - else \ - CFDIR=$(SENDMAIL_CFDIR);\ - fi;\ - $(MAKE) -f $$CFDIR/cf/Makefile CFDIR=$$CFDIR $@ diff --git a/mc/common.mc b/mc/common.mc deleted file mode 100644 index 756cb94..0000000 --- a/mc/common.mc +++ /dev/null @@ -1,28 +0,0 @@ -divert(0) -# $Id$ -divert(-1) -dnl * To eliminate 8->7 bit base64 enconding -define(`SMTP_MAILER_FLAGS',`8') - -dnl * Do not reveal my version number -define(`confRECEIVED_HEADER',`$?sfrom $s $.$?_($?s$|from $.$_) $. - by $j$?r with $r$. id $i$?u - for $u$.; $b') -dnl * Also, disable HELP,VRFY,EXPN -define(`HELP_FILE',`none') -define(`confSMTP_LOGIN_MSG',`$j Sendmail; $b') -define(`confPRIVACY_FLAGS',`authwarnings,novrfy,noexpn,noetrn,needmailhelo') - -define(`confMAX_MESSAGE_SIZE',`5242880') - -dnl * File names -define(`ALIAS_FILE', `/etc/mail/aliases') -define(`STATUS_FILE', `/etc/mail/sendmail.st') -define(`confCW_FILE', `-o /etc/mail/sendmail.cw') -define(`confFORWARD_PATH', `$z/.forward:$z/.forward.$w') - -dnl * MSA settings -DAEMON_OPTIONS(`Name=MTA,Addr=0.0.0.0') -FEATURE(`no_default_msa') -DAEMON_OPTIONS(`Port=587,Addr=127.0.0.1, Name=MSA, M=E') - diff --git a/mc/mirddin.mc b/mc/mirddin.mc deleted file mode 100644 index 9de9c84..0000000 --- a/mc/mirddin.mc +++ /dev/null @@ -1,49 +0,0 @@ -dnl * Sendmail configuration for Mirddin -divert(-1) - -VERSIONID(`$Id$') -OSTYPE(linux)dnl - -define(`confCF_VERSION',`Mirddin-Gray-$Revision$') - -LOCAL_CONFIG -# Additional header -HOrganization: Err, what do you mean? -HX-Mailutils-Message-Id: $i$?u -DUmirddin -Cwmirddin - -dnl * Include common defaults -include(common.mc) - -dnl * Site-specific defines -define(`confTO_COMMAND', `10m') -define(`confMAX_DAEMON_CHILDREN',`64') -define(`confCONNECTION_RATE_THROTTLE',`64') -define(`confFALLBACK_MX',`relay1.farlep.net') - -dnl * Features -FEATURE(use_cw_file) -FEATURE(redirect) -FEATURE(always_add_domain) -FEATURE(access_db, hash -T<TMPF> -o /etc/mail/access) -FEATURE(mailertable, hash -o /etc/mail/xroutes) -FEATURE(domaintable, hash -o /etc/mail/domains) -FEATURE(virtusertable, hash -o /etc/mail/virtusers) -FEATURE(blacklist_recipients) -FEATURE(relay_hosts_only) -FEATURE(dnsbl, `rbl.maps.vix.com') -FEATURE(dnsbl, `rbl.farlep.net') -FEATURE(dnsbl, `dialup-rev.farlep.net') - -dnl * Mail filters -dnl include(mirddin.milter) - -dnl * Mailers -undefine(`LOCAL_MAILER_PATH') -undefine(`_DEF_LOCAL_MAILER_FLAGS') -define(`LOCAL_MAILER_PATH', `/usr/local/libexec/mail.local') -define(`LOCAL_MAILER_ARGS', `mail.local -xl -S %h/.mailutils/filter.sv $u') -MAILER(local) -MAILER(smtp) - diff --git a/mc/relay1.mc b/mc/relay1.mc deleted file mode 100644 index 042c5ce..0000000 --- a/mc/relay1.mc +++ /dev/null @@ -1,111 +0,0 @@ -dnl * Sendmail configuration for Relay1 - -divert(-1) - -VERSIONID(`$Id$') -OSTYPE(linux)dnl - -define(`confCF_VERSION',`Relay1 $Revision$') - -LOCAL_CONFIG -# Additional header -HOrganization: Farlep-Internet -DUsun -Cwsun - -dnl * Include common defaults -include(common.mc) - -dnl * Site-specific settings -define(`confMAX_DAEMON_CHILDREN',`256') -define(`confCONNECTION_RATE_THROTTLE',`128') - -dnl * Features -FEATURE(use_cw_file) -FEATURE(redirect) -FEATURE(always_add_domain) -FEATURE(access_db, hash -o /etc/mail/access -T<TMPF>) -FEATURE(mailertable, hash -o /etc/mail/xroutes) -FEATURE(domaintable, hash -o /etc/mail/domains) -FEATURE(virtusertable, hash -o /etc/mail/virtusers) -FEATURE(relay_entire_domain) -FEATURE(blacklist_recipients) - -dnl * RBL configuration -FEATURE(dnsbl,`dialups.mail-abuse.org',` Mail from dial-up rejected; see http://mail-abuse.org/dul/enduser.htm') -FEATURE(dnsbl, `rbl.farlep.net', ` Stop SPAM from this host') -FEATURE(dnsbl, `dyn-rbl.farlep.net', ` E-Cards are not allowed to use SMTP') - -PUSHDIVERT(8) -# Allow all addresses from our dialup pool -R$* $: $&{client_addr} -R::ffff:$-.$-.$-.$- $: OKSOFAR -R$-.$-.$-.$- $: <?> $(host $4.$3.$2.$1.dialup-rev.farlep.net. $: OK $) -R<?>OK $: OKSOFAR -R<?>$* $@ OKSOFAR - -# Jebem ti dusu -R$* $: $&{client_addr} -R::ffff:$-.$-.$-.$- $: OKSOFAR -R213.130.1.225 $@ OKSOFAR - -POPDIVERT - -FEATURE(dnsbl, `bl.spamcop.net', ` "Spam blocked; see http://spamcop.net/bl.shtml?"$&{client_addr}') - -include(`milter.conf') - -dnl * ******************************************************* -dnl * Defines for local mailer with quota checking -dnl * Current mailbox quota is 5mB -undefine(`LOCAL_MAILER_PATH') -dnl undefine(`_DEF_LOCAL_MAILER_FLAGS') -dnl define(`_DEF_LOCAL_MAILER_FLAGS', `lsDFMA5:/|@q') -dnl define(`LOCAL_MAILER_FLAGS', `SPfhn9') - -define(`LOCAL_MAILER_PATH', `/usr/local/libexec/mail.local') -define(`SQL_LOCAL_MAILER_PATH', `/usr/local/libexec/mail.local') -define(`LOCAL_MAILER_ARGS', `mail -q /etc/mail/userquota -S /home/%u/.filter.scm $u') - -MAILER(local) - -dnl * Other mailers -MAILER(smtp) - -dnl * Local configuration -LOCAL_CONFIG -F{Trusted_Hosts}/etc/mail/trusted_hosts -FB/etc/mail/accounts -Kdialup host -T<TEMP> -Kgetpwnam user - -Mlocal-sql, P=/usr/local/libexec/mail.local, F=lsDFMA5:/|@qSPfhn9, S=EnvFromL/HdrFromL, R=EnvToL/HdrToL, - T=DNS/RFC822/X-Unix, - A=mail.local -S /var/spool/filter/%u $u - - -LOCAL_RULESETS - -SLocal_check_rcpt -# check address against various regex checks -R$* $: $>Parse0 $1 -R< $* > $: $1 -R$=B @ $m $@ $| $>"Local_check_allusers" $1 -R$=B @ $=m $#error $: "550 Intet slikt bruker" -R$=B @ $=w $#error $: "550 Intet slikt bruker" - -SLocal_check_allusers -# check IP address/sender name -R$* $: $1:$&{client_addr}:$&f -R$={Trusted_Hosts} $@ OK -R$* $: ALL:$&{client_addr}:$&f -R$={Trusted_Hosts} $@ OK -# anything else is bogus -R$* $#error $: "550 Ikke tilgjengelig" - -SLocal_localaddr -R$+ $: $1 $| $(getpwnam $1 $: USER $) -R$+ $| USER $: $>MailerToTriple < local-sql: $1 > $1 -R$* $: $1 - - diff --git a/mc/relay2.mc b/mc/relay2.mc deleted file mode 100644 index dd324a9..0000000 --- a/mc/relay2.mc +++ /dev/null @@ -1,58 +0,0 @@ -dnl * Sendmail configuration for tor.farlep.net - -divert(-1) - -VERSIONID(`$Id$') -OSTYPE(linux)dnl - -define(`confCF_VERSION',`Relay2 $Revision$') - -LOCAL_CONFIG -# Additional header -HOrganization: ISP Farlep (Odessa) -DUtor -Cwtor - -dnl * Include common defaults -include(common.mc) - -dnl * Site-specific settings -define(`confMAX_DAEMON_CHILDREN',`256') -define(`confCONNECTION_RATE_THROTTLE',`128') - -dnl * Features -FEATURE(use_cw_file) -FEATURE(redirect) -FEATURE(always_add_domain) -FEATURE(access_db, hash -o -T<TMPF> /etc/mail/access) -FEATURE(mailertable, hash -o /etc/mail/xroutes) -FEATURE(domaintable, hash -o /etc/mail/domains) -FEATURE(blacklist_recipients) -FEATURE(relay_entire_domain) - -dnl * RBL configuration - -FEATURE(dnsbl, `dyn-rbl.farlep.net', `"E-Cards are not allowed to use SMTP"') - -PUSHDIVERT(8) -# Allow all addresses from our dialup pool -R$* $: $&{client_addr} -R::ffff:$-.$-.$-.$- $: OKSOFAR -R$-.$-.$-.$- $: <?> $(host $4.$3.$2.$1.dialup-rev.farlep.net. $: OK $) -R<?>OK $: OKSOFAR -R<?>$* $@ OKSOFAR -POPDIVERT - -FEATURE(dnsbl, `rbl.farlep.net', `"Stop SPAM from this host"') -FEATURE(dnsbl, `bl.spamcop.net', `"Spam blocked see; http://spamcop.net/bl.shtml?"$&{client_addr}') - -dnl * Milter configuration -include(`milter.conf') - -dnl * Mailers -undefine(`LOCAL_MAILER_PATH') -define(`LOCAL_MAILER_PATH', `/usr/libexec/mail.local') -define(`LOCAL_MAILER_ARGS', `Mail -xt -S /home/%u/.sieve $u') - -MAILER(local) -MAILER(smtp) diff --git a/mc/trurl.mc b/mc/trurl.mc deleted file mode 100644 index a89701f..0000000 --- a/mc/trurl.mc +++ /dev/null @@ -1,43 +0,0 @@ -dnl * Sendmail configuration for trurl.gnu.org.ua - -divert(-1) - -VERSIONID(`$Id$') -OSTYPE(linux)dnl - -define(`confCF_VERSION',`Trurl.gnu.org.ua $Revision$') - -# Additional header -HOrganization: GNU.ORG.UA -DUtrurl -Cwtrurl - -dnl * Include common defaults -include(common.mc) -dnl include(`milter.conf') - -dnl * Features -FEATURE(use_cw_file) -FEATURE(redirect) -FEATURE(always_add_domain) -FEATURE(access_db, hash -o /etc/mail/access -T<TMPF>) -FEATURE(mailertable, hash -o /etc/mail/xroutes) -FEATURE(domaintable, hash -o /etc/mail/domains) -FEATURE(virtusertable, hash -o /etc/mail/virtusers) -FEATURE(relay_hosts_only) -FEATURE(blacklist_recipients) -dnl FEATURE(dnsbl, `rbl.maps.vix.com') -dnl FEATURE(dnsbl, `rbl.farlep.net') -dnl FEATURE(dnsbl, `dialup-rev.farlep.net') - -dnl * Mailers -undefine(`LOCAL_MAILER_PATH') -define(`LOCAL_MAILER_PATH', `/usr/local/sbin/maidag') -define(`LOCAL_MAILER_ARGS', `maidag -xl --lang=sieve -s %h/.filter.sv $u') - -MAILER(local) -MAILER(smtp) - -dnl * Identification string for maidag/Sieve log messages. -LOCAL_CONFIG -HX-Mailutils-Message-Id: $i$?u diff --git a/mc/ulysses.mc b/mc/ulysses.mc deleted file mode 100644 index ae8b667..0000000 --- a/mc/ulysses.mc +++ /dev/null @@ -1,52 +0,0 @@ -dnl * Sendmail configuration for Ulysses - -divert(-1) - -VERSIONID(`$Id$') -OSTYPE(linux)dnl - -define(`confCF_VERSION',`Ulysses.gnu.org.ua $Revision$') - -LOCAL_CONFIG -dnl * Identification string for mail.local/Sieve log messages. -HX-Mailutils-Message-Id: $i$?u -# Additional header -HOrganization: GNU.org.ua -DUulysses -Cwulysses - -dnl * Include common defaults -include(common.mc) - -dnl define(`confFALLBACK_MX',`relay1.farlep.net') - -dnl * Features -FEATURE(use_cw_file) -FEATURE(redirect) -FEATURE(always_add_domain) -FEATURE(access_db, hash -T<TMPF> -o /etc/mail/access) -FEATURE(mailertable, hash -o /etc/mail/xroutes) -FEATURE(domaintable, hash -o /etc/mail/domains) -FEATURE(virtusertable, hash -o /etc/mail/virtusers) -FEATURE(blacklist_recipients) -FEATURE(relay_hosts_only) -FEATURE(dnsbl, `rbl.maps.vix.com') -FEATURE(dnsbl, `rbl.farlep.net') -FEATURE(dnsbl, `dialup-rev.farlep.net') - -dnl * Mailers -undefine(`LOCAL_MAILER_PATH') -undefine(`_DEF_LOCAL_MAILER_FLAGS') -define(`LOCAL_MAILER_PATH', `/usr/local/libexec/mail.local') -define(`LOCAL_MAILER_ARGS', `mail.local -xl -S%h/.mailutils/filter.sv $u') -MAILER(local) -MAILER(smtp) - -dnl * Mail filters -include(ulysses.milter) - -LOCAL_RULESETS - -SLocal_localaddr -Rtempfail+mailfromd-test $#error $@ 4.7.0 $: "450 Temporarily not available [Mailfromd test suite]" - |