[med-svn] [orthanc] 05/06: update configuration files
Sebastien Jodogne
jodogne-guest at moszumanska.debian.org
Mon Jun 27 14:53:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
jodogne-guest pushed a commit to branch master
in repository orthanc.
commit 99509b936ed5b8bb1a4632e0c74e6f7a79c2eae8
Author: jodogne-guest <s.jodogne at gmail.com>
Date: Mon Jun 27 16:25:25 2016 +0200
update configuration files
---
debian/configuration/orthanc.json | 46 ++++++++++++++++++++++++++----
debian/control | 2 +-
debian/docs/Orthanc.1 | 12 +++++---
debian/docs/OrthancRecoverCompressedFile.8 | 26 +++++++++++++++++
debian/orthanc.lintian-overrides | 1 +
debian/orthanc.manpages | 1 +
6 files changed, 78 insertions(+), 10 deletions(-)
diff --git a/debian/configuration/orthanc.json b/debian/configuration/orthanc.json
index 356565a..e185d7a 100644
--- a/debian/configuration/orthanc.json
+++ b/debian/configuration/orthanc.json
@@ -119,7 +119,8 @@
// Whether or not SSL is enabled
"SslEnabled" : false,
- // Path to the SSL certificate (meaningful only if SSL is enabled)
+ // Path to the SSL certificate in the PEM format (meaningful only if
+ // SSL is enabled)
"SslCertificate" : "certificate.pem",
// Whether or not the password protection is enabled
@@ -145,7 +146,7 @@
* store (shipped in the DCMTK distribution) started by the
* command line "storescp 2000".
**/
- // "sample" : [ "STORESCP", "localhost", 2000 ]
+ // "sample" : [ "STORESCP", "127.0.0.1", 2000 ]
/**
* A fourth parameter is available to enable patches for a
@@ -165,8 +166,24 @@
* followed by the username/password pair (if the password
* protection is enabled on the peer).
**/
- // "peer" : [ "http://localhost:8043/", "alice", "alicePassword" ]
- // "peer2" : [ "http://localhost:8044/" ]
+ // "peer" : [ "http://127.0.0.1:8043/", "alice", "alicePassword" ]
+ // "peer2" : [ "http://127.0.0.1:8044/" ]
+
+ /**
+ * This is another, more advanced format to define Orthanc
+ * peers. It notably allows to specify a HTTPS client certificate
+ * in the PEM format (as in the "--cert" option of curl), or to
+ * enable PKCS#11 authentication for smart cards.
+ **/
+ // "peer" : {
+ // "Url" : "http://127.0.0.1:8043/",
+ // "Username" : "alice",
+ // "Password" : "alicePassword",
+ // "CertificateFile" : "client.crt",
+ // "CertificateKeyFile" : "client.key",
+ // "CertificateKeyPassword" : "certpass",
+ // "Pkcs11" : false
+ // }
},
// Parameters of the HTTP proxy to be used by Orthanc. If set to the
@@ -178,7 +195,10 @@
// Set the timeout for HTTP requests issued by Orthanc (in seconds).
"HttpTimeout" : 10,
- // Enable the verification of the peers during HTTPS requests.
+ // Enable the verification of the peers during HTTPS requests. This
+ // option must be set to "false" if using self-signed certificates.
+ // Pay attention that setting this option to "false" results in
+ // security risks!
// Reference: http://curl.haxx.se/docs/sslcerts.html
"HttpsVerifyPeers" : true,
@@ -271,7 +291,23 @@
// (such as PatientName). By default, the search is
// case-insensitive, which does not follow the DICOM standard.
"CaseSensitivePN" : false,
+
+ // Configure PKCS#11 to use hardware security modules (HSM) and
+ // smart cards when carrying on HTTPS client authentication.
+ /**
+ "Pkcs11" : {
+ "Module" : "/usr/local/lib/libbeidpkcs11.so",
+ "Module" : "C:/Windows/System32/beidpkcs11.dll",
+ "Pin" : "1234",
+ "Verbose" : true
+ }
+ **/
+ // If set to "true", Orthanc will handle "SOP Classes in Study"
+ // (0008,0062) in C-FIND requests. This option is turned off by
+ // default, as it requires intensive accesses to the hard drive.
+ "AllowFindSopClassesInStudy" : false,
+
// Register a new tag in the dictionary of DICOM tags that are known
// to Orthanc. Each line must contain the tag (formatted as 2
// hexadecimal numbers), the value representation (2 upcase
diff --git a/debian/control b/debian/control
index c2ae6b0..3741d90 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: cmake,
uuid-dev,
zlib1g-dev,
yui-compressor
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/orthanc.git
Vcs-Git: https://anonscm.debian.org/git/debian-med/orthanc.git
Homepage: http://www.orthanc-server.com/
diff --git a/debian/docs/Orthanc.1 b/debian/docs/Orthanc.1
index 7ec8139..02cef59 100644
--- a/debian/docs/Orthanc.1
+++ b/debian/docs/Orthanc.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
-.TH ORTHANC "1" "December 2015" "Orthanc 1.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
+.TH ORTHANC "1" "June 2016" "Orthanc 1.1.0" "User Commands"
.SH NAME
Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
.SH SYNOPSIS
@@ -20,7 +20,11 @@ display this help and exit
.TP
\fB\-\-logdir\fR=\fI\,[dir]\/\fR
directory where to store the log files
-(if not used, the logs are dumped to stderr)
+(by default, the log is dumped to stderr)
+.TP
+\fB\-\-logfile\fR=\fI\,[file]\/\fR
+file where to store the log of Orthanc
+(by default, the log is dumped to stderr)
.TP
\fB\-\-config\fR=\fI\,[file]\/\fR
create a sample configuration file and exit
@@ -49,7 +53,7 @@ output version information and exit
.SH AUTHOR
Written by Sebastien Jodogne <s.jodogne at gmail.com>
.SH COPYRIGHT
-Copyright \(co 2012\-2015 Sebastien Jodogne, Medical Physics Department, University Hospital of Liege (Belgium)
+Copyright \(co 2012\-2016 Sebastien Jodogne, Medical Physics Department, University Hospital of Liege (Belgium)
Licensing GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>, with OpenSSL exception.
.br
This is free software: you are free to change and redistribute it.
diff --git a/debian/docs/OrthancRecoverCompressedFile.8 b/debian/docs/OrthancRecoverCompressedFile.8
new file mode 100644
index 0000000..0e48721
--- /dev/null
+++ b/debian/docs/OrthancRecoverCompressedFile.8
@@ -0,0 +1,26 @@
+.TH ORTHANC "8" "June 2016" "Orthanc 1.1.0" "System Administration tools and Deamons"
+.SH NAME
+Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
+.SH SYNOPSIS
+.B OrthancRecoverCompressedFile
+[\fI\,INPUT\/\fR] [\fI\,OUTPUT\/\fR]
+.SH DESCRIPTION
+Orthanc, lightweight, RESTful DICOM server for healthcare and medical research.
+.PP
+This is a maintenance tool to recover a DICOM file that was compressed
+by Orthanc. If no output is given, the data will be output to
+stdout. Please refer to the Orthanc homepage for the full instructions
+about how to use Orthanc <http://www.orthanc-server.com/>.
+.SS "Exit status:"
+.IP
+0 if success,
+.HP
+\fB\-1\fR if error.
+.SH AUTHOR
+Written by Sebastien Jodogne <s.jodogne at gmail.com>
+.SH COPYRIGHT
+Copyright \(co 2012\-2016 Sebastien Jodogne, Medical Physics Department, University Hospital of Liege (Belgium)
+Licensing GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>, with OpenSSL exception.
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/debian/orthanc.lintian-overrides b/debian/orthanc.lintian-overrides
index 44576bb..211482f 100644
--- a/debian/orthanc.lintian-overrides
+++ b/debian/orthanc.lintian-overrides
@@ -9,3 +9,4 @@ spelling-error-in-binary usr/sbin/Orthanc supress suppress
# "libServeFolders.so" shared library is placed inside
# "/usr/lib/orthanc", that lintian seems not to scan
postinst-has-useless-call-to-ldconfig
+package-has-unnecessary-activation-of-ldconfig-trigger
diff --git a/debian/orthanc.manpages b/debian/orthanc.manpages
index 7f4c201..006c514 100644
--- a/debian/orthanc.manpages
+++ b/debian/orthanc.manpages
@@ -1 +1,2 @@
debian/docs/Orthanc.1
+debian/docs/OrthancRecoverCompressedFile.8
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc.git
More information about the debian-med-commit
mailing list