diff --git a/bin/smartdata/Backend.php b/bin/smartdata/Backend.php index e339ed7c716f4dec646bad4ff775c74ee8d33f60..6736bca3cb63da85887fdbb94e7702b885cec12f 100644 --- a/bin/smartdata/Backend.php +++ b/bin/smartdata/Backend.php @@ -2133,7 +2133,7 @@ class Backend_V1_1 extends Backend_Common $time = intval(1000000 * microtime(true)); $this->_initialize_daemon($_wf); $str_json = $msd->toJson(); - $filename = "{$msd->unit_code}{$msd->time}{$msd->x}{$msd->y}{$msd->z}{$time}"; + $filename = "{$msd->unit_code}_{$msd->time}_{$msd->x}_{$msd->y}_{$msd->z}_{$time}"; $input = fopen("{$_root}/../workflow/{$this->_domain}/{$_wf}_{$filename}", "w"); fwrite($input, $str_json."\n"); fclose($input); @@ -2162,7 +2162,7 @@ class Backend_V1_1 extends Backend_Common $js = $smart_data->toJson(); if ($compr > 500) { $time = intval(1000000 * microtime(true)); - $filename = "{$smart_data->unit_code}{$smart_data->time}{$smart_data->x}{$smart_data->y}{$smart_data->z}{$time}"; + $filename = "{$smart_data->unit_code}_{$smart_data->time}_{$smart_data->x}_{$smart_data->y}_{$smart_data->z}_{$time}"; $input = fopen("{$_root}/../workflow/{$this->_domain}/{$_wf}_".$filename, "w"); fwrite($input, "{\"smartdata\":" . $js . "}\n"); fclose($input); @@ -2196,7 +2196,7 @@ class Backend_V1_1 extends Backend_Common } $str_json = json_encode($json); $time = intval(1000000 * microtime(true)); - $filename = "{$series->unit}{$series->t0}{$series->t1}{$series->x}{$series->y}{$series->z}{$series->r}{$time}"; + $filename = "{$series->unit}_{$series->t0}_{$series->t1}_{$series->x}_{$series->y}_{$series->z}_{$series->r}_{$time}"; $input = fopen("{$_root}/../workflow/{$this->_domain}/{$_wf}_{$filename}", "w"); fwrite($input, "$str_json\n"); fclose($input); diff --git a/docker/web/apache-ssl.conf b/docker/web/apache-ssl.conf index c90f427049b13e67284afe5b6392354982f35087..3dc80e2c1b3c3e84a3ac4830b8260831ebd1f1d5 100644 --- a/docker/web/apache-ssl.conf +++ b/docker/web/apache-ssl.conf @@ -1,6 +1,5 @@ # <VirtualHost _default_:443> - ServerAdmin webmaster@localhost DocumentRoot /var/www/html ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined @@ -16,12 +15,6 @@ SSLCACertificateFile /etc/apache2/ssl/ca.crt SSLVerifyClient optional SSLVerifyDepth 5 - #SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt - #SSLCACertificatePath /etc/ssl/certs/ - #SSLCACertificateFile /etc/apache2/ssl.crt/ca-bundle.crt - #SSLCARevocationPath /etc/apache2/ssl.crl/ - #SSLCARevocationFile /etc/apache2/ssl.crl/ca-bundle.crl - #SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire <FilesMatch "\.(cgi|shtml|phtml|php)$"> SSLOptions +StdEnvVars