The branch, master has been updated via 8f363bfe62295b8dc722e4970c7f44151fe89fa9 (commit) from 3d504f393caf5d3942e22578695f8fcc73ef1409 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8f363bfe62295b8dc722e4970c7f44151fe89fa9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 9 09:05:14 2011 +0200 improve comments for config file options ----------------------------------------------------------------------- Summary of changes: cups-x2go | 12 ++++++++++++ cups-x2go.conf | 13 ++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index a57cbea..1fb1d7b 100755 --- a/cups-x2go +++ b/cups-x2go @@ -27,11 +27,23 @@ use strict; setlogsock('unix'); openlog($0,'cons,pid','user'); + +# if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise +# name the hostname of your master X2go server - that is the X2go server that +# can be queried for session information. my $x2goserver = "local"; + +# this private key has to be valid for all X2go servers that print via the CUPS +# server that cups-x2go is installed on. my $printdsa = "/root/.ssh/id_dsa-x2goprint"; + +# PS2PDF command my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\""; #my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\""; + +# override hardcoded settings via config file my $cfgfile="/etc/cups/cups-x2go.conf"; + my $userName; my @sessions; my $host=hostname(); diff --git a/cups-x2go.conf b/cups-x2go.conf index 1b11d56..f238e2a 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -2,14 +2,17 @@ ### cups-x2go.conf -- CUPS Backend Configuration ### -## Server with x2go system +## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise +## name the hostname of your master X2go server within in your X2go cluster. This +## host then is used for querying session information. #x2goserver = local -## DSA key for user x2goprint (old path and filename) -#printdsa = /root/.x2go/ssh/.x2goprint/id_dsa - ## DSA key for user x2goprint (new path and filename, default in cups-x2go backend) +## this private key has to be valid for all X2go servers that print via the CUPS +## server that cups-x2go is installed on. The corresponding public key has to +## be installed in <remote-x2goserverX>:~x2goprint/.ssh/authorized_keys #printdsa = /root/.ssh/id_dsa-x2goprint -## command to generate pdf files +## command to generate PDF file #ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\" + hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "cups-x2go.git" (CUPS Backend for X2go Printing).