[zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.zss:1.4 README.txt:1.4 buildinstance:1.2 szodb_recipes.mk:1.3 szodb_targets.mk:1.2 zinstance_recipes.mk:1.2 zinstance_targets.mk:1.2 zss_recipes.mk:1.4 zss_targets.mk:1.4
Chris McDonough
chrism at zope.com
Wed May 1 18:31:03 EDT 2002
Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv19417
Modified Files:
Makefile.zss README.txt buildinstance szodb_recipes.mk
szodb_targets.mk zinstance_recipes.mk zinstance_targets.mk
zss_recipes.mk zss_targets.mk
Log Message:
Chekpoint.
=== NZO_SiteLayout/Makefile.zss 1.3 => 1.4 ===
#-----------------------------------------------------------------------
PYTHON_CHECKOUT=src/Python-2.1.3
-ZEO_CHECKOUT=src/StandaloneZODB-1.0-final
#-----------------------------------------------------------------------
# Package-specific targets
@@ -61,13 +60,16 @@
#
# Add / remove here as appropriate.
#-----------------------------------------------------------------------
+ROOT_TARGETS=\
+/etc/rc.d/init.d/zeo_server \
+
SRC_TARGETS=\
${PYTHON_CHECKOUT} \
-${ZEO_CHECKOUT} \
+${SZODB_SRC_TARGETS} \
OPT_TARGETS=\
${PYTHON_OPT_TARGETS} \
-${ZEO_OPT_TARGETS} \
+${SZODB_OPT_TARGETS} \
BIN_TARGETS=\
${PYTHON_BIN_TARGETS} \
@@ -81,7 +83,7 @@
USAGE_TARGETS=\
python_usage \
-zeo_usage \
+szodb_usage \
DOC_TARGETS=\
${PYTHON_DOC_TARGETS} \
=== NZO_SiteLayout/README.txt 1.3 => 1.4 ===
X11
openldap
+ sudo
- As the root user, create a "zope" user on the newly set up system::
- $ /usr/sbin/useradd zope
+ # /usr/sbin/useradd zope
+
+ - Change the zope user's password::
+
+ # passwd zope
+
+ - Add the Zope user to the /etc/sudoers file by adding the following
+ line to that file::
+
+ zope ALL=(ALL) ALL
- Log in as the zope user and "cd" to the zope user's home directory::
- $ su - zope; cd ~
+ # su - zope; cd ~
- Set the CVS checkout mechanism to SSH by adding this line to
- the Zope user's .bash_profile::
+ the Zope user's .bash_profile file::
export CVS_RSH=ssh
@@ -39,6 +49,7 @@
Zope, ZEO, CMF software:: software::
$ site-layout/buildout zope
+
{churn, churn, churn}
When the process is finished, you will have the following
@@ -52,6 +63,7 @@
- Use the site-layout facility to install the python-ldap Python module::
$ site-layout/buildout ldap-client
+
{churn, churn, churn}
When the process is finished, some software will be added to both
@@ -59,17 +71,21 @@
module installed via distutils.
- Use the site-layout facility to install an INSTANCE_HOME directory and
- requisite Zope products::
+ requisite Zope products. When prompted by sudo for a password,
+ enter the 'zope' user's password::
- $ site-layout/buildinstance
- {churn, churn, churn}
+ $ USE_ZEO_SERVER=1 ZEO_SERVER_HOST=storage.nzo.zope.com \
+ site-layout/buildinstance
+
+ {churn, churn, churn}.. {ask for password}.. {churn, churn}
To install an additional INSTANCE_HOME with a different name and
different port/password settings or to change the default instance
settings, use a special set of environment variables *before* the
"site-layout/buildinstance" command. For instance::
- $ INSTANCE_NAME=Instance2 INSTANCE_PASSWD=456 site-layout/buildinstance
+ $ USE_ZEO_SERVER=1 ZEO_SERVER_HOST=storage.nzo.zope.com \
+ INSTANCE_NAME=Instance2 INSTANCE_PASSWD=456 site-layout/buildinstance
The following environment variables are supported::
@@ -79,5 +95,8 @@
INSTANCE_DAV_PORT={DAV TCP port, default "9800"}
INSTANCE_MONITOR_PORT={monitor TCP port, default "None"}
INSTANCE_PASSWD={password for access and inituser files, default "123"}
-
+ USE_ZEO_SERVER={1 or 0 depending on whether you want to use a ZEO server}
+ ZEO_SERVER_HOST={ZEO server hostname, default 'localhost'}
+ ZEO_SERVER_PORT={ZEO server portname, default '8001'}
+ USE_ZEO_SERVER={1 if using a storage server, 0 if a local FileStorage, default '0'}
=== NZO_SiteLayout/buildinstance 1.1 => 1.2 ===
INSTANCE_MONITOR_PORT=None
fi
+if test -z "$ZEO_SERVER_HOST"; then
+ ZEO_SERVER_HOST=localhost
+fi
+if test -z "$ZEO_SERVER_PORT"; then
+ ZEO_SERVER_PORT=8001
+fi
+if test -z "$USE_ZEO_SERVER"; then
+ USE_ZEO_SERVER=0
+fi
if [ -f $reldir/Makefile.zinstance ]; then
@@ -35,6 +44,9 @@
INSTANCE_FTP_PORT=$INSTANCE_FTP_PORT \
INSTANCE_DAV_PORT=$INSTANCE_DAV_PORT \
INSTANCE_MONITOR_PORT=$INSTANCE_MONITOR_PORT \
+ ZEO_SERVER_HOST=$ZEO_SERVER_HOST \
+ ZEO_SERVER_PORT=$ZEO_SERVER_PORT \
+ USE_ZEO_SERVER=$USE_ZEO_SERVER \
else
echo "buildinstance [<INSTANCE_VAR=value>]*"
@@ -45,4 +57,7 @@
echo " INSTANCE_FTP_PORT: FTP port (default '8021')"
echo " INSTANCE_DAV_PORT: DAV source port (default '9088')"
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 " USE_ZEO_SERVER: 1 if ZEO server is used, 0 if local FileStorage"
fi
=== NZO_SiteLayout/szodb_recipes.mk 1.2 => 1.3 ===
# StandaloneZODB targets
-#
-# Dependencies:
-#
-# - ZEO_CHECKOUT should be set to the version-qualified name, under
-# 'src', of the StandaloneZODB software package, e.g.
-# 'src/StandaloneZODB-1.0-final'.
-# This value is normally spelled out in the main makefile, and
-# must correspond to one of the checkouts in 'cvs.mk'.
-#
-# - COPY_FROM_SRC should be set either to ${CPR} (if you plan to
-# remove the 'src' tree after building) or to ${LNDIR} (if you
-# want to be able to refresh the sources and automagically update
-# the site).
#=======================================================================
-
-${ZEO_CHECKOUT}: ${BASE_DIR}/src
+${SZODB_SRC_TARGETS}:
${CD} ${BASE_DIR}/src \
- && ${CVS} -d ${CVS_REPOSITORY} checkout ${CVS_TAG} -d ${@F} ${CVS_MODULE}
-
-ZEO_SETUP_SRC=${ZEO_CHECKOUT:%=%/setup.py}
-
-${ZEO_SETUP_SRC}: %/setup.py : %
-
-ZEO_BUILD=${ZEO_CHECKOUT:src/%=opt/%}
-
-ZEO_SETUP=${ZEO_BUILD:%=%/setup.py}
-
-${ZEO_BUILD}: % : %/setup.py
-
-${ZEO_SETUP}: opt/%: src/%
- ${RM} ${@D}
- ${MKDIR} ${@D}
- ${COPY_FROM_SRC} ${BASE_DIR}/${<D} ${BASE_DIR}/${@D}
+ && ${CVS} -d ${CVS_REPOSITORY} checkout -d ${@F} ${CVS_MODULE}
-opt/StandaloneZODB: ${ZEO_BUILD}
- ${CD} ${BASE_DIR}/${@D} && ${LNSF} ${<F} ${@F}
+opt/StandaloneZODB: src/StandaloneZODB-1.0
+ ${CPR} ${BASE_DIR}/$< ${BASE_DIR}/${<:src/%=opt/%} && \
+ ${LNSF} ${BASE_DIR}/${<:src/%=opt/%} ${BASE_DIR}/$@
-opt/StandaloneZODB/setup.py: ${ZEO_SETUP} opt/StandaloneZODB bin/python
+opt/StandaloneZODB/setup.py: opt/StandaloneZODB bin/python
opt/Python2/lib/python2.1/site-packages/Acquisition.so: opt/StandaloneZODB/setup.py
${CD} ${BASE_DIR}/opt/StandaloneZODB && \
@@ -45,11 +17,11 @@
${CD} ${BASE_DIR}/opt/StandaloneZODB && \
${BASE_DIR}/bin/python setup.py install
-zeo: opt/StandaloneZODB/setup.py \
+szodb_usage: opt/StandaloneZODB/setup.py \
opt/Python2/lib/python2.1/site-packages/Acquisition.so
-zeo_usage:
- @${ECHO} " zeo -- Build ZEO pseudo-binary."
+szodb_usage:
+ @${ECHO} " szodb -- Install StandaloneZODB."
@${ECHO}
-.PHONY: zeo zeo_usage
+.PHONY: szodb szodb_usage
=== NZO_SiteLayout/szodb_targets.mk 1.1 => 1.2 ===
#=======================================================================
-ZEO_OPT_TARGETS=\
+src/StandaloneZODB-1.0: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/StandaloneZODB-1.0: CVS_MODULE=StandaloneZODB
+src/StandaloneZODB-1.0: CVS_TAG=-r StandaloneZODB-1_0-final
+
+SZODB_OPT_TARGETS=\
opt/StandaloneZODB \
opt/Python2/lib/python2.1/site-packages/Acquisition.so \
+
+SZODB_SRC_TARGETS=\
+src/StandaloneZODB-1.0
+
=== NZO_SiteLayout/zinstance_recipes.mk 1.1 => 1.2 ===
s@<<INSTANCE_FTP_PORT>>@${INSTANCE_FTP_PORT}@g;\
s@<<INSTANCE_DAV_PORT>>@${INSTANCE_DAV_PORT}@g;\
-s@<<INSTANCE_MONITOR_PORT>>@${INSTANCE_MONITOR_PORT}@g\
+s@<<INSTANCE_MONITOR_PORT>>@${INSTANCE_MONITOR_PORT}@g;\
+s@<<USE_ZEO_SERVER>>@${USE_ZEO_SERVER}@g;\
+s@<<ZEO_SERVER_HOST>>@${ZEO_SERVER_HOST}@g;\
+s@<<ZEO_SERVER_PORT>>@${ZEO_SERVER_PORT}@g;\
+s@<<RUNAS_USER>>@$(shell whoami)@g\
"
AFTERCREATE=${TRUE}
=== NZO_SiteLayout/zinstance_targets.mk 1.1 => 1.2 ===
# INSTANCE_MONITOR_PORT={monitor TCP port}
# INSTANCE_PASSWD={password for access and inituser files}
+# ZEO_SERVER_HOST={ZEO server hostname, default 'localhost'}
+# ZEO_SERVER_PORT={ZEO server portname, default '8001'}
#=======================================================================
INSTANCE_ROOT_TARGETS=\
=== NZO_SiteLayout/zss_recipes.mk 1.3 => 1.4 ===
-# Standard ZEO Storage Server (ZSS) targets
+# ZEO Storage Server instance targets
#=======================================================================
-SEDSCRIPT= -e "s@<<BASE_DIR>>@${BASE_DIR}@g"
+SEDSCRIPT=\
+-e "\
+s@<<BASE_DIR>>@${BASE_DIR}@g;\
+s@<<ZEO_SERVER_PORT>>@${ZEO_SERVER_PORT}@g;\
+s@<<ZEO_SERVER_LOGDIR>>@${ZEO_SERVER_LOGDIR}@g;\
+s@<<RUNAS_USER>>@$(shell whoami)@g\
+"
+
AFTERCREATE=${TRUE}
${ZSS_SCRIPTS}: AFTERCREATE=${CHMOD} u+x $@
@@ -14,7 +21,7 @@
${MKDIR} ${BASE_DIR}/${@D}
${CP} $< $@
-etc/zeo.conf: etc/%: ${MAKEFILEDIR}/etc/%.in
+etc/zeo.conf: etc/%: ${MAKEFILEDIR}/etc/%.in log tmp
var/ZEOStorage/Storage.py: ${MAKEFILEDIR}/var/ZEOStorage/Storage.py.in
@@ -24,15 +31,18 @@
${MKDIR} ${@D}
${SED} ${SEDSCRIPT} < $< > $@
${AFTERCREATE}
-
-var/ZEOStorage/Data.fs: bin/python bin/zeoctl etc/zeo.conf #bin/initdlinks.sh
- # ${LNSF} ${BASE_DIR}/share/InstanceProducts ${BASE_DIR}/var/ZEOStorage/Products
- #${SUDO} ${MKDIR} ${LOG_DIR} && ${SUDO} ${CHOWN} zope.zope ${LOG_DIR}
- #${SUDO} ${BASE_DIR}/bin/initdlinks.sh
- #${RM} ${BASE_DIR}/log
- #${LNSF} /var/log/zc ${BASE_DIR}/log
+
+log tmp:
+ ${MKDIR} ${BASE_DIR}/$@
+
+var/ZEOStorage/Data.fs: bin/python bin/zeoctl etc/zeo.conf
${MKDIR} ${BASE_DIR}/${@D}
- ${BASE_DIR}/bin/zeoctl start
+
+/etc/rc.d/init.d/zeo_server: ${MAKEFILEDIR}/rc/zeo_server.rc.in bin/zeoctl
+ ${SED} ${SEDSCRIPT} < $< > ${MAKEFILEDIR}/zss.rc.tempfile &&\
+ ${SUDO} mv ${MAKEFILEDIR}/zss.rc.tempfile $@ &&\
+ ${SUDO} ${CHMOD} 755 $@ && ${SUDO} ${CHOWN} root.root $@ &&\
+ ${SUDO} /sbin/chkconfig --level 2345 zeo_server on
ALL_ZSS_TARGETS =\
${ZSS_OPT_TARGETS} \
@@ -40,4 +50,6 @@
${ZSS_ETC_TARGETS} \
${ZSS_VAR_TARGETS} \
-zss : zeo ${ALL_ZSS_TARGETS}
+zss: szodb ${ALL_ZSS_TARGETS}
+
+.PHONY: log tmp
=== NZO_SiteLayout/zss_targets.mk 1.3 => 1.4 ===
#=======================================================================
+ZEO_SERVER_PORT=8001
+ZEO_SERVER_LOGDIR=${BASE_DIR}/log
+
ZSS_SCRIPTS=\
bin/zeoctl \
More information about the zopeorg-checkins
mailing list