connection test, corrections

Author: alainabbas

install.sh

@@ -37,15 +37,17 @@ read -p "Domaine pour UserPrincipalName : " DOMAIN
 echo "Génération du fichier de configuration"
 CONFFILE=${INSTALL}/etc/config.conf
 echo "host=${HOST}" > ${CONFFILE}
-echo "user=${DN}" >> ${CONFFILE}
+echo "user=${USER}" >> ${CONFFILE}
 echo "password=${PASSWORD}" >> ${CONFFILE}
 echo "base=${BASE}" >> ${CONFFILE}
 echo "domain=${DOMAIN}" >> ${CONFFILE}
 echo "backendFor=adm,etd,esn" >> ${CONFFILE}
 chmod 600 ${CONFFILE}
 echo "Generation d'une clé ssh"
-mkdir $INSTALL/.ssh
-ssh-keygen -t ed25519 -f ${INSTALL}/.ssh/id_ed25519 -N ''
+if [ ! -f $INSTALL/.ssh/id_ed25519 ];then
+  mkdir $INSTALL/.ssh 2>/dev/null
+  ssh-keygen -t ed25519 -f ${INSTALL}/.ssh/id_ed25519 -N ''
+fi
 ./copy_ssh_key.py --server=${HOST} --user=${USER} --password="${PASSWORD}" --keyfile=${INSTALL}/.ssh/id_ed25519.pub
 OK=$?
 if [ $OK -ne 0 ];then

src/bin/changepwd.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3 -u
 import sys
 sys.path.append('../lib')
 import ad_utils as ad

src/bin/ping.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3 -u
 import sys
 sys.path.append('../lib')
 import ad_utils as ad
@@ -6,4 +7,4 @@
 config=u.read_config('../etc/config.conf')
 ad.set_config(config)
 ## test connection
-ad.test_conn()
+ad.test_conn(cat )

src/bin/resetpwd.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3 -u
 import sys
 sys.path.append('../lib')
 import ad_utils as ad

src/bin/upsertidentity.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python3 -u
 import sys
 sys.path.append('../lib')
 import ad_utils as ad

src/ps1_templates/upsertidentity.template

@@ -12,7 +12,7 @@ try{
 	}
 	$UserExists = $true
 }
-catch [Microsoft.ActiveDirectory.Management.ADIdentityResolutionException] {
+catch{
     $UserExists = $false
 } 
 if ($UserExists -eq $false){