Commit missed file for last commit.
authorMaximilian Wilhelm <max@rfc2324.org>
Tue, 13 May 2008 23:22:07 +0000 (01:22 +0200)
committerMaximilian Wilhelm <max@rfc2324.org>
Tue, 13 May 2008 23:22:07 +0000 (01:22 +0200)
Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>

debian/changelog
debian/control
debian/dirs [deleted file]
debian/rbm-ssh-keysync-client.cron.d [deleted file]
debian/rbm-ssh-keysync-client.postinst [deleted file]
debian/rbm-ssh-keysync-server.cron.d [deleted file]
debian/rbm-ssh-keysync-server.postinst [deleted file]
debian/rules

index 6bad806..e82a7e1 100644 (file)
@@ -1,3 +1,11 @@
+ssh-keysync (0.5) unstable; urgency=low
+
+  * Initial really official release.
+  * Removed all RBM references as this software was developed in private.
+  * Pimped coding style
+
+ -- Maximilian Wilhelm <max@rfc2324.org>  Wed, 14 May 2008 00:40:40 +0200
+
 rbm-ssh-keysync (0.4.1) stable; urgency=low
 
   * Allow alpha-numerical character and '-' in hostnames.
index 4d8c0ae..2d177cb 100644 (file)
@@ -1,11 +1,11 @@
-Source: rbm-ssh-keysync
+Source: ssh-keysync
 Section: admin
 Priority: optional
 Maintainer: Maximilian Wilhelm <max@rfc2324.org>
 Build-Depends: debhelper (>> 3.0.0)
 Standards-Version: 3.5.2
 
-Package: rbm-ssh-keysync-server
+Package: ssh-keysync-server
 Architecture: all
 Depends: perl, libconfig-inifiles-perl, libnet-dns-perl, adduser
 Suggests: apache
@@ -28,7 +28,7 @@ Description: server-side script for generating/sharing ssh_known_hosts
  /var/cache/ssh-keysync/pub as /ssh-keysync for you.
 
 
