diff --git a/entrypoint.sh b/entrypoint.sh index fd86665e..bdd975ec 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -8,7 +8,7 @@ cd `dirname "$0"` # Creating directory and set permissions mkdir -p ${BASEDIR}/logs ${BASEDIR}/onyx/log -chown -R www-data:www-data ${BASEDIR}/shared ${BASEDIR}/pki/openssl.cnf ${BASEDIR}/PKI ${BASEDIR}/onyx/log +chown -R www-data:www-data ${BASEDIR}/shared ${BASEDIR}/pki ${BASEDIR}/PKI ${BASEDIR}/onyx/log chown -R ${SYNCHRO_USER}:www-data ${BASEDIR}/submission ${BASEDIR}/logs ${BASEDIR}/out ${BASEDIR}/shared/nginx-teams.conf chmod 770 ${BASEDIR}/submission chown ${SYNCHRO_USER} ${BASEDIR}/.ssh/id_rsa diff --git a/onyx/include/admin/import_users.php b/onyx/include/admin/import_users.php index ab9b318c..9f5ae9c1 100644 --- a/onyx/include/admin/import_users.php +++ b/onyx/include/admin/import_users.php @@ -87,12 +87,13 @@ if (!empty($_FILES["inputFile"]['tmp_name'])) $output .= new_client($team->team_name, $misc_dir); } } + $template->assign("output", $output); if (file_exists("$misc_dir/PKI/teams.pass")) { - $output .= file_get_contents("$misc_dir/PKI/teams.pass"); + shell_exec("sync"); + $template->assign("pass", file_get_contents("$misc_dir/PKI/teams.pass")); unlink("$misc_dir/PKI/teams.pass"); } - $template->assign("output", $output); } else $error = "Aucune team trouvée"; diff --git a/onyx/tpl/bootstrap/admin/import_users.tpl b/onyx/tpl/bootstrap/admin/import_users.tpl index 72ed401c..4f33e44b 100644 --- a/onyx/tpl/bootstrap/admin/import_users.tpl +++ b/onyx/tpl/bootstrap/admin/import_users.tpl @@ -11,6 +11,10 @@ +{if isset($pass)} +

Pass

+
{$pass}
+{/if} {if isset($output)}

Output

{$output}