Browse Source

kaz et claws aux bons endroits

pull/1/head
Francois Lesueur 2 years ago
parent
commit
a84600e42a
  1. 3
      files/kaz/config/container-mail.list
  2. 1
      files/kaz/config/container-orga.list
  3. 1
      files/kaz/config/container-proxy.list
  4. 9
      files/kaz/config/container-withMail.list
  5. 10
      files/kaz/config/container-withoutMail.list
  6. 120
      files/kaz/config/dockers.env
  7. 0
      files/snster-kaz/isp-a/home/clawsmail/addclawsuser.sh
  8. 0
      files/snster-kaz/isp-a/home/clawsmail/claws-mail/accountrc
  9. 0
      files/snster-kaz/isp-a/home/clawsmail/claws-mail/accountrc.tmpl
  10. 0
      files/snster-kaz/isp-a/home/clawsmail/claws-mail/clawsrc
  11. 0
      files/snster-kaz/isp-a/home/clawsmail/claws-mail/folderlist.xml
  12. 0
      files/snster-kaz/isp-a/home/clawsmail/claws-mail/folderlist_skel.xml
  13. 0
      files/snster-kaz/isp-a/home/clawsmail/claws-mail/passwordstorerc
  14. 0
      files/snster-kaz/isp-a/home/clawsmail/genpasswd
  15. 0
      files/snster-kaz/isp-a/home/clawsmail/genpasswd.c
  16. 22
      files/snster-kaz/isp-a/home/provision.sh
  17. 4
      files/snster-kaz/isp-a/infra/dns.conf
  18. 1
      files/snster-kaz/kaz/prod/dns.conf

3
files/kaz/config/container-mail.list

@ -1,3 +0,0 @@
# e-mail server composer
postfix
sympa

1
files/kaz/config/container-orga.list

@ -1 +0,0 @@
# orga composer

1
files/kaz/config/container-proxy.list

@ -1 +0,0 @@
proxy

9
files/kaz/config/container-withMail.list

@ -1,9 +0,0 @@
cloud
dokuwiki
#framadate
garradin
gitea
jirafeau
#mattermost
roundcube
#keycloak

10
files/kaz/config/container-withoutMail.list

@ -1,10 +0,0 @@
cachet
jirafeau
ethercalc
collabora
ethercalc
etherpad
ldap
quotas
web
#vigilo

120
files/kaz/config/dockers.env

@ -1,120 +0,0 @@
# Les variables d'environnements utilisées
# par les dockers via le lien :
# .env -> ../../config/dockers.env
#######################################
# prod / dev / local
mode=local
########################################
# choix du domaine
# prod=kaz.bzh / dev=dev.kaz.bzh / local=kaz.local
domain=kaz.local
########################################
# choix du domaine des mails sympa
# prod=kaz.bzh / dev=kaz2.ovh / local=kaz.local
domain_sympa=kaz.local
########################################
# choix d'un serveur partiel
# site=site-2
site=
########################################
# Pour garradin qui met en "dure" dans
# sa config l'URL pour l'atteindre
# prod=https (gandi) / dev=https (letsencrypt) / local=http
httpProto=https
# prod=89.234.186.111 / dev=192.168.57.1 / local=127.0.0.1
MAIN_IP=127.0.0.1
# prod=89.234.186.151 / dev=192.168.57.2 / local=127.0.0.2
SYMPA_IP=127.0.0.2
########################################
# noms des services
# ou www (mais bof)
webHost=
cachetHost=cachet
calcHost=tableur
cloudHost=cloud
dateHost=sondage
dokuwikiHost=wiki
fileHost=depot
garHost=garradin
gitHost=git
gravHost=grav
ldapHost=ldap
matterHost=agora
officeHost=office
padHost=pad
quotasHost=quotas
smtpHost=smtp
sympaHost=listes
vigiloHost=vigilo
webmailHost=webmail
wordpressHost=wp
########################################
# noms des containers
cachetServName=cachetServ
dokuwikiServName=dokuwikiServ
ethercalcServName=ethercalcServ
etherpadServName=etherpadServ
framadateServName=framadateServ
garradinServName=garradinServ
gitServName=gitServ
gravServName=gravServ
jirafeauServName=jirafeauServ
ldapServName=ldapServ
mattermostServName=mattermostServ
nextcloudServName=nextcloudServ
officeServName=officeServ
proxyServName=proxyServ
quotasServName=quotasServ
roundcubeServName=roundcubeServ
smtpServName=mailServ
sympaServName=sympaServ
vigiloServName=vigiloServ
webServName=webServ
wordpressServName=wpServ
cachetDBName=cachetDB
ethercalcDBName=ethercalcDB
etherpadDBName=etherpadDB
framadateDBName=framadateDB
gitDBName=gitDB
mattermostDBName=mattermostDB
nextcloudDBName=nextcloudDB
quotasDBName=quotasDB
roundcubeDBName=roundcubeDB
sympaDBName=sympaDB
vigiloDBName=vigiloDB
wordpressDBName=wpDB
ldapIUName=ldapIU
########################################
# politique de redémarrage
# prod=always / test=unless-stopped / local=no
restartPolicy=no
########################################
# devrait être dans env-jirafeauServ
# mais seuls les variables de ".env" sont
# utilisables pour le montage des volumes
jirafeauDir=/var/jirafeauData/lkuDM16R5Sp4QHr/
ldapRoot=dc=kaz,dc=local
########################################
# services activés par container.sh
# variables d'environneements utilisées
# pour le tmpl du mandataire (proxy)

