Add a Dockerfile for frontend test container; adapt code to simplify synchronization or Docker linkage

This commit is contained in:
nemunaire 2014-11-21 15:55:38 +01:00
commit bca09af2e0
15 changed files with 329 additions and 218 deletions

View file

@ -22,7 +22,7 @@ if (is_writable($misc_dir) && !is_dir("$misc_dir/pki/"))
$template->assign("cert_writable", is_writable("$misc_dir/pki/"));
$ca_file = "$misc_dir/pki/cacert.crt";
$ca_file = "$misc_dir/shared/cacert.crt";
if (file_exists($ca_file))
{
if (!is_readable($ca_file))
@ -32,7 +32,7 @@ if (file_exists($ca_file))
openssl_x509_parse(file_get_contents($ca_file)));
}
$srv_file = "$misc_dir/server.crt";
$srv_file = "$misc_dir/shared/server.crt";
if (file_exists($srv_file))
{
if (!is_readable($srv_file))

View file

@ -14,7 +14,7 @@ if (!empty($_FILES["inputFile"]['tmp_name']))
return "admin/import_users";
}
if (!file_exists("$misc_dir/pki/cacert.crt"))
if (!file_exists("$misc_dir/shared/cacert.crt"))
{
erreur("The root certificate file not found, please create this first");
return "admin/import_users";