From 5425e1410471a188dadd826c3ef44108221f5c5e Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Mon, 6 Oct 2008 02:32:00 -0400 Subject: [PATCH] Update nss-pgsql.conf.mako to reflect new (more sane) config file format svn path=/trunk/packages/sipb-xen-console/; revision=1072 --- debian/changelog | 6 ++++++ debian/control | 2 +- files/etc/nss-pgsql.conf.mako | 22 ++++++++-------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1d91eb..f2ef80c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sipb-xen-console (8.3) unstable; urgency=low + + * Update nss-pgsql.conf.mako to reflect new config file format + + -- Evan Broder Mon, 06 Oct 2008 02:31:37 -0400 + sipb-xen-console (8.2) unstable; urgency=low * Actually generate nscd.conf correctly diff --git a/debian/control b/debian/control index 8233836..084f3bc 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Package: sipb-xen-console Architecture: all Provides: ${diverted-files} Conflicts: ${diverted-files} -Depends: sipb-xen-base, ${shlibs:Depends}, ${misc:Depends}, conserver-client, daemon, debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd, openssh-server, python, python-routefs, sipb-xen-chrony-config, sipb-xen-database-common, remctl-server +Depends: sipb-xen-base, ${shlibs:Depends}, ${misc:Depends}, conserver-client, daemon, debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd, openssh-server, python, python-routefs, sipb-xen-chrony-config, sipb-xen-database-common, remctl-server, debathena-ssh-server-config Description: SIPB Xen serial console server This package should be installed on sipb-xen-console It makes sure that necessary tools are available. diff --git a/files/etc/nss-pgsql.conf.mako b/files/etc/nss-pgsql.conf.mako index e1aa001..5ac451b 100644 --- a/files/etc/nss-pgsql.conf.mako +++ b/files/etc/nss-pgsql.conf.mako @@ -1,16 +1,10 @@ <% from invirt.config import structs as cfg %> -host = ${cfg.db.host} -port = ${cfg.db.port} -database = ${cfg.db.dbname} -login = ${cfg.db.user} +connectionstring = host=${cfg.db.host} dbname=${cfg.db.dbname} user=${cfg.db.user} port=${cfg.db.port} -querypasswd = SELECT name, NULL, machine_id + 1000 as uid, machine_id + 1000 as gid, '', '/consolefs/'|| name, '/usr/bin/sipb-xen-consolesh' FROM machines -querygroup = SELECT name, NULL, machine_id + 1000 as gid FROM machines -querymembers = SELECT name FROM machines WHERE 1000 + machine_id = %d -queryids = SELECT 1000 + machine_id AS gid FROM machines LIMIT 0 - -passwd_name = name -passwd_uid = 1000 + machine_id - -group_name = name -group_gid = 1000 + machine_id +getpwnam = SELECT name, NULL, name, '/consolefs/'|| name, '/usr/bin/sipb-xen-consolesh', machine_id + 1000, machine_id + 1000 FROM machines WHERE name = $1 +getpwuid = SELECT name, NULL, name, '/consolefs/'|| name, '/usr/bin/sipb-xen-consolesh', machine_id + 1000, machine_id + 1000 FROM machines WHERE machine_id + 1000 = $1 +allusers = SELECT name, NULL, name, '/consolefs/'|| name, '/usr/bin/sipb-xen-consolesh', machine_id + 1000, machine_id + 1000 FROM machines +getgrnam = SELECT name, NULL, machine_id + 1000 FROM machines WHERE name = $1 +getgrgid = SELECT name, NULL, machine_id + 1000 FROM machines WHERE machine_id + 1000 = $1 +groups_dyn = SELECT NULL LIMIT 0; +allgroups = SELECT name, NULL, machine_id + 1000 FROM machines -- 1.7.9.5