install armageddon

inst/binary_install.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+"""Try to do all of the installation steps.
+
+This must be run from the top-level directory of the installation.
+\(Yes, this is cheezy.  We'll fix this when we have a chance.
+
+"""
+
+import sys, os
+from do import *
+
+def setup(me):
+    home=os.path.split(me)[0]
+    if not home or home=='.': home=os.getcwd()
+    home=os.path.split(home)[0]
+    if not home or home=='.': home=os.getcwd()
+    sys.path.insert(os.path.join(home,'inst'))
+    sys.path.insert(os.path.join(home,'inst'))
+    return home
+
+def main(args):
+    me=args[0]
+    home=setup(me)
+    pcgi=os.path.join(home, 'Zope.cgi')
+    usage="""install [options]
+
+    where options are:
+
+       -p   -- Supply the path to the PCGI resource file.
+               This defaults to %s.
+    
+       -g   -- Supply the name of the unix group to which
+               the user that runs your web server belongs.
+               If not specified, the installer will attempt
+               to determine the group itself. If no group
+               is specified and the installer is unable to
+               determine the group, the install will fail.
+    
+       -u   -- Supply the name of the unix user used to
+               run your web server. If not specified, this
+               defaults to the userid of the current user,
+               or 'nobody' is the current user is root.
+    
+       -h   -- Show command summary
+    """ % (pcgi)
+    
+    try: options, args = getopt.getopt(sys.argv[1:], 'p:g:hu')
+    except: error(usage, sys.exc_info())
+    if args: error('', ('Unexpected arguments', args))
+
+    group=user=''
+    for k, v in options:
+        if k=='-p': pcgi=v
+        elif k=='-g': group=v
+        elif k=='-u': user=v
+
+    import compilezpy
+    print '-'*78
+    import zpasswd; zpasswd.write_access(home, user, group)
+    import default_content; default_content.main(home, user, group)
+    import make_resource; make_resource.main(home, pcgi, user, group)
+    import make_start; make_start.sh(home, user, group)
+
+    print '-'*78
+    print
+    print 'Done!'
+
+if __name__=='__main__': main(sys.argv[0])

inst/compilezpy.py

 print
 print '-'*78
 print 'Compiling py files'
-import compileall
+import compileall, os
 compileall.compile_dir(os.getcwd())

inst/default_content.py

@@ -84,15 +84,18 @@
 ##############################################################################
 
 import os
+from do import *
 
-def main(home):
+def main(home, user='', group=''):
     data_dir=os.path.join(home,'var')
+    ch(data_dir, user, group, 0711)
     db_path=os.path.join(data_dir, 'Data.fs')
     dd_path=os.path.join(data_dir, 'Data.fs.in')
     if not os.path.exists(db_path) and os.path.exists(dd_path):
         print '-'*78
         print 'creating default database'
-        open(dd_path,'wb').write(open(db_path,'rb').read())
+        open(db_path,'wb').write(open(dd_path,'rb').read())
+        ch(db_path, user, group)
 
 
 

inst/do.py

@@ -103,6 +103,21 @@ def wheres_Makefile_pre_in():
     return "%s/lib/python%s/config/Makefile.pre.in" % (sys.exec_prefix,
                                                        sys.version[:3])
 
+def error(message, error):
+    print message
+    if error: print "%s: %s" % error[:2]
+
+def ch(path, user, group, mode=0600):
+    if group:
+        mode=mode+060
+        do("chgrp %s %s" % (group, path), 0)
+
+    if user:
+        do("chown %s %s" % (group, path), 0)
+
+    do("chmod %s %s" % (oct(mode), path), 0)
+    
+
 def make(*args):
     print
     print '-'*48

inst/make_resource.py

@@ -86,17 +86,16 @@
 
 You must be in the directory containing this script.
 """
-print
-print '-'*78
 
+import os
 from do import *
 
-python=sys.executable
-name=os.environ.get('ZNAME','Zope')
-print 'Writing the pcgi resource file (ie cgi script), %s.cgi' % name
-cwd=os.environ.get('ZDIR',os.getcwd())
+def main(cwd=os.getcwd(), name='Zope', user='', group=''):
+    python=sys.executable
+    print 'Writing the pcgi resource file (ie cgi script), %s.cgi' % name
+    cwd=os.environ.get('ZDIR',cwd)
 
-open('%s.cgi' % name,'w').write('''#!%(cwd)s/pcgi/pcgi-wrapper
+    open('%s.cgi' % name,'w').write('''#!%(cwd)s/pcgi/pcgi-wrapper
 PCGI_NAME=Zope
 PCGI_MODULE_PATH=%(cwd)s/lib/python/Zope
 PCGI_PUBLISHER=%(cwd)s/pcgi/pcgi_publisher.py
@@ -110,4 +109,5 @@ BOBO_DEBUG_MODE=1
 INSTANCE_HOME=%(cwd)s
 ''' % vars())
 
-do('chmod 755 %s.cgi' % name)
+    ch(name, user, group, 0711)
+    

inst/make_start.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+
+import sys, os
+from do import *
+
+def sh(home, user, group):
+    z2=os.path.join(home, 'z2.py')
+    start=os.path.join(home, 'start')
+    if not os.path.exists(start):
+        print '-'*78
+        print 'Creating start script, start'
+        open(start,'w').write(
+            "#! /bin/sh\n"
+            "exec %s %s -D $*"
+            % (sys.executable, z2))
+        ch(start,user,group,0711)
+
+    stop=os.path.join(home, 'stop')
+    if not os.path.exists(stop):
+        print '-'*78
+        print 'Creating stop script, stop'
+        open(stop,'w').write(
+            "#! /bin/sh\n"
+            "kill `cat %s`" 
+            % os.path.join(home,'var','Z2.pid'))
+        ch(stop,user,group,0711)
+

w_pcgi.py

@@ -89,9 +89,21 @@ This must be run from the top-level directory of the installation.
 
 """
 
