Removed RBM keyword from all source files

  As this software was developed in private, I removed the RBM keyword
  from all source files.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>

diff --git a/files/client/man1/ssh-keysync.1 b/files/client/man1/ssh-keysync.1
index d3b79c0..dc33594 100644 (file)
--- a/files/client/man1/ssh-keysync.1
+++ b/files/client/man1/ssh-keysync.1
@@ -60,7 +60,7 @@ from cron.
 .\" Files used by this utility
 .SH FILES
 .TP
-.I /etc/rbm/ssh-keysync-client.conf
+.I /etc/ssh-keysync/ssh-keysync-client.conf
 Configuration file used by
 .BR ssh-keysync
 

diff --git a/files/client/ssh-keysync b/files/client/ssh-keysync
index 4be39e3..3378a6b 100755 (executable)
--- a/files/client/ssh-keysync
+++ b/files/client/ssh-keysync
@@ -1,7 +1,9 @@
 #!/bin/sh
 #
-# Pull ssh host keys
+# Pull ssh host keys from server
 #
+# 
+# 
 # Maximilian Wilhelm <max@rfc2324.org>
 # -- Sat, 17 Apr 2004 13:36:30 +0200
 #
@@ -13,7 +15,7 @@ debug=1;
 TMP_DIR="/tmp"
 
 # 
-CONFIG_FILE="/etc/rbm/ssh-keysync-client.conf"
+CONFIG_FILE="/etc/ssh-keysync/ssh-keysync-client.conf"
 
 # Check some things
 init()

diff --git a/files/client/ssh-keysync-client.conf b/files/client/ssh-keysync-client.conf
index 69726fc..c39bf31 100644 (file)
--- a/files/client/ssh-keysync-client.conf
+++ b/files/client/ssh-keysync-client.conf
@@ -1,5 +1,5 @@
 #
-# /etc/rbm/ssh-keysync-client.conf
+# /etc/ssh-keysync/ssh-keysync-client.conf
 #
 # Maximilian Wilhelm <max@rfc2324.org>
 #  -- Fri, 30 Sep 2005 16:52:05 +0200

diff --git a/files/server/man1/ssh-keysync-merge.1 b/files/server/man1/ssh-keysync-merge.1
index 7e6277f..4f65799 100644 (file)
--- a/files/server/man1/ssh-keysync-merge.1
+++ b/files/server/man1/ssh-keysync-merge.1
@@ -21,14 +21,14 @@ ssh-keysync-merge \- Merge ssh host pub keys to a ssh_known_hosts file
 .B ssh-keysync-merge
 is a tool to merge the ssh public keys of your hosts to one ssh_known_hosts
 file to be distributed to your clients as
-.IR /etc/rbm/ssh_known_hosts .
+.IR /etc/ssh-keysync/ssh_known_hosts .
 
 This mechanism can protect you / your users from connecting to a 
 compromised host, because
 .BR ssh
 will print out a warning if the public key of the host, you're connecting
 to and the saved copy in
-.IR /etc/rbm/ssh_known_hosts
+.IR /etc/ssh-keysync/ssh_known_hosts
 don't match.
 
 If you're running an automated installation system like Thomas Langes
@@ -47,7 +47,7 @@ Specify an alternae configuration file to use.
 By default,
 .B ssh-keysync-merge
 uses
-.B /etc/rbm/ssh-keysync-server.conf
+.B /etc/ssh-keysync/ssh-keysync-server.conf
 
 .TP
 .B \-d, \-debug
@@ -68,7 +68,7 @@ from cron.
 .\" FILES: Files used by this utility #{{{
 .SH FILES
 .TP
-.I /etc/rbm/ssh-keysync-server.conf
+.I /etc/ssh-keysync/ssh-keysync-server.conf
 Configuration file used by ssh-keysync-merge
 
 .TP

diff --git a/files/server/man1/upgrade_sshkeysync.1 b/files/server/man1/upgrade_sshkeysync.1
index 8a35d86..186dde5 100644 (file)
--- a/files/server/man1/upgrade_sshkeysync.1
+++ b/files/server/man1/upgrade_sshkeysync.1
@@ -23,7 +23,7 @@ version.
 .\" FILES: Files used by this utility #{{{
 .SH FILES
 .TP
-.I /etc/rbm/ssh-keysync-server.conf
+.I /etc/ssh-keysync/ssh-keysync-server.conf
 Configuration file upgraded by
 .BR upgrade_sshkeysync
 

