not sure what happened with thesefiles but lets merge. also remove th…

…at unified installed shit
Plone-Conference-Devs · Jun 5, 2011 · b591d1b · b591d1b
1 parent 2f9c3cf
commit b591d1b
Show file tree

Hide file tree

Showing 67 changed files with 6 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/README.rst b/README.rst
diff --git a/base.cfg b/base.cfg
@@ -11,6 +11,7 @@ find-links +=
     http://dist.plone.org/thirdparty
 
 eggs =
+    PIL
     Zope2
     Plone
     netsight.conferencetalks

diff --git a/bootstrap.py b/bootstrap.py
diff --git a/buildout.cfg b/buildout.cfg
diff --git a/filestorage.cfg b/filestorage.cfg
diff --git a/live.cfg b/live.cfg
@@ -8,9 +8,9 @@ parts +=
     client2
     zopepy
     zopeskel
-    unifiedinstaller
     backup
-    chown-zeo
+
+#    chown-zeo
 
 
 eggs-directory=/data/ploneconf/buildout-cache/eggs
@@ -49,7 +49,7 @@ verbose-security = off
 # If you try to start Zope as root, it will change user id to run as
 # the effective user specified here. This user id must own the var directory
 # of your buildout.
-effective-user = plone
+effective-user = ploneconf
 
 
 [zopepy]
@@ -61,16 +61,6 @@ interpreter = zopepy
 scripts = zopepy
 
 
-[unifiedinstaller]
-# This recipe installs the plonectl script and a few other convenience
-# items.
-# For options see http://pypi.python.org/pypi/plone.recipe.unifiedinstaller
-recipe = plone.recipe.unifiedinstaller
-user = ${buildout:user}
-primary-port = ${buildout:http-address}
-sudo-command = sudo -u plone
-
-
 [backup]
 # This recipe builds the backup, restore and snapshotbackup commands.
 # For options see http://pypi.python.org/pypi/collective.recipe.backup
@@ -86,7 +76,7 @@ snapshotlocation = ${buildout:backups-dir}/snapshotbackups
 recipe = plone.recipe.zeoserver
 zeo-address = 127.0.0.1:8100
 # if we try to start as root, Zope will switch to the user below
-effective-user = plone
+effective-user = ploneconf
 # Put the log, pid and socket files in var/zeoserver
 zeo-log     = ${buildout:directory}/var/zeoserver/zeoserver.log
 pid-file    = ${buildout:directory}/var/zeoserver/zeoserver.pid
@@ -104,7 +94,7 @@ zeo-address = ${zeoserver:zeo-address}
 # existing password.
 user = admin:894367
 # if we try to start as root, Zope will switch to the user below
-effective-user = plone
+effective-user = ploneconf
 http-address = 10000
 blob-storage = ${zeoserver:blob-storage}
 shared-blob = on

