Re: [X2go-dev] Multiserver CUPS patches
Hi Paul,
On Fr 15 Apr 2011 10:25:37 CEST Paul Menzel wrote:
Dear Mike,
Am Freitag, den 15.04.2011, 00:46 +0200 schrieb Mike Gabriel:
On Fr 02 Jul 2010 14:06:09 CEST "John A. Sullivan III" wrote:
> Here are the patches to enable a single cups-x2go CUPS server to service
> multiple X2Go Servers. The documentation was posted previously. Thanks
> - John
this is a reply to a really old thread... I have added a branch to the
cups-x2go.git project that includes your multi-CUPS-server patches:
http://code.x2go.org/gitweb?p=cups-x2go.git;a=shortlog;h=refs/heads/pending/multicupsservers
Could you please cross-check???
Thank you for setting up a branch and not committing it right to master.
I know it is a little bit more work, but could you in addition to
`GIT_AUTHOR_{NAME,EMAIL}` also set `GIT_AUTHOR_DATE` to the date of the
patch submission/email.
GIT_AUTHOR_DATE = "Fri Jul 2 08:06:09 2010 -0400"
I will do that the next time I have time (probably not before Sunday).
One more thing. Is there a problem with the date or time, since GitWeb
is highlihting it as red [1].
I think the red colour notifies gitweb visitors that something has
happened. Once it switches to ,,days'' as a measuring unit, it
switches to black colour.
Greets + thanks for your feedback,
MIke
PS: please note: the multi-cups-server stuff does only work with some
database patches that john is going to provide in May. If it will
enter the master branches will be up to Henz+Alex
--
DAS-NETZWERKTEAM
mike gabriel, dorfstr. 27, 24245 barmissen
fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B
mail: mike.gabr...@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
pgpBOLOtfnDxN.pgp
Description: Digitale PGP-Unterschrift
___
X2go-dev mailing list
X2go-dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2go-dev] Multiserver CUPS patches
Dear Mike,
Am Freitag, den 15.04.2011, 10:25 +0200 schrieb Paul Menzel:
> Am Freitag, den 15.04.2011, 00:46 +0200 schrieb Mike Gabriel:
>
> > On Fr 02 Jul 2010 14:06:09 CEST "John A. Sullivan III" wrote:
> >
> > > Here are the patches to enable a single cups-x2go CUPS server to service
> > > multiple X2Go Servers. The documentation was posted previously. Thanks
> > > - John
> >
> > this is a reply to a really old thread... I have added a branch to the
> > cups-x2go.git project that includes your multi-CUPS-server patches:
> >
> > http://code.x2go.org/gitweb?p=cups-x2go.git;a=shortlog;h=refs/heads/pending/multicupsservers
> >
> > Could you please cross-check???
>
> Thank you for setting up a branch and not committing it right to master.
> I know it is a little bit more work, but could you in addition to
> `GIT_AUTHOR_{NAME,EMAIL}` also set `GIT_AUTHOR_DATE` to the date of the
> patch submission/email.
>
> GIT_AUTHOR_DATE = "Fri Jul 2 08:06:09 2010 -0400"
>
> This way it is easier to search for the mailing list thread and of
> course it resembles more to the “truth”. I think, since it is on a
> branch, you can safely rebase the commits on this branch without causing
> to much trouble for people having cloned this already.
>
> One more thing. Is there a problem with the date or time, since GitWeb
> is highlihting it as red [1].
I forgot to include the reference.
Thanks,
Paul
[1]
http://code.x2go.org/gitweb?p=cups-x2go.git;a=commit;h=097041182b2b1213733841f268ce533d8563a7ea
(For example 00:34 is highlighted in red.)
signature.asc
Description: This is a digitally signed message part
___
X2go-dev mailing list
X2go-dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2go-dev] Multiserver CUPS patches
Dear Mike,
Am Freitag, den 15.04.2011, 00:46 +0200 schrieb Mike Gabriel:
> On Fr 02 Jul 2010 14:06:09 CEST "John A. Sullivan III" wrote:
>
> > Here are the patches to enable a single cups-x2go CUPS server to service
> > multiple X2Go Servers. The documentation was posted previously. Thanks
> > - John
>
> this is a reply to a really old thread... I have added a branch to the
> cups-x2go.git project that includes your multi-CUPS-server patches:
>
> http://code.x2go.org/gitweb?p=cups-x2go.git;a=shortlog;h=refs/heads/pending/multicupsservers
>
> Could you please cross-check???
Thank you for setting up a branch and not committing it right to master.
I know it is a little bit more work, but could you in addition to
`GIT_AUTHOR_{NAME,EMAIL}` also set `GIT_AUTHOR_DATE` to the date of the
patch submission/email.
GIT_AUTHOR_DATE = "Fri Jul 2 08:06:09 2010 -0400"
This way it is easier to search for the mailing list thread and of
course it resembles more to the “truth”. I think, since it is on a
branch, you can safely rebase the commits on this branch without causing
to much trouble for people having cloned this already.
One more thing. Is there a problem with the date or time, since GitWeb
is highlihting it as red [1].
Thanks,
Paul
signature.asc
Description: This is a digitally signed message part
___
X2go-dev mailing list
X2go-dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2go-dev] Multiserver CUPS patches
On Fri, 2011-04-15 at 00:46 +0200, Mike Gabriel wrote: > Hi John, > > On Fr 02 Jul 2010 14:06:09 CEST "John A. Sullivan III" wrote: > > > Here are the patches to enable a single cups-x2go CUPS server to service > > multiple X2Go Servers. The documentation was posted previously. Thanks > > - John > > > > this is a reply to a really old thread... I have added a branch to the > cups-x2go.git project that includes your multi-CUPS-server patches: > > http://code.x2go.org/gitweb?p=cups-x2go.git;a=shortlog;h=refs/heads/pending/multicupsservers > > Could you please cross-check??? > > Greets, > Mike > > > > Looks like I'm finally going to have to learn git :) I guess I had better "git" around to it as I'm still using CVS. I should be able to get to this next week. Thanks - John ___ X2go-dev mailing list X2go-dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
Re: [X2go-dev] Multiserver CUPS patches
Hi John, On Fr 02 Jul 2010 14:06:09 CEST "John A. Sullivan III" wrote: Here are the patches to enable a single cups-x2go CUPS server to service multiple X2Go Servers. The documentation was posted previously. Thanks - John this is a reply to a really old thread... I have added a branch to the cups-x2go.git project that includes your multi-CUPS-server patches: http://code.x2go.org/gitweb?p=cups-x2go.git;a=shortlog;h=refs/heads/pending/multicupsservers Could you please cross-check??? Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419 GnuPG Key ID 0xB588399B mail: mike.gabr...@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb pgpt0HtYYHuFf.pgp Description: Digitale PGP-Unterschrift ___ X2go-dev mailing list X2go-dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
[X2go-dev] Multiserver CUPS patches
Here are the patches to enable a single cups-x2go CUPS server to service
multiple X2Go Servers. The documentation was posted previously. Thanks
- John
--- cups-x2go.conf.orig 2010-03-09 11:20:50.873606048 +
+++ cups-x2go.conf.new 2010-03-09 12:14:36.800611904 +
@@ -3,10 +3,42 @@
##
## Server with x2go system
-x2goserver = local
+#x2goserver = local
## dsa key for user x2goprint
#printdsa = /root/.x2go/ssh/.x2goprint/id_dsa
## command to generate pdf files
#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"
+
+# Multi-X2Go Server options
+#==
+# Used when this print server must service multiple X2Go Servers
+# This requires a single database for all X2Go Server session data
+#multiserver = 0
+# Set multiserver to 0 (zero) to disable and 1 (one) to enable
+# defaults to 0
+
+#dbhost = localhost
+# Set dbhost to the name of the database host
+# defaults to localhost
+
+#dbuser = postgres
+# Set dbuser to the user ID for logging into the database
+# defaults to postgres
+
+#dbname = x2go_sessions
+# Set dbname to the database name
+# defaults to x2go_sessions
+
+#dbschema =
+# Set dbschema to the master schema in a multi-schema X2Go database
+# This is the schema used to coordinate information from the individual
+# X2Go Server schemas in a secure environment (where one server cannot
+# view another server's session data
+# defaults to an empty string
+
+#dbtable = sessions
+# Set dbtables to the database table used to hold the session data
+# defaults to sessions
+#==
--- cups-x2go.orig 2010-03-09 09:16:28.0 +
+++ cups-x2go 2010-04-06 11:36:58.566761342 +
@@ -26,6 +26,12 @@
my $x2goserver = "local";
my $printdsa = "/root/.x2go/ssh/.x2goprint/id_dsa";
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 $multiserver=0;
+my $dbhost = "localhost";
+my $dbuser = "postgres";
+my $dbname = "x2go_sessions";
+my $dbschema = "";
+my $dbtable = "sessions";
my $cfgfile="/etc/cups/cups-x2go.conf";
my $userName;
my @sessions;
@@ -60,8 +66,43 @@
{
$ps2pdf=$value;
}
+ if($option eq "multiserver")
+ {
+ $multiserver = $value;
+ }
+ if($option eq "dbhost")
+ {
+ $dbhost=$value;
+ }
+ if($option eq "dbuser")
+ {
+ $dbuser=$value;
+ }
+ if($option eq "dbname")
+ {
+ $dbname=$value;
+ }
+ if($option eq "dbschema")
+ {
+ $dbschema=$value;
+ if($dbschema ne "")
+ {
+ $dbschema="$dbschema.";
+ }
+ }
+ if($option eq "dbtable")
+ {
+ $dbtable=$value;
+ }
}
close(CFG);
+ if ($multiserver)
+ {
+ $x2goserver=`echo "select server from $dbschema$dbtable where uname='$userName' limit 1" | psql -U $dbuser -h $dbhost -t $dbname`;
+ chomp($x2goserver);
+ chomp($x2goserver);
+ $x2goserver=~s/ //g;
+ }
}
}
@@ -119,7 +160,6 @@
print STDERR "ERROR: Usage: cups-x2go job-id user title copies options [file]\n";
exit 1;
}
-
my $jobID;
my $jobTitle;
my $copies;
@@ -128,7 +168,6 @@
($jobID, $userName, $jobTitle, $copies, $printOptions, $printFile) = @ARGV;
-
my $tempFile;
if (!$printFile)
{
___
X2go-dev mailing list
X2go-dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
