From 1908ea4d1b60d514c11afbbc1a7f5c8e14a4f030 Mon Sep 17 00:00:00 2001 From: amnesia Date: Wed, 14 Aug 2013 12:53:50 +0000 Subject: [PATCH] =?utf8?q?Modification=20:=20passe=20par=20amavis=20pour?= =?utf8?q?=20les=20courriels=20=C3=A9mis=20localement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 + etc/nginx/site.d/shell/remote.sh | 0 etc/openssl/shell.heureux-cyclage.org/host.sh | 14 --- .../shell.heureux-cyclage.org/user.cfg | 14 --- etc/postfix/master.cf | 3 +- remote/ssh | 5 +- var/pub/openpgp/trustdb.gpg | Bin 1760 -> 1760 bytes .../crl.self-signed.pem | 26 +++--- .../crt+crl.self-signed.pem | 82 +++++++++--------- .../crt.self-signed.pem | 56 ++++++------ .../crt.self-signed.pem.asc | 28 +++--- .../x509/shell.heureux-cyclage.org/req.pem | 46 +++++----- 12 files changed, 127 insertions(+), 150 deletions(-) delete mode 100644 etc/nginx/site.d/shell/remote.sh delete mode 100644 etc/openssl/shell.heureux-cyclage.org/host.sh delete mode 100644 etc/openssl/shell.heureux-cyclage.org/user.cfg diff --git a/.gitmodules b/.gitmodules index dea3a2b..4efd167 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,9 @@ [submodule "lib/tool/openssl"] path = lib/tool/openssl url = git://git.autogeree.net/tool/openssl +[submodule "lib/tool/sh"] + path = lib/tool/sh + url = git://git.autogeree.net/tool/sh [submodule "etc/gitolite"] path = etc/gitolite url = git@ateliers.heureux-cyclage.org:gitolite-admin diff --git a/etc/nginx/site.d/shell/remote.sh b/etc/nginx/site.d/shell/remote.sh deleted file mode 100644 index e69de29..0000000 diff --git a/etc/openssl/shell.heureux-cyclage.org/host.sh b/etc/openssl/shell.heureux-cyclage.org/host.sh deleted file mode 100644 index d4e3518..0000000 --- a/etc/openssl/shell.heureux-cyclage.org/host.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -export x509_host="heureux-cyclage.org" -export x509_country="FR" -export x509_organization="L'Heureux Cyclage" -export x509_organization_unit_name="Le réseau des ateliers vélo participatifs et solidaires" -export x509_initials="LHC" -export x509_state_or_province="Rhône-Alpes" -export x509_locality="Lyon" -export x509_street_address="10 rue Saint Polycarpe" -export x509_postal_code="69001" -export x509_telephone_number="néant" -export x509_business_category="V1.0, ni dieu ni maître ni moteur" -export x509_days="3653" diff --git a/etc/openssl/shell.heureux-cyclage.org/user.cfg b/etc/openssl/shell.heureux-cyclage.org/user.cfg deleted file mode 100644 index ec3be96..0000000 --- a/etc/openssl/shell.heureux-cyclage.org/user.cfg +++ /dev/null @@ -1,14 +0,0 @@ - SERVICE = shell - HOME = . - RANDFILE = var/sec/x509/openssl.rand -[ req ] - prompt = no - distinguished_name = user_distinguished_name - string_mask = pkix -[ user_distinguished_name ] - countryName = $ENV::x509_country - stateOrProvinceName = $ENV::x509_state_or_province - #localityName = - 0.organizationName = $ENV::x509_organization - organizationalUnitName = Certificat utilisateurice du service Shell - commonName = $ENV::user diff --git a/etc/postfix/master.cf b/etc/postfix/master.cf index f004633..2e81be8 100644 --- a/etc/postfix/master.cf +++ b/etc/postfix/master.cf @@ -61,7 +61,8 @@ smtps inet n - - - - smtpd -o smtpd_tls_wrappermode=yes #628 inet n - - - - qmqpd pickup fifo n - - 60 1 pickup - #-o cleanup_service_name=pre-cleanup + -o cleanup_service_name=pre-cleanup + -o content_filter=amavis:[127.0.0.1]:10024 pre-cleanup unix n - - - 0 cleanup -o virtual_alias_maps= cleanup unix n - - - 0 cleanup diff --git a/remote/ssh b/remote/ssh index d6bea1e..2bacc68 100755 --- a/remote/ssh +++ b/remote/ssh @@ -2,15 +2,16 @@ tool=$(readlink -e "${0%/*}/..") . "$tool"/remote/lib.sh -install -d -m 750 \ +install -d -m 770 \ "$tool"/var/run \ "$tool"/var/run/ssh ssh \ -F "$tool"/etc/ssh/remote.conf \ -o ControlMaster=autoask \ -o ControlPath="$tool"/var/run/ssh/"%h-%p-%r" \ - -o ControlPersist=no \ -o HashKnownHosts=no \ -o StrictHostKeyChecking=yes \ -o UserKnownHostsFile="$tool"/etc/ssh/known_hosts \ "${@:-$local_ipv4}" +# NOTE: pas dans le ssh de squeeze : + #-o ControlPersist=no \ diff --git a/var/pub/openpgp/trustdb.gpg b/var/pub/openpgp/trustdb.gpg index 86cd72cbd1e29bf8be05f293de4f99f4291fdf3c..a7cb8180122fb25bb7be93e74bd52d48f786b439 100644 GIT binary patch delta 32 ncmaFB`+!%3F})z2nU#@|k%56Bh%3J{`F*FsL_^_?>O0v0i!uoW delta 32 mcmaFB`+!%3F})z2nUxU;7#IReggXO2&r+CZD7;a9CmR5Z&