This is an automated email from the git hooks/post-receive script. spectra pushed a commit to branch master in repository conquest-dicom-server.
commit 0666d48fc459155f8811064fd8f2e827ad3dda63 Author: Pablo Lorenzzoni <[email protected]> Date: Mon Jan 27 15:14:52 2014 -0200 Put things in their rightful paths. --- debian/README.Debian | 4 ++-- debian/conquest-dicom-server.dirs | 5 ++++- debian/conquest-dicom-server.init | 15 ++------------- debian/conquest-dicom-server.postinst | 2 +- debian/patches/configfiles.patch | 20 ++++++++++++++++++++ debian/patches/debianlayout.patch | 4 ++-- debian/patches/logfiles.patch | 14 ++++++++++++++ debian/patches/series | 2 ++ debian/rules | 11 +++++------ 9 files changed, 52 insertions(+), 25 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 11dc067..bec8ad9 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -18,7 +18,7 @@ The packaged software listen on 11112/TCP by default. Running User ------------ The main software runs under an unpriviledged user (dicom) as daemon -(initscripts were provided) +(initscripts were provided). CGI Interface ------------- @@ -59,7 +59,7 @@ bash$ echoscu localhost 11112 See output in: -bash$ cat /var/log/dgate.log +bash$ cat /var/log/conquest-dicom-server/dgate.log Send a file: diff --git a/debian/conquest-dicom-server.dirs b/debian/conquest-dicom-server.dirs index 48accb3..a941d05 100644 --- a/debian/conquest-dicom-server.dirs +++ b/debian/conquest-dicom-server.dirs @@ -1 +1,4 @@ -/var/lib/conquest-dicom-server/data/dbase/ +/var/lib/conquest-dicom-server/dbase/ +/var/lib/conquest-dicom-server/MAG0/ +/var/log/conquest-dicom-server/ +/etc/conquest-dicom-server/ diff --git a/debian/conquest-dicom-server.init b/debian/conquest-dicom-server.init index 51c24f4..eeeb099 100755 --- a/debian/conquest-dicom-server.init +++ b/debian/conquest-dicom-server.init @@ -14,25 +14,14 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Conquest DICOM Server" NAME=dgate -DAEMON=/usr/lib/conquest-dicom-server/$NAME # Introduce the server's location here -#STORESCP_PORT="11112" -DAEMON_ARGS="-^/var/log/dgate.log" # Arguments to run the daemon with +DAEMON=/usr/bin/$NAME # Introduce the server's location here +DAEMON_ARGS="-w/etc/conquest-dicom-server -^/var/log/conquest-dicom-server/dgate.log" # Arguments to run the daemon with PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME -#STORESCP_CFG="/etc/dcmtk/storescp.cfg" # Exit if the package is not installed [ -x $DAEMON ] || exit 0 -# Read configuration variable file if it is present -#[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -#case "$STORESCP_ENABLE" in -# [Nn]*) -# exit 0 -# ;; -#esac - # Load the VERBOSE setting and other rcS variables . /lib/init/vars.sh diff --git a/debian/conquest-dicom-server.postinst b/debian/conquest-dicom-server.postinst index 5aae17f..e3c1716 100644 --- a/debian/conquest-dicom-server.postinst +++ b/debian/conquest-dicom-server.postinst @@ -9,7 +9,7 @@ if [ "$1" != "configure" -a "$1" != "purge" ]; then fi # DICOM db setup -/usr/lib/conquest-dicom-server/dgate -v -r +/usr/bin/dgate -w/etc/conquest-dicom-server -v -r exit 0 diff --git a/debian/patches/configfiles.patch b/debian/patches/configfiles.patch new file mode 100644 index 0000000..737f18d --- /dev/null +++ b/debian/patches/configfiles.patch @@ -0,0 +1,20 @@ +Description: Use IANA port for the daemon +Author: Pablo Lorenzzoni <[email protected]> +Forwarded: not-needed + +--- conquestlinux1417c.orig/dicom.ini.sqlite ++++ conquestlinux1417c/dicom.ini.sqlite +@@ -13,9 +13,10 @@ + TCPPort = 11112 + + # Reference to other files: known dicom servers; database layout; sops +-ACRNemaMap = acrnema.map +-kFactorFile = dicom.sql +-SOPClassList = dgatesop.lst ++ACRNemaMap = /etc/conquest-dicom-server/acrnema.map ++kFactorFile = /etc/conquest-dicom-server/dicom.sql ++SOPClassList = /etc/conquest-dicom-server/dgatesop.lst ++Dictionary = /etc/conquest-dicom-server/dgate.dic + + # Host for postgres or mysql only, name, username and password for database + SQLHost = localhost diff --git a/debian/patches/debianlayout.patch b/debian/patches/debianlayout.patch index 0d5e909..5a449b0 100644 --- a/debian/patches/debianlayout.patch +++ b/debian/patches/debianlayout.patch @@ -9,7 +9,7 @@ Forwarded: not-needed # Host for postgres or mysql only, name, username and password for database SQLHost = localhost -SQLServer = ./data/dbase/conquest.db3 -+SQLServer = /var/lib/conquest-dicom-server/data/dbase/conquest.sqlite ++SQLServer = /var/lib/conquest-dicom-server/dbase/conquest.sqlite Username = dontcare Password = dontcare PostGres = 0 @@ -18,4 +18,4 @@ Forwarded: not-needed MAGDeviceThreshhold = 0 MAGDevices = 1 -MAGDevice0 = ./data/ -+MAGDevice0 = /var/lib/conquest-dicom-server/data/ ++MAGDevice0 = /var/lib/conquest-dicom-server/MAG0/ diff --git a/debian/patches/logfiles.patch b/debian/patches/logfiles.patch new file mode 100644 index 0000000..068231f --- /dev/null +++ b/debian/patches/logfiles.patch @@ -0,0 +1,14 @@ +Description: Use IANA port for the daemon +Author: Pablo Lorenzzoni <[email protected]> +Forwarded: not-needed + +--- conquestlinux1417c.orig/dicom.ini.sqlite ++++ conquestlinux1417c/dicom.ini.sqlite +@@ -84,3 +85,7 @@ + MAGDeviceThreshhold = 0 + MAGDevices = 1 + MAGDevice0 = /var/lib/conquest-dicom-server/MAG0/ ++ ++# Logging ++TroubleLog = /var/log/conquest-dicom-server/trouble.log ++UserLog = /var/log/conquest-dicom-server/user.log diff --git a/debian/patches/series b/debian/patches/series index dfe0bf0..ff57359 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ debianlayout.patch ianaport.patch +configfiles.patch +logfiles.patch diff --git a/debian/rules b/debian/rules index 8895a00..8e77039 100755 --- a/debian/rules +++ b/debian/rules @@ -31,12 +31,11 @@ override_dh_auto_build: dgate override_dh_install: # DICOM Server: - dh_install dgate usr/lib/conquest-dicom-server/ - dh_install dgate.dic usr/lib/conquest-dicom-server/ - dh_install dicom.sql usr/lib/conquest-dicom-server/ - dh_install dicom.ini usr/lib/conquest-dicom-server/ - dh_install sample.cq usr/lib/conquest-dicom-server/ - dh_install acrnema.map usr/lib/conquest-dicom-server/ + dh_install dgate usr/bin/ + dh_install dgate.dic etc/conquest-dicom-server/ + dh_install dicom.sql etc/conquest-dicom-server/ + dh_install dicom.ini etc/conquest-dicom-server/ + dh_install acrnema.map etc/conquest-dicom-server/ # lua examples dh_installexamples # docs -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
