From c16d7bde4493b78a2f09188b7d7286e5c82dbdd5 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 6 Jun 2013 02:18:30 +0200 Subject: server sendmail: add jogamp.org config files to better keep track of changes --- server/setup/05-service-settings/etc/mail/access | 8 ++--- .../05-service-settings/etc/mail/local-host-names | 12 ++------ .../setup/05-service-settings/etc/mail/sendmail.mc | 23 +++++++-------- .../05-service-settings/etc/mail/virtusertable | 34 ++-------------------- 4 files changed, 19 insertions(+), 58 deletions(-) (limited to 'server/setup/05-service-settings') diff --git a/server/setup/05-service-settings/etc/mail/access b/server/setup/05-service-settings/etc/mail/access index b5f0643..bba473b 100644 --- a/server/setup/05-service-settings/etc/mail/access +++ b/server/setup/05-service-settings/etc/mail/access @@ -102,10 +102,10 @@ ClientConn:IPv6:::1 0 #ClientRate:192.168 0 #ClientConn:192.168 0 -Connect:144.76.84.102 RELAY -Connect:2a01:4f8:192:1165::2 RELAY -GreetPause:144.76.84.102 0 -GreetPause:2a01:4f8:192:1165::2 0 +Connect:144.76.84.101 RELAY +Connect:2a01:4f8:192:1164::2 RELAY +GreetPause:144.76.84.101 0 +GreetPause:2a01:4f8:192:1164::2 0 # Defaults GreetPause: 5000 diff --git a/server/setup/05-service-settings/etc/mail/local-host-names b/server/setup/05-service-settings/etc/mail/local-host-names index 5261b0b..9d3732d 100644 --- a/server/setup/05-service-settings/etc/mail/local-host-names +++ b/server/setup/05-service-settings/etc/mail/local-host-names @@ -1,10 +1,4 @@ localhost -jausoft.com -mail.jausoft.com -mcp.jausoft.com -www.jausoft.com -www.jausoft.org -www.jausoft.net -jausoft.com -jausoft.org -jausoft.net +mail.jogamp.org +www.jogamp.org +jogamp.org diff --git a/server/setup/05-service-settings/etc/mail/sendmail.mc b/server/setup/05-service-settings/etc/mail/sendmail.mc index 32ec569..704e4da 100644 --- a/server/setup/05-service-settings/etc/mail/sendmail.mc +++ b/server/setup/05-service-settings/etc/mail/sendmail.mc @@ -53,7 +53,7 @@ dnl # Uncomment and edit the following line if your outgoing mail needs to dnl # be sent out through an external mail server: dnl # dnl define(`SMART_HOST', `smtp.your.provider')dnl -dnl define(`SMART_HOST', `smtp:mail.jausoft.com')dnl +dnl define(`SMART_HOST', `smtp:mail.jogamp.org')dnl dnl define(`RELAY_MAILER_ARGS', `TCP $h 26')dnl dnl # define(`confDEF_USER_ID', ``8:12'')dnl @@ -84,17 +84,17 @@ dnl # FEATURE(`no_default_msa')dnl DAEMON_OPTIONS(`Family=inet6, Name=MTA-v6, Port=smtp, Addr=::1')dnl -DAEMON_OPTIONS(`Family=inet6, Name=MTA-v6, Port=smtp, Addr=2a01:4f8:192:1165::2')dnl +DAEMON_OPTIONS(`Family=inet6, Name=MTA-v6, Port=smtp, Addr=2a01:4f8:192:1164::2')dnl DAEMON_OPTIONS(`Family=inet, Name=MTA-v4, Port=smtp, Addr=127.0.0.1')dnl -DAEMON_OPTIONS(`Family=inet, Name=MTA-v4, Port=smtp, Addr=144.76.84.102')dnl +DAEMON_OPTIONS(`Family=inet, Name=MTA-v4, Port=smtp, Addr=144.76.84.101')dnl DAEMON_OPTIONS(`Family=inet6, Name=MSP-v6, Port=submission, M=Ea, Addr=::1')dnl DAEMON_OPTIONS(`Family=inet, Name=MSP-v4, Port=submission, M=Ea, Addr=127.0.0.1')dnl DAEMON_OPTIONS(`Family=inet6, Name=TLSMTA-v6, Port=smtps, M=Eas, Addr=::1')dnl -DAEMON_OPTIONS(`Family=inet6, Name=TLSMTA-v6, Port=smtps, M=Eas, Addr=2a01:4f8:192:1165::2')dnl +DAEMON_OPTIONS(`Family=inet6, Name=TLSMTA-v6, Port=smtps, M=Eas, Addr=2a01:4f8:192:1164::2')dnl DAEMON_OPTIONS(`Family=inet, Name=TLSMTA-v4, Port=smtps, M=Eas, Addr=127.0.0.1')dnl -DAEMON_OPTIONS(`Family=inet, Name=TLSMTA-v4, Port=smtps, M=Eas, Addr=144.76.84.102')dnl +DAEMON_OPTIONS(`Family=inet, Name=TLSMTA-v4, Port=smtps, M=Eas, Addr=144.76.84.101')dnl dnl # dnl # Be somewhat anal in what we allow @@ -133,10 +133,10 @@ dnl define(`confCRL', `/etc/ssl/local/ca-my.crl')dnl dnl define(`confSERVER_CERT', `/etc/pki/tls/certs/sendmail.pem')dnl dnl define(`confSERVER_KEY', `/etc/pki/tls/certs/sendmail.pem')dnl define(`confCACERT', `/etc/ssl/local/thawte-SSL123_CA_Bundle.pem')dnl -define(`confSERVER_CERT', `/etc/ssl/local/jausoft2013-hostcert.pem')dnl -define(`confSERVER_KEY', `/etc/ssl/local/jausoft2013-hostkey.mail.pem')dnl -define(`confCLIENT_CERT', `/etc/ssl/local/jausoft2013-hostcert.pem')dnl -define(`confCLIENT_KEY', `/etc/ssl/local/jausoft2013-hostcert.pem')dnl +define(`confSERVER_CERT', `/etc/ssl/local/jogamp2013-hostcert.pem')dnl +define(`confSERVER_KEY', `/etc/ssl/local/jogamp2013-hostkey.mail.pem')dnl +define(`confCLIENT_CERT', `/etc/ssl/local/jogamp2013-hostcert.pem')dnl +define(`confCLIENT_KEY', `/etc/ssl/local/jogamp2013-hostcert.pem')dnl dnl # dnl define(`confTO_QUEUEWARN', `4h')dnl dnl define(`confTO_QUEUERETURN', `5d')dnl @@ -159,10 +159,7 @@ FEATURE(`virtusertable', `hash -o /etc/mail/virtusertable.db')dnl FEATURE(redirect)dnl FEATURE(always_add_domain)dnl dnl # Masquerading options -MASQUERADE_AS(`jausoft.com')dnl -dnl MASQUERADE_AS(`jausoft.net')dnl -dnl MASQUERADE_DOMAIN(`jordan.goethel.localnet')dnl -dnl MASQUERADE_DOMAIN(`goethel.localnet')dnl +MASQUERADE_AS(`jogamp.org')dnl dnl FEATURE(`allmasquerade')dnl FEATURE(`masquerade_envelope')dnl FEATURE(`masquerade_entire_domain')dnl diff --git a/server/setup/05-service-settings/etc/mail/virtusertable b/server/setup/05-service-settings/etc/mail/virtusertable index af7dcd0..bd29dde 100644 --- a/server/setup/05-service-settings/etc/mail/virtusertable +++ b/server/setup/05-service-settings/etc/mail/virtusertable @@ -1,33 +1,3 @@ -jausoft@jausoft.com sgothel -root@jausoft.com sgothel -postmaster@jausoft.com sgothel -webmaster@jausoft.com sgothel -info@jausoft.com sgothel -admin@jausoft.com sgothel -jogl@jausoft.com sgothel -jogamp@jausoft.com sgothel +mediastream@jogamp.org mediastream -sven@jausoft.com sgothel -sven.gothel@jausoft.com sgothel -sgothel@jausoft.com sgothel -sgothel01@jausoft.com sgothel -sgothel02@jausoft.com sgothel -sgothel03@jausoft.com sgothel -sgothel04@jausoft.com sgothel -jau@jausoft.com sgothel -svende@jausoft.com sgothel -fax@jausoft.com sgothel - -qgothel@jausoft.com qgothel -qzhang@jausoft.com qgothel -qun@jausoft.com qgothel - -kgothel@jausoft.com kgothel -kirstingothel@jausoft.com kgothel -kirstingoethel@jausoft.com kgothel - -rsantina@jausoft.com rsantina -wbaumann@jausoft.com wbaumann - -@jausoft.com nirvana -@jausoft.ca nirvana +@jogamp.org nirvana -- cgit v1.2.3