[zopeorg-checkins] CVS: NZO_SiteLayout - buildinstance:1.3 zinstance_recipes.mk:1.4 zinstance_targets.mk:1.3

[Chris McDonough]

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv29705

Modified Files:
	buildinstance zinstance_recipes.mk zinstance_targets.mk 
Log Message:
Changed storage name back to Main and made zinstance use that name.


=== NZO_SiteLayout/buildinstance 1.2 => 1.3 ===
    ZEO_SERVER_PORT=8001
 fi
+if test -z "$ZEO_SERVER_STORAGE"; then
+   ZEO_SERVER_STORAGE=Main
+fi
 if test -z "$USE_ZEO_SERVER"; then
    USE_ZEO_SERVER=0
 fi
@@ -46,6 +49,7 @@
                 INSTANCE_MONITOR_PORT=$INSTANCE_MONITOR_PORT \
                 ZEO_SERVER_HOST=$ZEO_SERVER_HOST \
                 ZEO_SERVER_PORT=$ZEO_SERVER_PORT \
+                ZEO_SERVER_STORAGE=$ZEO_SERVER_STORAGE \
                 USE_ZEO_SERVER=$USE_ZEO_SERVER \
 
 else
@@ -59,5 +63,6 @@
   echo "  INSTANCE_MONITOR_PORT:  Zope monitor port (default 'None')"
   echo "  ZEO_SERVER_HOST:        ZEO server hostname (default 'localhost')"
   echo "  ZEO_SERVER_PORT:        ZEO server portname (default '8001')"
+  echo "  ZEO_SERVER_STORAGE:     storage name on ZSS (default 'Main')"
   echo "  USE_ZEO_SERVER:         1 if ZEO server is used, 0 if local FileStorage"
 fi


=== NZO_SiteLayout/zinstance_recipes.mk 1.3 => 1.4 ===
 s@<<ZEO_SERVER_HOST>>@${ZEO_SERVER_HOST}@g;\
 s@<<ZEO_SERVER_PORT>>@${ZEO_SERVER_PORT}@g;\
+s@<<ZEO_SERVER_STORAGE>>@${ZEO_SERVER_STORAGE}@g;\
 s@<<RUNAS_USER>>@$(shell whoami)@g\
 "
 AFTERCREATE=${TRUE}


=== NZO_SiteLayout/zinstance_targets.mk 1.2 => 1.3 ===
 #    ZEO_SERVER_HOST={ZEO server hostname, default 'localhost'}
 #    ZEO_SERVER_PORT={ZEO server portname, default '8001'}
+#    ZEO_SERVER_STORAGE={ZSS storage name, default 'Main'}
+#    USE_ZEO_SERVER={1 if ZEO server is used, 0 if local FileStorage}
 #=======================================================================
 
 INSTANCE_ROOT_TARGETS=\