config sshd

files/snster-kaz/hoster-a/kaz1/kaz.sh

@@ -36,6 +36,10 @@ export DebugLog="${OUTPUT_DIR}/log/log-kaz-$(date +%y-%m-%d-%T)-"
     echo -e "\n    #### secretGen\n"
     /kaz/bin/secretGen.sh
 
+    # echo "0 2   * * *  root /kaz/bin/getX509Certificates.sh" >> /etc/cron.d/kaz-certs
+    #ln -sf /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/ssl/certs/mail.pem
+    #ln -sf /etc/ssl/private/ssl-cert-snakeoil.key /etc/ssl/private/mail.key
+
     echo -e "\n    #### install\n"
 	  /kaz/bin/install.sh
 

files/snster-kaz/hoster-a/kaz1/kaz.sns.zone

@@ -23,6 +23,7 @@ dashboard	IN	CNAME	kaz1
 dashboard2	IN	CNAME	kaz2
 sondage IN CNAME kaz1
 webmail	IN	CNAME	kaz1
+roundcube	IN	CNAME	kaz1
 garradin	IN	CNAME	kaz1
 wiki	IN	CNAME	kaz1
 git	IN	CNAME	kaz1

files/snster-kaz/hoster-a/kaz1/provision.sh

@@ -65,6 +65,10 @@ cp -ar tls/root_ca.crt /usr/local/share/ca-certificates/
 mkdir -p /etc/letsencrypt/live/kaz.sns
 cp tls/wildcard.crt /etc/letsencrypt/live/kaz.sns/fullchain.pem
 cp tls/wildcard.key /etc/letsencrypt/live/kaz.sns/privkey.pem
+cp tls/wildcard.crt /etc/ssl/certs/mail.pem
+cp tls/wildcard.key /etc/ssl/private/mail.key
+cp tls/wildcard.crt /etc/ssl/certs/listes.pem
+cp tls/wildcard.key /etc/ssl/private/listes.key
 
 # On sauve le proxy APT
 proxy=$(/sbin/ip route | awk '/default/ { print $3 }' | head -1)

files/sshd.conf

@@ -0,0 +1,2 @@
+PasswordAuthentication yes
+PermitRootLogin yes

files/vm-provision.sh

@@ -87,11 +87,8 @@ http_port 3142" >> /etc/squid/squid.conf
     #faut virer exim, inutile
     DEBIAN_FRONTEND=noninteractive apt-get remove --purge -y exim4-base exim4-config exim4-daemon-light
 
-    #login ssh avec mot de passe
+    # config sshd
-    sed -i "s/PasswordAuthentication no/PasswordAuthentication yes/" /etc/ssh/sshd_config
+    cp "${VAGRANT_SRC_DIR}/sshd.conf" /etc/ssh/sshd_config.d/kaz.conf
-    if ! grep -q "PasswordAuthentication yes" /etc/ssh/sshd_config 2>/dev/null; then
-	     echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config
-    fi
 
     # autorisation du routing et augmentation inotify
     if ! grep -q "net.ipv4.ip_forward" /etc/sysctl.conf 2>/dev/null; then