diff --git a/products/PloneConfContentTypes/__init__.py b/products/PloneConfContentTypes/__init__.py
diff --git a/products/PloneConfContentTypes/config.py b/products/PloneConfContentTypes/config.py
diff --git a/products/PloneConfContentTypes/configure.zcml b/products/PloneConfContentTypes/configure.zcml
diff --git a/products/PloneConfContentTypes/content/Course.py b/products/PloneConfContentTypes/content/Course.py
diff --git a/products/PloneConfContentTypes/content/Homepage.py b/products/PloneConfContentTypes/content/Homepage.py
diff --git a/products/PloneConfContentTypes/content/PloneConfDocument.py b/products/PloneConfContentTypes/content/PloneConfDocument.py
diff --git a/products/PloneConfContentTypes/content/PloneConfFile.py b/products/PloneConfContentTypes/content/PloneConfFile.py
diff --git a/products/PloneConfContentTypes/content/PloneConfFolder.py b/products/PloneConfContentTypes/content/PloneConfFolder.py
diff --git a/products/PloneConfContentTypes/content/PloneConfImage.py b/products/PloneConfContentTypes/content/PloneConfImage.py
diff --git a/products/PloneConfContentTypes/content/PloneConfNewsItem.py b/products/PloneConfContentTypes/content/PloneConfNewsItem.py
diff --git a/products/PloneConfContentTypes/content/PloneConfNewsItemFolder.py b/products/PloneConfContentTypes/content/PloneConfNewsItemFolder.py
diff --git a/products/PloneConfContentTypes/content/Sponsor.py b/products/PloneConfContentTypes/content/Sponsor.py
diff --git a/products/PloneConfContentTypes/content/Sprint.py b/products/PloneConfContentTypes/content/Sprint.py
diff --git a/products/PloneConfContentTypes/content/__init__.py b/products/PloneConfContentTypes/content/__init__.py
diff --git a/products/PloneConfContentTypes/content/interfaces.py b/products/PloneConfContentTypes/content/interfaces.py
diff --git a/products/PloneConfContentTypes/locales/README.txt b/products/PloneConfContentTypes/locales/README.txt
diff --git a/products/PloneConfContentTypes/profiles.zcml b/products/PloneConfContentTypes/profiles.zcml
diff --git a/products/PloneConfContentTypes/profiles/default/PloneConfContentTypes_marker.txt b/products/PloneConfContentTypes/profiles/default/PloneConfContentTypes_marker.txt
diff --git a/products/PloneConfContentTypes/profiles/default/catalog.xml b/products/PloneConfContentTypes/profiles/default/catalog.xml
diff --git a/products/PloneConfContentTypes/profiles/default/contenttyperegistry.xml b/products/PloneConfContentTypes/profiles/default/contenttyperegistry.xml
diff --git a/products/PloneConfContentTypes/profiles/default/cssregistry.xml b/products/PloneConfContentTypes/profiles/default/cssregistry.xml
diff --git a/products/PloneConfContentTypes/profiles/default/factorytool.xml b/products/PloneConfContentTypes/profiles/default/factorytool.xml
diff --git a/products/PloneConfContentTypes/profiles/default/import_steps.xml b/products/PloneConfContentTypes/profiles/default/import_steps.xml
diff --git a/products/PloneConfContentTypes/profiles/default/jsregistry.xml b/products/PloneConfContentTypes/profiles/default/jsregistry.xml
diff --git a/products/PloneConfContentTypes/profiles/default/metadata.xml b/products/PloneConfContentTypes/profiles/default/metadata.xml
diff --git a/products/PloneConfContentTypes/profiles/default/propertiestool.xml b/products/PloneConfContentTypes/profiles/default/propertiestool.xml
diff --git a/products/PloneConfContentTypes/profiles/default/skins.xml b/products/PloneConfContentTypes/profiles/default/skins.xml
diff --git a/products/PloneConfContentTypes/profiles/default/tinymce.xml b/products/PloneConfContentTypes/profiles/default/tinymce.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types.xml b/products/PloneConfContentTypes/profiles/default/types.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/Course.xml b/products/PloneConfContentTypes/profiles/default/types/Course.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/Homepage.xml b/products/PloneConfContentTypes/profiles/default/types/Homepage.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/PloneConfDocument.xml b/products/PloneConfContentTypes/profiles/default/types/PloneConfDocument.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/PloneConfFile.xml b/products/PloneConfContentTypes/profiles/default/types/PloneConfFile.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/PloneConfFolder.xml b/products/PloneConfContentTypes/profiles/default/types/PloneConfFolder.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/PloneConfImage.xml b/products/PloneConfContentTypes/profiles/default/types/PloneConfImage.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/PloneConfNewsItem.xml b/products/PloneConfContentTypes/profiles/default/types/PloneConfNewsItem.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/PloneConfNewsItemFolder.xml b/products/PloneConfContentTypes/profiles/default/types/PloneConfNewsItemFolder.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/Plone_Site.xml b/products/PloneConfContentTypes/profiles/default/types/Plone_Site.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/Sponsor.xml b/products/PloneConfContentTypes/profiles/default/types/Sponsor.xml
diff --git a/products/PloneConfContentTypes/profiles/default/types/Sprint.xml b/products/PloneConfContentTypes/profiles/default/types/Sprint.xml
diff --git a/products/PloneConfContentTypes/refresh.txt b/products/PloneConfContentTypes/refresh.txt
diff --git a/products/PloneConfContentTypes/setuphandlers.py b/products/PloneConfContentTypes/setuphandlers.py
diff --git a/...ConfContentTypes/skins/ploneconfcontenttypes_images/PloneConfNewsItemFolder.gif b/...ConfContentTypes/skins/ploneconfcontenttypes_images/PloneConfNewsItemFolder.gif
diff --git a/products/PloneConfContentTypes/umlxml/PloneConfContentTypes.zargo b/products/PloneConfContentTypes/umlxml/PloneConfContentTypes.zargo
diff --git a/products/README.txt b/products/README.txt
diff --git a/src/README.txt b/src/README.txt
diff --git a/src/holdingpage/css/style.css b/src/holdingpage/css/style.css
diff --git a/src/holdingpage/favicon.ico b/src/holdingpage/favicon.ico
diff --git a/src/holdingpage/images/bg_main.gif b/src/holdingpage/images/bg_main.gif
diff --git a/src/holdingpage/images/calendar.gif b/src/holdingpage/images/calendar.gif
diff --git a/src/holdingpage/images/date.gif b/src/holdingpage/images/date.gif
diff --git a/src/holdingpage/images/plone.gif b/src/holdingpage/images/plone.gif
diff --git a/src/holdingpage/images/wiggle.gif b/src/holdingpage/images/wiggle.gif
diff --git a/src/holdingpage/index.html b/src/holdingpage/index.html
diff --git a/src/holdingpage/sponsorship.html b/src/holdingpage/sponsorship.html
diff --git a/src/the-wiki/pwyky.html b/src/the-wiki/pwyky.html
diff --git a/src/the-wiki/pwyky.py b/src/the-wiki/pwyky.py
diff --git a/templates/varnish.vcl.in b/templates/varnish.vcl.in
diff --git a/templates/varnishd.in b/templates/varnishd.in
diff --git a/versions.cfg b/versions.cfg
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ find-links += @@
         http://dist.plone.org/thirdparty
     eggs =
+        PIL
         Zope2
         Plone
         netsight.conferencetalks
@@ Expand Down @@