-Package: rbm-ssh-keysync-client
+Package: ssh-keysync-client
 Architecture: all
 Depends: ssh, wget, netkit-ping | iputils-ping
 Description: client side script for distributing ssh_known_hosts
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index b73baf7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-etc/rbm
diff --git a/debian/rbm-ssh-keysync-client.cron.d b/debian/rbm-ssh-keysync-client.cron.d
deleted file mode 100644 (file)
index 1555ab5..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/opt/sbin:/opt/bin
-#
-# Regular cron jobs for the ssh-keysync-client package
-#
-42 * * * * root ( /usr/sbin/ssh-keysync -pull -quiet )
diff --git a/debian/rbm-ssh-keysync-client.postinst b/debian/rbm-ssh-keysync-client.postinst
deleted file mode 100644 (file)
index ae8fef9..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# postinst script for sshkey-sync-client
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
-    configure)
-       works="false"
-       if /usr/sbin/ssh-keysync -configcheck 2>/dev/null; then
-               if /usr/sbin/ssh-keysync -pull; then
-                       works="true"
-               fi
-       fi
-
-       if [ "${works}" == "false" ]; then
-               echo "Attention: You have to customize /etc/rbm/ssh-keysync-client.conf to make ssh-keysync work."
-       fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/rbm-ssh-keysync-server.cron.d b/debian/rbm-ssh-keysync-server.cron.d
deleted file mode 100644 (file)
index b73bd26..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/opt/sbin:/opt/bin
-#
-# Regular cron jobs for the ssh-keysync-server package
-#
-23 * * * * skeysync ( /usr/bin/ssh-keysync-merge -quiet )
diff --git a/debian/rbm-ssh-keysync-server.postinst b/debian/rbm-ssh-keysync-server.postinst
deleted file mode 100644 (file)
index 26d74ef..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# rbm-ssh-keysync-server.postinst
-#
-# vim:set foldmethod=marker:
-# 
-
-is_initial_configuration() {                                            # {{{
-# Check if this is the initial configuration and not an upgrade of an 
-# existing configuration
-# Usage: if is_initial_configuration "$@"; then ... fi from top level
-
-        # Plain installation
-        if [ "$1" = configure ] && [ -z "$2" ]; then
-                return 0
-        fi
-        # Configuration via dpkg-reconfigure
-        if [ "$1" = reconfigure ] || [ "$DEBCONF_RECONFIGURE" ]; then
-                return 0
-        fi
-        return 1
-}
-
-# }}}
-
-# Create ssh-keysync management user, if not allready there
-if ! getent passwd skeysync > /dev/null; then
-        adduser --system --home /var/cache/ssh-keysync/ --no-create-home --shell /bin/bash skeysync
-fi
-
-# Create ssh-keysync management group, if no allready there
-if ! getent group skeysync > /dev/null; then
-       addgroup --system skeysync
-fi
-
-# Set primary group of the ssh-keysync user to skeysync if not allready done.
-if [ `id -n -g skeysync` != skeysync ]; then
-       usermod -g skeysync skeysync
-fi
-
-# If you have a 'fai' user, you might want to let this user write to
-# /var/cache/ssh-keysync, so we put him into the group
-if getent passwd fai > /dev/null; then
-       if [ `id -n -G fai | grep -c skeysync` == 0 ]; then
-               adduser fai skeysync
-       fi
-fi
-
-# create public directory that will be shared by a webserver (apache by
-# default) to let the clients access the generated ssh_knonw_hosts files.
-mkdir -p /var/cache/ssh-keysync/pub
-
-# set feasible rights to allow every member of 'skeysync'
-# to write in /var/cache/ssh-keysync
-find /var/cache/ssh-keysync -type d -exec chmod 2775 {} \;
-find /var/cache/ssh-keysync -type f -exec chmod  664 {} \;
-find /var/cache/ssh-keysync -exec chown skeysync:skeysync {} \;
-
-##
-# Call automagic upgrade script if this package is upgraded
-if ! is_initial_configuration "$@"; then
-       /usr/bin/upgrade_sshkeysync
-fi
-
-##
-# If apache is installed, place a config in conf.d
-if dpkg -l apache | grep -q ^ii; then
-       cp /usr/share/doc/rbm-ssh-keysync-server/apache-example.conf /etc/apache/conf.d/rbm-ssh-keysync-server.conf
-       /etc/init.d/apache reload
-fi
index 094e344..4ed1d1f 100755 (executable)
@@ -9,49 +9,24 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
-
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       # Add here commands to configure the package.
-
-       touch configure-stamp
-
-
-#build-indep:  configure-stamp build-indep-stamp
-#build-indep-stamp:
-#      dh_testdir
-
-       # Add here command to compile/build the arch indep package.
-       # It's ok not to do anything here, if you don't need to build
-       #  anything for this package.
+build:
 
-#      touch build-indep-stamp
-
-build: build-stamp
-build-stamp:
-       dh_testdir
-       # nix
 
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp
 
        # Add here commands to clean up after the build process.
-       rm -rf $(CURDIR)/debian/rbm-ssh-keysync-{server,client}
-       rm -rf $(CURDIR)/debian/tmp
+       rm -rf $(CURDIR)/debian/ssh-keysync-{server,client}
 
        dh_clean
 
+
 install: DH_OPTIONS=
 install: build
        dh_testdir
@@ -59,37 +34,16 @@ install: build
        dh_clean -k
        dh_installdirs
 
-       # Add here commands to install the package into debian/sshkey-sync.
-       mkdir -p $(CURDIR)/debian/tmp
-
 
        ## ssh-keysync-client ##