0
files/clawsmail/addclawsuser.sh → files/snster-kaz/isp-a/home/clawsmail/addclawsuser.sh

0
files/clawsmail/claws-mail/accountrc → files/snster-kaz/isp-a/home/clawsmail/claws-mail/accountrc

0
files/clawsmail/claws-mail/accountrc.tmpl → files/snster-kaz/isp-a/home/clawsmail/claws-mail/accountrc.tmpl

0
files/clawsmail/claws-mail/clawsrc → files/snster-kaz/isp-a/home/clawsmail/claws-mail/clawsrc

0
files/clawsmail/claws-mail/folderlist.xml → files/snster-kaz/isp-a/home/clawsmail/claws-mail/folderlist.xml

0
files/clawsmail/claws-mail/folderlist_skel.xml → files/snster-kaz/isp-a/home/clawsmail/claws-mail/folderlist_skel.xml

0
files/clawsmail/claws-mail/passwordstorerc → files/snster-kaz/isp-a/home/clawsmail/claws-mail/passwordstorerc

0
files/clawsmail/genpasswd → files/snster-kaz/isp-a/home/clawsmail/genpasswd

0
files/clawsmail/genpasswd.c → files/snster-kaz/isp-a/home/clawsmail/genpasswd.c

22
files/snster-kaz/isp-a/home/provision.sh

@ -0,0 +1,22 @@
#!/bin/bash
# ISP-A infra
set -e
if [ -z $MILXCGUARD ] ; then exit 1; fi
DIR=`dirname $0`
cd `dirname $0`
# les scripts de créations de BAL pour clawsmail
cp -ar "clawsmail" /
chmod +x /clawsmail/addclawsuser.sh
chmod +x /clawsmail/genpasswd
#client pour tester la messagerie
DEBIAN_FRONTEND=noninteractive apt-get install -y claws-mail
if [ -f /clawsmail/addclawsuser.sh ]; then
/clawsmail/addclawsuser.sh contact1 kaz.milxc toto 1
/clawsmail/addclawsuser.sh contact2 kaz.milxc toto 2
/clawsmail/addclawsuser.sh contact3 kaz.milxc toto 3
/clawsmail/addclawsuser.sh contact4 kaz.milxc toto 4
/clawsmail/addclawsuser.sh email isp-a.milxc email 4
fi

4
files/snster-kaz/isp-a/infra/dns.conf

@ -1,9 +1,9 @@
server: server:
interface: 0.0.0.0 interface: 0.0.0.0
access-control: 100.64.0.0/10 allow access-control: 100.64.0.0/10 allow
local-zone: "isp-a.milxc." static local-zone: "isp-a.milxc." static
local-data: "smtp.isp-a.milxc. IN A 100.120.1.2" local-data: "smtp.isp-a.milxc. IN A 100.120.1.2"
local-data: "imap.isp-a.milxc. IN A 100.120.1.2" local-data: "mail.isp-a.milxc. IN A 100.120.1.2"
local-data: "ns.isp-a.milxc. IN A 100.120.1.2" local-data: "ns.isp-a.milxc. IN A 100.120.1.2"
local-data: "isp-a.milxc. IN MX 10 smtp.isp-a.milxc." local-data: "isp-a.milxc. IN MX 10 smtp.isp-a.milxc."

1
files/snster-kaz/kaz/prod/dns.conf

@ -14,6 +14,7 @@ dmz IN A 100.80.0.2
smtp IN CNAME dmz smtp IN CNAME dmz
imap IN CNAME dmz imap IN CNAME dmz
www IN CNAME dmz www IN CNAME dmz
mail IN CNAME dmz
listes IN MX listes listes IN MX listes
listes IN A 100.80.1.2 listes IN A 100.80.1.2
firewall IN A 100.80.0.1 firewall IN A 100.80.0.1

Loading…
Cancel
Save