-import os
-home=os.getcwd()
-import build_pcgi
-import make_resource
-os.chdir(home) # Just making sure
-import wo_pcgi
+import sys, os
+
+def setup(me):
+    home=os.path.split(me)[0]
+    if not home or home=='.': home=os.getcwd()
+    sys.path.insert(0, os.path.join(home,'inst'))
+    sys.path.insert(0, home)
+    return home
+
+def main(me):
+    home=setup(me)
+    
+    import build_pcgi
+    import make_resource; make_resource.main(home)
+    os.chdir(home) # Just making sure
+    import wo_pcgi
+
+if __name__=='__main__': main(sys.argv[0])

wo_pcgi.py

@@ -90,61 +90,29 @@ This must be run from the top-level directory of the installation.
 """
 
 import sys, os
-home=os.getcwd()
-print
-print '-'*78
-print 'Compiling py files'
-import compileall
-compileall.compile_dir(os.getcwd())
 
-import build_extensions
+def setup(me):
+    home=os.path.split(me)[0]
+    if not home or home=='.': home=os.getcwd()
+    sys.path.insert(0, os.path.join(home,'inst'))
+    return home
 
-# Munge the python path
-sys.path = sys.path + ['./utilities']
-import zpasswd
-import whrandom
-pw_choices = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-             "abcdefghijklmnopqrstuvwxyz" \
-             "0123456789!"
+def main(me):
+    home=setup(me)
 
-print
-print '-'*78
+    #import compilezpy
+    print '-'*78
+    #import build_extensions
+    print '-'*78
+    user=group=''
+    import zpasswd; zpasswd.write_access(home, user, group)
+    import default_content; default_content.main(home, user, group)
+    pcgi=os.path.join(home, 'Zope.cgi')
+    import make_resource; make_resource.main(home, pcgi, user, group)
+    import make_start; make_start.sh(home, user, group)
 
-os.chdir(home)
-data_dir=os.path.join(home, 'var')
-if not os.path.exists(data_dir):
-    print 'creating data directory'
-    os.mkdir('var')
+    print '-'*78
+    print
+    print 'Done!'
 
-for suffix in 'fs':
-    db_path=os.path.join(data_dir, 'Data.%s' % suffix)
-    dd_path=os.path.join(data_dir, 'Data.%s.in' % suffix)
-    if not os.path.exists(db_path) and os.path.exists(dd_path):
-        print 'creating default database'
-        os.system('cp %s %s' % (dd_path, db_path))
-
-ac_path=os.path.join(home, 'access')
-if not os.path.exists(ac_path):
-    print 'creating default access file'
-    acfile=open(ac_path, 'w')
-    pw = ''
-    for i in range(8):
-        pw = pw + whrandom.choice(pw_choices)
-    acfile.write('superuser:' + zpasswd.generate_passwd(pw, 'SHA'))
-    acfile.close()
-    os.system('chmod 644 access')
-
-    print "NOTE: The default super user name and password are 'superuser'"
-    print "      and '%s'.  Create a file named 'access' in this directory" % pw
-    print "      with a different super user name and password on one line"
-    print "      separated by a a colon. (e.g. 'spam:eggs').  You can also"
-    print "      specify a domain (e.g. 'spam:eggs:*.digicool.com')."
-    
-print
-print '-'*78
-print 'NOTE: change owndership or permissions on var so that it can be'
-print '      written by the web server!'
-print
-print '-'*78
-print
-print 'Done!'
+if __name__=='__main__': main(sys.argv[0])

zpasswd.py

@@ -85,9 +85,9 @@
 ##############################################################################
 """Zope password change system"""
 
-__version__='$Revision: 1.1 $ '[11:-2]
+__version__='$Revision: 1.2 $ '[11:-2]
 
-import sys, string, sha, binascii, whrandom, getopt, getpass
+import sys, string, sha, binascii, whrandom, getopt, getpass, os
 
 try:
     from crypt import crypt
@@ -111,7 +111,7 @@ def generate_passwd(password, encoding):
 
     return pw
 
-def write_access(home):
+def write_access(home, user='', group=''):
     import whrandom
     pw_choices = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
                  "abcdefghijklmnopqrstuvwxyz" \
@@ -138,6 +138,8 @@ def write_access(home):
         %s zpasswd
         """ % (pw, sys.executable)
 
+        import do; do.ch(ac_path, user, group)
+
 def main(argv):
     short_options = ':u:p:e:d:'
     long_options = ['username=',