diff --git a/files/server/ssh-keysync-adddomain b/files/server/ssh-keysync-adddomain
index 69eb064..ef9cb94 100755 (executable)
--- a/files/server/ssh-keysync-adddomain
+++ b/files/server/ssh-keysync-adddomain
@@ -9,7 +9,7 @@
 #  
 #  This script will create an configuration entry for the new domain
 #  and a doamin directory under /var/cache/ssh-keysync or a different
-#  bsae_dir defined in /etc/rbm/ssh-keysync-server.conf
+#  bsae_dir defined in /etc/ssh-keysync/ssh-keysync-server.conf
 #
 #
 #  Maximlian Wilhelm <max@rfc2324.org>
@@ -20,7 +20,7 @@
 # Some varialbes # {{{
 #
 # Configuration file
-CONFIGFILE="/etc/rbm/ssh-keysync-server.conf"
+CONFIGFILE="/etc/ssh-keysync/ssh-keysync-server.conf"
 
 # Default base_dir
 DEF_BASE_DIR="/var/cache/ssh-keysync"

diff --git a/files/server/ssh-keysync-merge b/files/server/ssh-keysync-merge
index fd6572e..9c014dd 100755 (executable)
--- a/files/server/ssh-keysync-merge
+++ b/files/server/ssh-keysync-merge
@@ -2,19 +2,18 @@
 #
 # ssh-keysync-merge
 #
-# Wrapper script to call RBM::sshKeySync::Merge - a library from the
-# RBM perl library - for merging ssh public keys to a ssh_known_hosts
-# file.
+# Wrapper script to call ShKeySync::Merge for merging ssh public keys
+# to a ssh_known_hosts file.
 #
 # 
 
 use strict;
 use Getopt::Long;
-use RBM::sshKeySync::Merge;
+use SshKeySync::Merge;
 
 ##
 # Check for command line parameteres
-my $config = "/etc/rbm/ssh-keysync-server.conf";
+my $config = "/etc/sh-keysync/ssh-keysync-server.conf";
 my $debug = 0;
 my $quiet = 0;
 
@@ -28,7 +27,8 @@ or Getopt::Long::HelpMessage(2);
 
 ##
 # Run real ssh-keysync-merge
-my $merger = RBM::sshKeySync::Merge->new( quiet => $quiet, debug => $debug, configfile => $config );
+my $merger = SshKeySync::Merge->new( quiet => $quiet, debug => $debug, configfile => $config );
+
 $merger->merge_all_domains();
 
 $merger->publish_known_hosts();

diff --git a/files/server/ssh-keysync-server.conf b/files/server/ssh-keysync-server.conf
index 3b2415a..140f4eb 100644 (file)
--- a/files/server/ssh-keysync-server.conf
+++ b/files/server/ssh-keysync-server.conf
@@ -1,5 +1,5 @@
 #
-# /etc/rbm/ssh-keysync-server.ini
+# /etc/ssh-keysync/ssh-keysync-server.ini
 #
 
 ##
@@ -9,7 +9,7 @@ base_dir = /var/cache/ssh-keysync
 user = skeysync
 
 ##
-# The domains managed by RBM::sshKeySync
+# The domains managed by SshKeySync
 #
 # [dom.ain.name]
 # alt_domains = alt.rnateiv.dom.ain.name, another.dom.ain.name

diff --git a/files/server/upgrade_sshkeysync b/files/server/upgrade_sshkeysync
index cde7d89..91e828d 100755 (executable)
--- a/files/server/upgrade_sshkeysync
+++ b/files/server/upgrade_sshkeysync
@@ -2,7 +2,7 @@
 #
 # upgrade_sshkeysync
 
-CONFIGFILE="/etc/rbm/ssh-keysync-server.conf"
+CONFIGFILE="/etc/ssh-keysync/ssh-keysync-server.conf"
 CONFIG_OLD="${CONFIGFILE}.oldsave"
 
 ##
@@ -47,7 +47,8 @@ function upgrade_config() {
                echo -n "Writing new config... "
                cat << EOF | sed -e "${EXPR_USER}" -e "${EXPR_BASEDIR}" > "${CONFIGFILE}" && echo "done." || echo "Failed!"
 #
-# /etc/rbm/ssh-keysync-server.conf
+# /etc/ssh-keysync/ssh-keysync-server.conf
+
 #
 
 ##
@@ -57,7 +58,7 @@ base_dir="/var/cache/ssh-keysnc"
 user="skeysync"
 
 ##
-# The domains managed by RBM::sshKeySync::Merge
+# The domains managed by SshKeySync::Merge
 #
 # [dom.ain.name]
 # alt_domains = alt.rnateiv.dom.ain.name, another.dom.ain.name