[X2go-dev] [PATCH 2/4] cups-x2go.conf: explain an option before setting the option

Paul Menzel paulepanter at users.sourceforge.net
Fri Apr 15 10:28:55 CEST 2011


Dear X2go folks,


Am Freitag, den 15.04.2011, 10:10 +0200 schrieb Paul Menzel:
> Date: Fri, 15 Apr 2011 09:57:07 +0200
> 
> In my experience this way is more widely used.
> 
> Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
> ---
> • wording in commit summary: Use explain or describe?

the commit summary is incomplete, since I also changed
`README.Multi-CUPS-Servers`. Please adapt that to your policy as you see
fit.


Thanks,

Paul

> • Maybe the example file should be put in a separate file `cups-x2go.conf.example`?
> ---
>  README.Multi-CUPS-Servers |   20 ++++++++++----------
>  cups-x2go.conf            |   13 +++++++------
>  2 files changed, 17 insertions(+), 16 deletions(-)
> 
> diff --git a/README.Multi-CUPS-Servers b/README.Multi-CUPS-Servers
> index 4041840..885d8bf 100644
> --- a/README.Multi-CUPS-Servers
> +++ b/README.Multi-CUPS-Servers
> @@ -91,36 +91,36 @@ like this (this example includes sample customizations):
>  # Used when this print server must service multiple X2Go Servers
>  # This requires a single database for all X2Go Server session data
>  
> -#multiserver = 0
> -multiserver = 1
>  # Set multiserver to 0 (zero) to disable and 1 (one) to enable
>  # defaults to 0
> +#multiserver = 0
> +multiserver = 1
>  
> -#dbhost = localhost
> -dbhost = pgserver.mycompany.com
>  # Set dbhost to the name of the database host
>  # defaults to localhost
> +#dbhost = localhost
> +dbhost = pgserver.mycompany.com
>  
> -#dbuser = postgres
> -dbuser = someuser
>  # Set dbuser to the user ID for logging into the database
>  # defaults to postgres
> +#dbuser = postgres
> +dbuser = someuser
>  
> -#dbname = x2go_sessions
>  # Set dbname to the database name
>  # defaults to x2go_sessions
> +#dbname = x2go_sessions
>  
> -#dbschema =
> -dbschema = postgres
>  # 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
> +#dbschema =
> +dbschema = postgres
>  
> -#dbtable = sessions
>  # Set dbtables to the database table used to hold the session data
>  # defaults to sessions
> +#dbtable = sessions
>  #==========================
>  
> 
> diff --git a/cups-x2go.conf b/cups-x2go.conf
> index 7232018..e21628c 100644
> --- a/cups-x2go.conf
> +++ b/cups-x2go.conf
> @@ -15,30 +15,31 @@
>  #==========================
>  # 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
> +#multiserver = 0
>  
> -#dbhost = localhost
>  # Set dbhost to the name of the database host
>  # defaults to localhost
> +#dbhost = localhost
>  
> -#dbuser = postgres
>  # Set dbuser to the user ID for logging into the database
>  # defaults to postgres
> +#dbuser = postgres
>  
> -#dbname = x2go_sessions
>  # Set dbname to the database name
>  # defaults to x2go_sessions
> +#dbname = 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
> +#dbschema = 
>  
> -#dbtable = sessions
>  # Set dbtables to the database table used to hold the session data
>  # defaults to sessions
> +#dbtable = sessions
>  #==========================
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x2go.org/pipermail/x2go-dev/attachments/20110415/1f432026/attachment.pgp>


More information about the x2go-dev mailing list