From 922067213b59ef05204931c0d3177e452ea6cddf Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Jan 2006 15:22:16 +0000
Subject: Support variable namespace instead of fixed "noreply2"

git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@44 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
---
 Push | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'Push')

diff --git a/Push b/Push
index 9b9846f..63a743a 100755
--- a/Push
+++ b/Push
@@ -3,6 +3,7 @@
 require 'yaml';
 
 $config = YAML::load( File.open( 'Hosts' ) )
+$NAMESPACE=$config['namespace']
 
 def sys(command)
 	puts "} #{command}"
@@ -13,17 +14,17 @@ end
 def getFilesMD5(host, ssh_hostname)
 	cmd = ssh_hostname ?
 		"ssh root@#{ssh_hostname} /bin/ls -1 /etc/openvpn" :
-		"ls -1 noreply2-#{host}"
+		"ls -1 #{$NAMESPACE}-#{host}"
 	puts "| " + cmd
 	f = IO.popen( cmd, aModeString="r" );
-	files = f.readlines.delete_if{|e| not e =~ /^noreply2[.-]/ }.collect{|e| e.chomp}
+	files = f.readlines.delete_if{|e| not e =~ /^#{$NAMESPACE}[.-]/ }.collect{|e| e.chomp}
 	f.close
 
 	md5 = {}
 	if (files.length > 0)
 		cmd = ssh_hostname ?
 			"ssh root@#{ssh_hostname} 'cd /etc/openvpn && md5sum " + files.join(' ') + "'" :
-			"cd noreply2-#{host} && md5sum " + files.join(' ')
+			"cd #{$NAMESPACE}-#{host} && md5sum " + files.join(' ')
 		puts "| " + cmd
 		f = IO.popen( cmd, aModeString="r" );
 		f.each_line{ |l|
@@ -99,7 +100,7 @@ hosts.each{ |hostname|
 		end
 	}
 
-	dir = "noreply2-#{hostname}/"
+	dir = "#{$NAMESPACE}-#{hostname}/"
 	sys("scp "+copy.collect{|f| dir+f }.join(' ')+" root@#{ssh_hostname}:/etc/openvpn/") if copy.size > 0
 	commands = []
 	commands << "sh ./#{do_iptables} &&\n"                                if do_iptables
@@ -112,9 +113,9 @@ hosts.each{ |hostname|
 	command << "echo 'all done'"
 	sys("ssh root@#{ssh_hostname} '#{command}'") if commands.size > 0
 	if (do_quagga)
-		sys("ssh root@#{ssh_hostname} 'cp -a /etc/openvpn/noreply2.quagga.bgpd /etc/quagga/bgpd.conf &&
-		                               cp -a /etc/openvpn/noreply2.quagga.zebra /etc/quagga/zebra.conf &&
-		                               cp -a /etc/openvpn/noreply2.quagga.daemons /etc/quagga/daemons &&
+		sys("ssh root@#{ssh_hostname} 'cp -a /etc/openvpn/#{$NAMESPACE}.quagga.bgpd /etc/quagga/bgpd.conf &&
+		                               cp -a /etc/openvpn/#{$NAMESPACE}.quagga.zebra /etc/quagga/zebra.conf &&
+		                               cp -a /etc/openvpn/#{$NAMESPACE}.quagga.daemons /etc/quagga/daemons &&
 		                               chmod 640 /etc/quagga/bgpd.conf /etc/quagga/zebra.conf &&
 		                               chgrp quagga /etc/quagga/bgpd.conf /etc/quagga/zebra.conf &&
 		                               /etc/init.d/quagga restart'")
-- 
cgit v1.2.3