From 28abc9e9da77a16a1d67ae6b857c971653e855e3 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Fri, 24 Oct 2008 04:00:48 -0400 Subject: [PATCH] sipb-xen-console -> invirt-console-server svn path=/trunk/packages/sipb-xen-console/; revision=1200 --- debian/changelog | 7 +++++++ debian/control | 11 +++++----- debian/copyright | 2 +- ...xen-console.init => invirt-console-server.init} | 14 ++++++------- ...nsole.install => invirt-console-server.install} | 0 debian/rules | 22 ++++++++++---------- ...sc.sh.sipb-xen => transform_bootmisc.sh.invirt} | 0 ...cd.conf.sipb-xen => transform_nscd.conf.invirt} | 0 ...onf.sipb-xen => transform_nsswitch.conf.invirt} | 0 ...ansform_sshd.sipb-xen => transform_sshd.invirt} | 0 ...-xen => transform_sshd_config.debathena.invirt} | 0 .../{conserver.cf.sipb-xen => conserver.cf.invirt} | 0 files/etc/{motd.sipb-xen => motd.invirt} | 0 files/etc/nss-pgsql.conf.mako | 6 +++--- ...irt-console.mako => invirt-console-server.mako} | 0 .../bin/{sipb-xen-consolefs => invirt-consolefs} | 2 +- .../bin/{sipb-xen-consolesh => invirt-consolesh} | 0 17 files changed, 35 insertions(+), 29 deletions(-) rename debian/{sipb-xen-console.init => invirt-console-server.init} (90%) rename debian/{sipb-xen-console.install => invirt-console-server.install} (100%) rename debian/{transform_bootmisc.sh.sipb-xen => transform_bootmisc.sh.invirt} (100%) rename debian/{transform_nscd.conf.sipb-xen => transform_nscd.conf.invirt} (100%) rename debian/{transform_nsswitch.conf.sipb-xen => transform_nsswitch.conf.invirt} (100%) rename debian/{transform_sshd.sipb-xen => transform_sshd.invirt} (100%) rename debian/{transform_sshd_config.debathena.sipb-xen => transform_sshd_config.debathena.invirt} (100%) rename files/etc/conserver/{conserver.cf.sipb-xen => conserver.cf.invirt} (100%) rename files/etc/{motd.sipb-xen => motd.invirt} (100%) rename files/etc/remctl/acl/{invirt-console.mako => invirt-console-server.mako} (100%) rename files/usr/bin/{sipb-xen-consolefs => invirt-consolefs} (97%) rename files/usr/bin/{sipb-xen-consolesh => invirt-consolesh} (100%) diff --git a/debian/changelog b/debian/changelog index 20977e4..fc22eaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +invirt-console-server (0.0.1) unstable; urgency=low + + * sipb-xen -> invirt + * -> -server while we're at it + + -- Greg Price Fri, 24 Oct 2008 03:54:40 -0400 + sipb-xen-console (8.4) unstable; urgency=low * Create a dummy console entry that exists by default so that conserver diff --git a/debian/control b/debian/control index 084f3bc..23ecb0c 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,14 @@ -Source: sipb-xen-console +Source: invirt-console-server Section: servers Priority: extra -Maintainer: SIPB Xen Project +Maintainer: Invirt Project Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~), nscd, openssh-server, debathena-ssh-server-config, initscripts Standards-Version: 3.7.2 -Package: sipb-xen-console +Package: invirt-console-server 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, 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. +Description: Invirt serial-console proxy server + This is the software for the serial-console proxy server. diff --git a/debian/copyright b/debian/copyright index 7789434..ea245dc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,3 @@ This package was created for internal use of the SIPB Xen Project of -the MIT Student Information Processing Board. Ask sipb-xen@mit.edu if +the MIT Student Information Processing Board. Ask invirt@mit.edu if you have questions about redistribution. diff --git a/debian/sipb-xen-console.init b/debian/invirt-console-server.init similarity index 90% rename from debian/sipb-xen-console.init rename to debian/invirt-console-server.init index 026eb1e..55e0428 100755 --- a/debian/sipb-xen-console.init +++ b/debian/invirt-console-server.init @@ -1,23 +1,23 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: sipb-xen-console +# Provides: invirt-console-server # Required-Start: $local_fs $remote_fs # Required-Stop: $local_fs $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: sipb-xen Console Server homedir filesystem +# Short-Description: Invirt console proxy server # Description: ### END INIT INFO -# Author: SIPB Xen Project +# Author: Invirt Project # Do NOT "set -e" # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="The sipb-xen console server" -NAME=sipb-xen-console -DAEMON=/usr/bin/sipb-xen-consolefs +DESC="the Invirt console server" +NAME=invirt-console-server +DAEMON=/usr/bin/invirt-consolefs DAEMON_ARGS="/consolefs" PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME @@ -38,7 +38,7 @@ SCRIPTNAME=/etc/init.d/$NAME gen_config() { for i in /etc/conserver/invirt-hosts.cf \ - /etc/remctl/acl/invirt-console \ + /etc/remctl/acl/invirt-console-server \ /etc/issue.net.no_tkt \ /etc/nss-pgsql.conf \ ; do diff --git a/debian/sipb-xen-console.install b/debian/invirt-console-server.install similarity index 100% rename from debian/sipb-xen-console.install rename to debian/invirt-console-server.install diff --git a/debian/rules b/debian/rules index a477b1e..47cbab2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,21 @@ #!/usr/bin/make -f -DEB_DIVERT_EXTENSION = .sipb-xen -DEB_TRANSFORM_FILES_sipb-xen-console += \ - /etc/init.d/bootmisc.sh.sipb-xen \ - /etc/nsswitch.conf.sipb-xen \ - /etc/nscd.conf.sipb-xen \ - /etc/pam.d/sshd.sipb-xen \ - /etc/ssh/sshd_config.debathena.sipb-xen +DEB_DIVERT_EXTENSION = .invirt +DEB_TRANSFORM_FILES_invirt-console-server += \ + /etc/init.d/bootmisc.sh.invirt \ + /etc/nsswitch.conf.invirt \ + /etc/nscd.conf.invirt \ + /etc/pam.d/sshd.invirt \ + /etc/ssh/sshd_config.debathena.invirt ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),) - DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.sipb-xen = \ + DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.invirt = \ /usr/share/base-files/nsswitch.conf endif -DEB_DIVERT_FILES_sipb-xen-console += \ - /etc/conserver/conserver.cf.sipb-xen \ - /etc/motd.sipb-xen +DEB_DIVERT_FILES_invirt-console-server += \ + /etc/conserver/conserver.cf.invirt \ + /etc/motd.invirt include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/config-package.mk diff --git a/debian/transform_bootmisc.sh.sipb-xen b/debian/transform_bootmisc.sh.invirt similarity index 100% rename from debian/transform_bootmisc.sh.sipb-xen rename to debian/transform_bootmisc.sh.invirt diff --git a/debian/transform_nscd.conf.sipb-xen b/debian/transform_nscd.conf.invirt similarity index 100% rename from debian/transform_nscd.conf.sipb-xen rename to debian/transform_nscd.conf.invirt diff --git a/debian/transform_nsswitch.conf.sipb-xen b/debian/transform_nsswitch.conf.invirt similarity index 100% rename from debian/transform_nsswitch.conf.sipb-xen rename to debian/transform_nsswitch.conf.invirt diff --git a/debian/transform_sshd.sipb-xen b/debian/transform_sshd.invirt similarity index 100% rename from debian/transform_sshd.sipb-xen rename to debian/transform_sshd.invirt diff --git a/debian/transform_sshd_config.debathena.sipb-xen b/debian/transform_sshd_config.debathena.invirt similarity index 100% rename from debian/transform_sshd_config.debathena.sipb-xen rename to debian/transform_sshd_config.debathena.invirt diff --git a/files/etc/conserver/conserver.cf.sipb-xen b/files/etc/conserver/conserver.cf.invirt similarity index 100% rename from files/etc/conserver/conserver.cf.sipb-xen rename to files/etc/conserver/conserver.cf.invirt diff --git a/files/etc/motd.sipb-xen b/files/etc/motd.invirt similarity index 100% rename from files/etc/motd.sipb-xen rename to files/etc/motd.invirt diff --git a/files/etc/nss-pgsql.conf.mako b/files/etc/nss-pgsql.conf.mako index 5ac451b..5e942c0 100644 --- a/files/etc/nss-pgsql.conf.mako +++ b/files/etc/nss-pgsql.conf.mako @@ -1,9 +1,9 @@ <% from invirt.config import structs as cfg %> connectionstring = host=${cfg.db.host} dbname=${cfg.db.dbname} user=${cfg.db.user} port=${cfg.db.port} -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 +getpwnam = SELECT name, NULL, name, '/consolefs/'|| name, '/usr/bin/invirt-consolesh', machine_id + 1000, machine_id + 1000 FROM machines WHERE name = $1 +getpwuid = SELECT name, NULL, name, '/consolefs/'|| name, '/usr/bin/invirt-consolesh', machine_id + 1000, machine_id + 1000 FROM machines WHERE machine_id + 1000 = $1 +allusers = SELECT name, NULL, name, '/consolefs/'|| name, '/usr/bin/invirt-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; diff --git a/files/etc/remctl/acl/invirt-console.mako b/files/etc/remctl/acl/invirt-console-server.mako similarity index 100% rename from files/etc/remctl/acl/invirt-console.mako rename to files/etc/remctl/acl/invirt-console-server.mako diff --git a/files/usr/bin/sipb-xen-consolefs b/files/usr/bin/invirt-consolefs similarity index 97% rename from files/usr/bin/sipb-xen-consolefs rename to files/usr/bin/invirt-consolefs index aa7d1ca..53c37d5 100755 --- a/files/usr/bin/sipb-xen-consolefs +++ b/files/usr/bin/invirt-consolefs @@ -29,7 +29,7 @@ class ConsoleFS(routefs.RouteFS): self.lasttime = time() self.fuse_args.add("allow_other", True) - openlog('sipb-xen-consolefs ', LOG_PID, LOG_DAEMON) + openlog('invirt-consolefs ', LOG_PID, LOG_DAEMON) syslog(LOG_DEBUG, 'Init complete.') diff --git a/files/usr/bin/sipb-xen-consolesh b/files/usr/bin/invirt-consolesh similarity index 100% rename from files/usr/bin/sipb-xen-consolesh rename to files/usr/bin/invirt-consolesh -- 1.7.9.5