From a8168381a0022e9f8435a8599d209f5fc49b2098 Mon Sep 17 00:00:00 2001 From: Greg Brockman Date: Thu, 24 Dec 2009 16:51:49 -0500 Subject: [PATCH] Moved most of debathena config into invirt-base svn path=/package_branches/invirt-console/hvirt/; revision=2777 --- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/rules | 6 ++---- debian/transform_krb5.conf.invirt | 25 ------------------------- debian/transform_sshd_config.invirt | 16 ---------------- debian/transform_sshd_config.invirt.invirt | 5 +++++ 6 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 debian/transform_krb5.conf.invirt delete mode 100755 debian/transform_sshd_config.invirt create mode 100755 debian/transform_sshd_config.invirt.invirt diff --git a/debian/changelog b/debian/changelog index 34daba9..72e5183 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-console (0.2.13) unstable; urgency=low + + * Moved most of debathena config into invirt-base + + -- Greg Brockman Thu, 24 Dec 2009 16:52:16 -0500 + invirt-console (0.2.12) unstable; urgency=low * Removed dependency on debathena pkgs diff --git a/debian/control b/debian/control index 7f347e6..fe8c65c 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: invirt-console Section: servers Priority: extra Maintainer: Invirt project -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~), nscd, openssh-server, initscripts, krb5-config, krb5-user, krb5-clients +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~), nscd, openssh-server, initscripts, invirt-base Standards-Version: 3.7.2 Package: invirt-console-server @@ -11,7 +11,7 @@ Provides: ${diverted-files} Conflicts: ${diverted-files} Depends: invirt-base, ${shlibs:Depends}, ${misc:Depends}, conserver-client, conserver-server, daemon, - fuse-utils, libnss-pgsql1, nscd, krb5-config, krb5-user, krb5-clients, + fuse-utils, libnss-pgsql1, nscd, openssh-server, python, python-routefs, invirt-database, remctl-server Description: Invirt serial-console proxy server diff --git a/debian/rules b/debian/rules index 6b1ea1d..ab4386d 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ DEB_TRANSFORM_FILES_invirt-console-server += \ /etc/nsswitch.conf.invirt \ /etc/nscd.conf.invirt \ /etc/pam.d/sshd.invirt \ - /etc/ssh/sshd_config.invirt + /etc/ssh/sshd_config.invirt.invirt ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),) DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.invirt = \ @@ -15,9 +15,7 @@ endif DEB_DIVERT_FILES_invirt-console-server += \ /etc/conserver/conserver.cf.invirt \ - /etc/krb5.conf \ - /etc/motd.invirt \ - /etc/ssh/sshd_config + /etc/motd.invirt DEB_DIVERT_FILES_invirt-console-host += \ /etc/conserver/conserver.cf.invirt \ /etc/conserver/server.conf.invirt diff --git a/debian/transform_krb5.conf.invirt b/debian/transform_krb5.conf.invirt deleted file mode 100644 index 7ea96da..0000000 --- a/debian/transform_krb5.conf.invirt +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/perl -p0 -# Debathena rules (from debathena-kerberos-config) -s/^([ \t]*default_realm *=).*$/\1 ATHENA.MIT.EDU/m or die; -s/(\[realms\][^[]*\n)[ \t]*NUMENOR\.MIT\.EDU\s*=\s*\{[^}]*\}\s*\n/\1/; -s/(\[realms\]\n)/\1\tNUMENOR.MIT.EDU = {\n\t\tkdc = numenor.mit.edu\n\t\tadmin_server = numenor.mit.edu\n\t}\n/ or die; -s/(\[realms\][^[]*\n)[ \t]*CSAIL\.MIT\.EDU\s*=\s*\{[^}]*\}\s*\n/\1/; -s/(\[realms\]\n)/\1\tCSAIL.MIT.EDU = {\n\t\tkdc = kerberos-1.csail.mit.edu\n\t\tkdc = kerberos-2.csail.mit.edu\n\t\tadmin_server = kerberos.csail.mit.edu\n\t\tdefault_domain = csail.mit.edu\n\t\tkrb524_server = krb524.csail.mit.edu\n\t}\n/ or die; -s/(\[realms\][^[]*\n)[ \t]*ATHENA\.MIT\.EDU\s*=\s*\{[^}]*\}\s*\n/\1/; -s/(\[realms\]\n)/\1\tATHENA.MIT.EDU = {\n\t\tkdc = kerberos.mit.edu:88\n\t\tkdc = kerberos-1.mit.edu:88\n\t\tkdc = kerberos-2.mit.edu:88\n\t\tadmin_server = kerberos.mit.edu\n\t\tdefault_domain = mit.edu\n\t}\n/ or die; -s/(\[domain_realm\][^[]*\n)[ \t]*numenor\.mit\.edu\s*=[^\n]*\n/\1/; -s/(\[domain_realm\]\n)/\1\tnumenor.mit.edu = NUMENOR.MIT.EDU\n/ or die; -s/(\[domain_realm\][^[]*\n)[ \t]*csail\.mit\.edu\s*=[^\n]*\n/\1/; -s/(\[domain_realm\]\n)/\1\tcsail.mit.edu = CSAIL.MIT.EDU\n/ or die; -s/(\[domain_realm\][^[]*\n)[ \t]*\.csail\.mit\.edu\s*=[^\n]*\n/\1/; -s/(\[domain_realm\]\n)/\1\t.csail.mit.edu = CSAIL.MIT.EDU\n/ or die; -s/(\[domain_realm\][^[]*\n)[ \t]*mit\.edu\s*=[^\n]*\n/\1/; -s/(\[domain_realm\]\n)/\1\tmit.edu = ATHENA.MIT.EDU\n/ or die; -s/(\[domain_realm\][^[]*\n)[ \t]*\.mit\.edu\s*=[^\n]*\n/\1/; -s/(\[domain_realm\]\n)/\1\t.mit.edu = ATHENA.MIT.EDU\n/ or die; - -# Invirt rules - -s/(\[realms\]\n)/\1\tHCS.HARVARD.EDU = {\n\t\tkdc = krb1.hcs.harvard.edu\n\t\tadmin_server = krb1.hcs.harvard.edu\n\t}\n/ or die; -s/(\[domain_realm\]\n)/\1\thcs.harvard.edu = HCS.HARVARD.EDU\n/ or die; -s/(\[domain_realm\]\n)/\1\t.hcs.harvard.edu = HCS.HARVARD.EDU\n/ or die; diff --git a/debian/transform_sshd_config.invirt b/debian/transform_sshd_config.invirt deleted file mode 100755 index 892270d..0000000 --- a/debian/transform_sshd_config.invirt +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/perl -0p -# Debathena rules (from debathena-ssh-server-config) -s/^#?GSSAPIAuthentication .*$/GSSAPIAuthentication yes\nGSSAPIKeyExchange yes\nGSSAPIStrictAcceptorCheck no/m or die; -s/^#?GSSAPICleanupCredentials .*$/GSSAPICleanupCredentials yes/m or die; -s/^#?ChallengeResponseAuthentication .*$/ChallengeResponseAuthentication yes/m or die; -## In Debathena, privilege separation is configurable. -s/^#?UsePrivilegeSeparation .*$/UsePrivilegeSeparation yes/m or die; -s/^#?PasswordAuthentication .*$/PasswordAuthentication no/m or die; - -# Invirt rules -s/^#?PrintLastLog .*$/PrintLastLog no/m or die; -s/$/\nAllowTcpForwarding no/ or die; -s/^#?X11Forwarding .*$/X11Forwarding no/m or die; -s/^#?Subsystem sftp.*$//m or die; - - diff --git a/debian/transform_sshd_config.invirt.invirt b/debian/transform_sshd_config.invirt.invirt new file mode 100755 index 0000000..c63b2fd --- /dev/null +++ b/debian/transform_sshd_config.invirt.invirt @@ -0,0 +1,5 @@ +#!/usr/bin/perl -0p +s/^#?PrintLastLog .*$/PrintLastLog no/m or die; +s/$/\nAllowTcpForwarding no/ or die; +s/^#?X11Forwarding .*$/X11Forwarding no/m or die; +s/^#?Subsystem sftp.*$//m or die; -- 1.7.9.5