Update of /home/cvsd/slony1/slony1-engine/tools
In directory main.slony.info:/tmp/cvs-serv895

Modified Files:
	configure-replication.sh 
Log Message:
Change configure-replication.sh to use EVENT NODE in various places where
it has become mandatory


Index: configure-replication.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/configure-replication.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure-replication.sh	22 Nov 2007 17:47:03 -0000	1.4
--- configure-replication.sh	24 Apr 2008 15:11:14 -0000	1.5
***************
*** 7,10 ****
--- 7,11 ----
  
  # Defaults - origin node
+ ORIGIN=1
  DB1=${DB1:-${PGDATABASE:-"slonytest"}}
  HOST1=${HOST1:-`hostname`}
***************
*** 146,150 ****
  
  for table in `echo $TABLES`; do
!     echo "set add table (id=${tnum}, set id=1, origin=1, fully qualified name='${table}', comment='${CLUSTER} table ${table}');" >> $SETUPSET
      tnum=`expr ${tnum} + 1`
  done
--- 147,151 ----
  
  for table in `echo $TABLES`; do
!     echo "set add table (id=${tnum}, set id=1, origin=${ORIGIN}, fully qualified name='${table}', comment='${CLUSTER} table ${table}');" >> $SETUPSET
      tnum=`expr ${tnum} + 1`
  done
***************
*** 152,156 ****
  snum=1
  for seq in `echo $SEQUENCES`; do
!     echo "set add sequence (id=${snum}, set id=1, origin=1, fully qualified name='${seq}', comment='${CLUSTER} sequence ${seq}');" >> $SETUPSET
      snum=`expr ${snum} + 1`
  done
--- 153,157 ----
  snum=1
  for seq in `echo $SEQUENCES`; do
!     echo "set add sequence (id=${snum}, set id=1, origin=${ORIGIN}, fully qualified name='${seq}', comment='${CLUSTER} sequence ${seq}');" >> $SETUPSET
      snum=`expr ${snum} + 1`
  done
***************
*** 164,168 ****
      SUBFILE=$mktmp/subscribe_set_${node}.slonik
      echo "include <${PREAMBLE}>;" > $SUBFILE
!     echo "store node (id=${node}, comment='${CLUSTER} subscriber node ${node}');" >> $NODEINIT
      echo "subscribe set (id=1, provider=1, receiver=${node}, forward=yes);" >> $SUBFILE
      if [ ${node} -ge ${NUMNODES} ]; then
--- 165,169 ----
      SUBFILE=$mktmp/subscribe_set_${node}.slonik
      echo "include <${PREAMBLE}>;" > $SUBFILE
!     echo "store node (id=${node}, comment='${CLUSTER} subscriber node ${node}', event node=${ORIGIN});" >> $NODEINIT
      echo "subscribe set (id=1, provider=1, receiver=${node}, forward=yes);" >> $SUBFILE
      if [ ${node} -ge ${NUMNODES} ]; then