-       mkdir -p $(CURDIR)/debian/rbm-ssh-keysync-client/usr/sbin
-       mkdir -p $(CURDIR)/debian/rbm-ssh-keysync-client/usr/share/man
-       mkdir -p $(CURDIR)/debian/rbm-ssh-keysync-client/etc/rbm
-       
-       install -m 750 -o root -g root files/client/ssh-keysync $(CURDIR)/debian/rbm-ssh-keysync-client/usr/sbin
-       install -m 640 -o root -g root files/client/ssh-keysync-client.conf $(CURDIR)/debian/rbm-ssh-keysync-client/etc/rbm
-       cp -R $(CURDIR)/files/client/man1/ $(CURDIR)/debian/rbm-ssh-keysync-client/usr/share/man/
-       find $(CURDIR)/debian/rbm-ssh-keysync-client/ -name CVS -type d | xargs rm -rf
+       install -m 755 -o root -g root    $(CURDIR)/files/client/ssh-keysync $(CURDIR)/debian/ssh-keysync-client/usr/sbin
+       install -m 640 -o root -g root    $(CURDIR)/files/client/ssh-keysync-client.conf $(CURDIR)/debian/ssh-keysync-client/etc/ssh-keysync
 
 
        ## ssh-keysync-server ##
-       mkdir -p $(CURDIR)/debian/rbm-ssh-keysync-server/etc/rbm
-       install -m 644 $(CURDIR)/files/server/ssh-keysync-server.conf $(CURDIR)/debian/rbm-ssh-keysync-server/etc/rbm
-
-       mkdir -p $(CURDIR)/debian/rbm-ssh-keysync-server/usr/bin
-       install -m 755 -o root -g root $(CURDIR)/files/server/{upgrade_sshkeysync,ssh-keysync-{adddomain,merge}} $(CURDIR)/debian/rbm-ssh-keysync-server/usr/bin
-
-       mkdir -p $(CURDIR)/debian/rbm-ssh-keysync-server/usr/share/{doc/rbm-ssh-keysync-server,man,perl5}
-       cp $(CURDIR)/files/server/apache-example.conf $(CURDIR)/debian/rbm-ssh-keysync-server/usr/share/doc/rbm-ssh-keysync-server/
-       cp -R $(CURDIR)/files/server/man1/ $(CURDIR)/debian/rbm-ssh-keysync-server/usr/share/man/
-       cp -R $(CURDIR)/files/server/RBM $(CURDIR)/debian/rbm-ssh-keysync-server/usr/share/perl5/
-       
-       find $(CURDIR)/debian/rbm-ssh-keysync-server/ -exec chown root:root {} \;
-       find $(CURDIR)/debian/rbm-ssh-keysync-server/ -name CVS -type d | xargs rm -rf
-
-       dh_movefiles
+       install -m 755 -o root -g root    $(CURDIR)/files/server/{upgrade_sshkeysync,ssh-keysync-{adddomain,merge}} $(CURDIR)/debian/ssh-keysync-server/usr/bin
+       mkdir -p  $(CURDIR)/debian/ssh-keysync-server/usr/share/perl5/
+       cp -R $(CURDIR)/files/server/SshKeySync $(CURDIR)/debian/ssh-keysync-server/usr/share/perl5/
 
 
 # Build architecture-independent files here.
@@ -97,19 +51,11 @@ install: build
 binary-indep: build install
        dh_testdir -i
        dh_testroot -i
-#      dh_installdebconf -i
        dh_installdocs -i
-#      dh_installexamples -i
-#      dh_installmenu -i
-#      dh_installlogrotate -i
-#      dh_installemacsen -i
-#      dh_installpam -i
-#      dh_installmime -i
-#      dh_installinit -i
        dh_installcron -i
-       dh_installman -i
-#      dh_installinfo -i
-#      dh_undocumented -i
+       dh_installman -p ssh-keysync-server files/server/man1/{ssh-keysync-merge.1,upgrade_sshkeysync.1}
+       dh_installman -p ssh-keysync-client files/client/man1/ssh-keysync.1
+       dh_installexamples -p ssh-keysync-server files/server/apache-example.conf
        dh_installchangelogs  -i
        dh_link -i
        dh_compress -i
@@ -121,4 +67,4 @@ binary-indep: build install
        dh_builddeb -i
 
 binary: binary-indep
-.PHONY: build clean binary-indep binary install configure
+.PHONY: build clean binary-indep binary install